gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-games
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
229 files changed, 5829 insertions, 668 deletions
diff --git a/dev-games/KXL-1.1.7-r2 b/dev-games/KXL-1.1.7-r2
deleted file mode 100644
index 176666597262..000000000000
--- a/dev-games/KXL-1.1.7-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 >=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=Development Library for making games for X
-EAPI=5
-HOMEPAGE=http://kxl.orz.hm/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://kxl.hn.org/download/KXL-1.1.7.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_=787197db8522e49c935e51cf997057e5
diff --git a/dev-games/KXL/KXL-1.1.7-r2.ebuild b/dev-games/KXL/KXL-1.1.7-r2.ebuild
new file mode 100644
index 000000000000..fc453d84b946
--- /dev/null
+++ b/dev-games/KXL/KXL-1.1.7-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Development Library for making games for X"
+HOMEPAGE="http://kxl.orz.hm/"
+SRC_URI="http://kxl.hn.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+DEPEND="x11-libs/libX11"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-m4.patch \
+		"${FILESDIR}"/${P}-amd64.patch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+}
diff --git a/dev-games/KXL/Manifest b/dev-games/KXL/Manifest
new file mode 100644
index 000000000000..afbda738e888
--- /dev/null
+++ b/dev-games/KXL/Manifest
@@ -0,0 +1,7 @@
+AUX KXL-1.1.7-amd64.patch 3207 BLAKE2B f215b32c48c60ed58da3064097bde7b00dc0d7e8df4690ac921da9be46527ef8cc5e2c807ce1b872b531ad1dded9efd6b9759fb919c5ac3bd1b91a7e700bcc19 SHA512 756cd90aca9c6ac1c9ac2c9229b8ae2904315fe29e59b842d963b72b2004c088f5b526ac00b97ed61763001a5e79f0e435c043ae54f4022ea392367a8f0c8142
+AUX KXL-1.1.7-as-needed.patch 308 BLAKE2B 7a07c561f300f3f58bc3e06f9bf6416b58432d14fa819c0f2885fb5e169ec949315094b6a1b94896811bc813beee7960344031f4111ccb5ec1e0318f534333f1 SHA512 8494ce4f631b82e798a0e4364252d35645544ed417bec11c5c7b6dcb179b5182187166f37562d6b40e393081112bb4d0787f8140464763b1482464c04fb9fd44
+AUX KXL-1.1.7-ldflags.patch 234 BLAKE2B f1cbe9b75b12b2d37911ec2a957b7624c679e6fcfb92e2db935ebed379aa0c7e7da7f0cb81a337295a48d7b75f4c4fe55c20f8b4efb1577ef59161b1e1942ac3 SHA512 b051fff9db4b353ad29479b3a08d2aadb49230800589337f13f34e4490330d1b683a42c2bdbac02dcbe0016e9755939e5f4a538167284011ad97502977d397a3
+AUX KXL-1.1.7-m4.patch 221 BLAKE2B bc3a010136208abe90ec266273580650214eb03a91308e1edc795ca71e86ecfeb22131552ec78c2c1e52ccf269b16331e28abc6eca04a0ff03ed0b5ddbb466ca SHA512 b9a0b71474c43cec838ab6fdadd183a80d409d935bc7b65a61cf87d2b777ef5b51cf86469aa8a0040d15a64b1a008ebd3eb9b1d0dc9e4e86160bda92612f2b6a
+DIST KXL-1.1.7.tar.gz 192070 BLAKE2B 7f5256afaffe94cd5f6551d8f53b43e2d9512cf94dfaebb123205b55d83d4645e226bbed62bf5f0da909104d4e33d1da60c7e08c0ee527087a4793c79c117df2 SHA512 f3a9051b0e8916745725a2809097df07c59f8811f336574def7e479c992175d0bd49661817f9da35d122d291aff0bde5d4c27e5b17a3f09878e71b2c7a709adb
+EBUILD KXL-1.1.7-r2.ebuild 677 BLAKE2B ce8d3ba64e3ffc2754eb2f5718b2e0b99ad9e9b6fea726d78c1f3c0830c0dfb63c18b30964e0414315050fd4ad6d281f87b9244c28143a902a44143ed55c0855 SHA512 83084dcf781122e7555195bb0b900c84f5121786214aeb701a1dce493746143813e0ca92a02a8f463b5278f0213fa2ca12830a70774af2568bfe79e27127719e
+MISC metadata.xml 677 BLAKE2B 7a7bed86880706ee5ed39121c002f35d410e2cd13ab316bf59be425318d15eca661f6d1c1be602ccc59e7fd5500322f60be9bd14865c0abb01e1b111a1f9d731 SHA512 c0bdd55e9cce88c16b4ac1cc71f30fd89e9341956d87de5e70eae786d9a71b675af94052149ee77e0b18b385a6f96dfa999f821c0177788e94de01f626a5a36f
diff --git a/dev-games/KXL/files/KXL-1.1.7-amd64.patch b/dev-games/KXL/files/KXL-1.1.7-amd64.patch
new file mode 100644
index 000000000000..ec4b141d2a3e
--- /dev/null
+++ b/dev-games/KXL/files/KXL-1.1.7-amd64.patch
@@ -0,0 +1,95 @@
+--- src/KXLsound.c.old	2007-05-13 21:59:27.000000000 +0200
++++ src/KXLsound.c	2007-05-13 22:09:19.000000000 +0200
+@@ -4,6 +4,9 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <linux/soundcard.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <string.h>
+ #include "KXL.h"
+ 
+ #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+@@ -22,7 +24,7 @@
+ struct {
+   Uint16           ListCnt;
+   Sint32           ID;
+-  Sint32           Pipe[2];
++  int              Pipe[2];
+   Sint32           Device;
+   Uint16           PlayCnt;
+   KXL_SoundControl PlaySound[MAX_SOUNDS_PLAYING];
+@@ -242,11 +244,19 @@
+   KXL_SoundOk = False;
+ 
+   KXL_LoadSoundData(path, fname);
+-  // device check
+-  if ((KXL_SoundData.Device = open("/dev/dsp", O_WRONLY)) == -1) {
+-    fprintf(stderr, "KXL error message\nnot found sound card\n");
++  // Open the sound device in non-blocking mode, because ALSA's OSS
++  // emulation and some broken OSS drivers would make a blocking call
++  // wait forever until the device is available. Since this breaks the
++  // OSS spec, we immediately put it back to blocking mode if the
++  // operation was successful.
++  KXL_SoundData.Device = open("/dev/dsp", O_WRONLY|O_NDELAY);
++  if (KXL_SoundData.Device < 0) {
++    fprintf(stderr, "KXL error message\ncould not open sound card (%s)\n",
++    strerror(errno));
+     return;
+   }
++  fcntl( KXL_SoundData.Device, F_SETFL,
++         fcntl( KXL_SoundData.Device, F_GETFL ) &~ FNDELAY );
+   // create pipe
+   if (pipe(KXL_SoundData.Pipe) < 0) {
+     fprintf(stderr, "KXL error message\npipe error\n");
+--- src/KXL.h.old	2007-05-13 22:25:11.000000000 +0200
++++ src/KXL.h	2007-05-13 22:25:47.000000000 +0200
+@@ -205,6 +205,7 @@
+   KXL_Frame   *Frame;    // Pointer of frame structure
+   GC           FontGC;   // GC of font
+   XFontStruct *WinFont;  // Pointer of font structrue
++  Bool         DetectAutoRepeat; // Does the server have detectable auto repeat
+ } KXL_Window;
+ // RGBE palette
+ typedef struct {
+--- src/KXLimage.c.old	2007-05-13 22:29:02.000000000 +0200
++++ src/KXLimage.c	2007-05-13 22:29:33.000000000 +0200
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "KXL.h"
+ 
+ extern KXL_Window *KXL_Root;
+--- src/KXLvisual.c.old	2007-05-13 22:22:34.000000000 +0200
++++ src/KXLvisual.c	2007-05-13 22:28:39.000000000 +0200
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "KXL.h"
+ 
+ //================================================================
+@@ -364,7 +366,11 @@
+   KXL_ReSizeFrame(w, h);
+   KXL_Clear_Frame(0, 0, w, h);
+   // Auto repeat off
+-  XAutoRepeatOff(KXL_Root->Display);
++  XkbSetDetectableAutoRepeat(KXL_Root->Display, True,
++                             &KXL_Root->DetectAutoRepeat);
++  if(!KXL_Root->DetectAutoRepeat) {
++    XAutoRepeatOff(KXL_Root->Display);
++  }
+ }
+ 
+ //==============================================================
+@@ -377,7 +383,9 @@
+   XFreeGC(KXL_Root->Display, KXL_Root->Frame->Gc);
+   KXL_Free(KXL_Root->Frame);
+   // Auto repeat on
+-  XAutoRepeatOn(KXL_Root->Display);
++  if(!KXL_Root->DetectAutoRepeat) {
++    XAutoRepeatOn(KXL_Root->Display);
++  }
+   // Delete font
+   XFreeGC(KXL_Root->Display, KXL_Root->FontGC);
+   // Delete window
diff --git a/dev-games/KXL/files/KXL-1.1.7-as-needed.patch b/dev-games/KXL/files/KXL-1.1.7-as-needed.patch
new file mode 100644
index 000000000000..d99564202ecd
--- /dev/null
+++ b/dev-games/KXL/files/KXL-1.1.7-as-needed.patch
@@ -0,0 +1,8 @@
+--- src/Makefile.am.old 2009-01-28 16:03:27.000000000 +0100
++++ src/Makefile.am     2009-01-28 16:03:47.000000000 +0100
+@@ -2,3 +2,4 @@
+ libKXL_la_SOURCES = KXLmisc.c KXLsound.c KXLjoystick.c KXLvisual.c KXLimage.c
+ include_HEADERS = KXL.h
+ libKXL_la_LDFLAGS = -release $(VERSION)
++libKXL_la_LIBADD = -lX11
+
diff --git a/dev-games/KXL/files/KXL-1.1.7-ldflags.patch b/dev-games/KXL/files/KXL-1.1.7-ldflags.patch
new file mode 100644
index 000000000000..e628b5d2170f
--- /dev/null
+++ b/dev-games/KXL/files/KXL-1.1.7-ldflags.patch
@@ -0,0 +1,10 @@
+--- KXL.m4.old	2010-09-23 14:20:45.000000000 +0200
++++ KXL.m4	2010-09-23 14:21:08.000000000 +0200
+@@ -29,7 +29,6 @@
+ 
+ dnl add the KXL library
+ KXL_LIBS="$KXL_LIBS -lKXL"
+-LDFLAGS="$KXL_LIBS"
+ AC_MSG_RESULT($KXL_LIBS)
+ 
+ AC_PATH_XTRA
diff --git a/dev-games/KXL/files/KXL-1.1.7-m4.patch b/dev-games/KXL/files/KXL-1.1.7-m4.patch
new file mode 100644
index 000000000000..f039974e6f98
--- /dev/null
+++ b/dev-games/KXL/files/KXL-1.1.7-m4.patch
@@ -0,0 +1,9 @@
+Get rid of aclocal warning:
+/usr/share/aclocal/KXL.m4:6: warning: underquoted definition of AM_PATH_KXL
+--- KXL-1.1.7/KXL.m4
++++ KXL-1.1.7/KXL.m4
+@@ -5,3 +5,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_KXL,
++AC_DEFUN([AM_PATH_KXL],
+ [dnl
diff --git a/dev-games/KXL/metadata.xml b/dev-games/KXL/metadata.xml
new file mode 100644
index 000000000000..a580c9cfe304
--- /dev/null
+++ b/dev-games/KXL/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE 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>
+KXL is the library developed for the purpose of the ability to develop a 
+game easily on X Window System of Linux.
+
+KXL is the composition of the window of one sheet, and the frame buffer 
+of one sheet.
+
+KXL corresponds to reading of a bitmap picture, and offers a still 
+simple drawing function and a wave sound function.
+
+KXL is written only using xlib.
+
+KXL is written by the C language.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 25c1cd354b44..8f4575e8d5b7 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite-1.1.6 b/dev-games/aseprite-1.1.6
deleted file mode 100644
index beb0ec703c3c..000000000000
--- a/dev-games/aseprite-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml media-libs/allegro:0[X,png] media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 ) app-arch/unzip gtk3? ( virtual/pkgconfig ) webp? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Animated sprite editor & pixel art tool
-EAPI=6
-HOMEPAGE=https://www.aseprite.org
-IUSE=debug kde gtk3 test webp
-KEYWORDS=amd64 x86
-LICENSE=BSD GPL-2 MIT
-RDEPEND=dev-libs/tinyxml media-libs/allegro:0[X,png] media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 )
-SLOT=0
-SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.6/Aseprite-v1.1.6-Source.zip
-_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_=3e7e329db3649f0fc2e584d5b63dfb1b
diff --git a/dev-games/aseprite-1.1.7 b/dev-games/aseprite-1.1.7
deleted file mode 100644
index 8b98aa8ddee0..000000000000
--- a/dev-games/aseprite-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/tinyxml !bundled-libs? ( media-libs/allegro:0[X,png] ) media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 ) app-arch/unzip gtk3? ( virtual/pkgconfig ) webp? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Animated sprite editor & pixel art tool
-EAPI=6
-HOMEPAGE=https://www.aseprite.org
-IUSE=bundled-libs debug kde gtk3 test webp
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2 MIT
-RDEPEND=dev-libs/tinyxml !bundled-libs? ( media-libs/allegro:0[X,png] ) media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 )
-SLOT=0
-SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.7/Aseprite-v1.1.7-Source.zip
-_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_=094db423657874c4360b654d234c3f43
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
new file mode 100644
index 000000000000..245492a5f57c
--- /dev/null
+++ b/dev-games/aseprite/Manifest
@@ -0,0 +1,6 @@
+AUX aseprite-1.1.7_type-punned_pointer.patch 836 BLAKE2B ca46926a87411fa74c7d66830bd4fc43dc3ae5130342bbb4300398c11a810949ccc530a8a7e66ae6265b2f89fe0bd667557ee7c647491e93d52768d74a340554 SHA512 c01ca8dc6bcee6276f3f4c7f7f141d8528372f0cbbb33c036b89ba64e639966d9b9955a78ec917ef7ebeda2148abc817bc4df7c1fe02818734f51cd7452df9ca
+DIST Aseprite-v1.1.6-Source.zip 11801981 BLAKE2B f20186a1669d7f9ab1453a2104a54228c22e2ef1703bba200f44c965b3fb3d9310c1ddd343db9c27ddca3564e4245352476c5228e171f1c0e74c553e5a59d419 SHA512 d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac
+DIST Aseprite-v1.1.7-Source.zip 11801711 BLAKE2B 282492c29ece6b5b5bed029c7f27aa0a287bcb475f60066b6c34f54607b2714f35540e4d6ef4737818712776c2202162ce47c5713ba26b756d9e1c1d8af9c904 SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6
+EBUILD aseprite-1.1.6.ebuild 2137 BLAKE2B 25892ae8c493a1798ec344a840fe2f5dcb04e60441020095d00b294be7fb7af634138a715a36cb6135b9413b0a26ab21d25b42204e8c371d15e113acb1fcb0dd SHA512 41724723ae7a318ceff10178795709cfc2c9b8bc87836c02404f5af3ff03a5cdbc204ace11ca81f3699b649bdfda7471b4692eb6f1f3a6bf324965fd075a696f
+EBUILD aseprite-1.1.7.ebuild 2525 BLAKE2B 01c1954bf6a9ed76400da5c639a3efbdaa55117878febd7c049e38116245a8ee8602d693fbdcf8428692b5c7480b9603d6dbfebcb09dbf98da5ce4e765bf9da1 SHA512 d1fd7b3edcb428398aaeb794442aad5da944ddc03cc0a31ea5fc74bbe2fb9acce5f58b628b9789cbeb9fed54682336a5e4805d907d99e7ae9658b593d13442c9
+MISC metadata.xml 796 BLAKE2B f4d58bec1834431cd95364d44c0a61d5ed81c12a7b4d45d854fd69be57dbcd450936d0653c8a84640a4e23a2d59bf2e34d329db78c1c41943e6b835f0cf5ed50 SHA512 a85107e1261336c570d11265e0ede9eb9c6724c5f891786aadc509bc52e593cc61f6fc77022b928c56ef4dfe51b2f9d3f3eb603ffb2d0f4e6586fbc4d1794984
diff --git a/dev-games/aseprite/aseprite-1.1.6.ebuild b/dev-games/aseprite/aseprite-1.1.6.ebuild
new file mode 100644
index 000000000000..1809ebfb3e4a
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.1.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="https://www.aseprite.org"
+SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip"
+
+# See https://github.com/aseprite/aseprite#credits
+# Some bundled third-party packages built-in:
+# gtest duktape modp_b64 simpleini
+LICENSE="BSD GPL-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="debug kde gtk3 test webp"
+
+RDEPEND="dev-libs/tinyxml
+	media-libs/allegro:0[X,png]
+	media-libs/freetype
+	media-libs/giflib:=
+	webp? ( media-libs/libwebp )
+	media-libs/libpng:0=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/pixman
+	gtk3? ( dev-cpp/gtkmm:3.0 )
+	kde? (
+		dev-qt/qtcore:5
+		kde-frameworks/kio:5 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	gtk3? ( virtual/pkgconfig )
+	webp? ( virtual/pkgconfig )"
+
+DOCS=( docs/files/ase.txt
+	docs/files/fli.txt
+	docs/files/msk.txt
+	docs/files/pic.txt
+	docs/files/picpro.txt
+	README.md )
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix to make flag-o-matic work.
+	if use debug ; then
+		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
+	fi
+	# Fix shebang in thumbnailer
+	sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
+
+	local mycmakeargs=(
+		-DENABLE_UPDATER=OFF
+		-DFULLSCREEN_PLATFORM=ON
+		-DUSE_SHARED_ALLEGRO4=ON
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_FREETYPE=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_LIBLOADPNG=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_PIXMAN=ON
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DUSE_SHARED_LIBWEBP=ON
+		-DWITH_DESKTOP_INTEGRATION=ON
+		-DWITH_GTK_FILE_DIALOG_SUPPORT="$(usex gtk3)"
+		-DWITH_QT_THUMBNAILER="$(usex kde)"
+		-DWITH_WEBP_SUPPORT="$(usex webp)"
+		-DENABLE_TESTS="$(usex test)"
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newicon "${S}/data/icons/ase64.png" "${PN}.png"
+	cmake-utils_src_install
+}
diff --git a/dev-games/aseprite/aseprite-1.1.7.ebuild b/dev-games/aseprite/aseprite-1.1.7.ebuild
new file mode 100644
index 000000000000..bba4ca73d864
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.1.7.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="https://www.aseprite.org"
+SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip"
+
+# See https://github.com/aseprite/aseprite#credits
+# Some bundled third-party packages built-in:
+# gtest duktape modp_b64 simpleini
+LICENSE="BSD GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="bundled-libs debug kde gtk3 test webp"
+
+RDEPEND="dev-libs/tinyxml
+	!bundled-libs? ( media-libs/allegro:0[X,png] )
+	media-libs/freetype
+	media-libs/giflib:=
+	webp? ( media-libs/libwebp )
+	media-libs/libpng:0=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/pixman
+	gtk3? ( dev-cpp/gtkmm:3.0 )
+	kde? (
+		dev-qt/qtcore:5
+		kde-frameworks/kio:5 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	gtk3? ( virtual/pkgconfig )
+	webp? ( virtual/pkgconfig )"
+
+DOCS=( docs/files/ase.txt
+	docs/files/fli.txt
+	docs/files/msk.txt
+	docs/files/pic.txt
+	docs/files/picpro.txt
+	README.md )
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}/${P}_type-punned_pointer.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix to make flag-o-matic work.
+	if use debug ; then
+		sed -i '/-DNDEBUG/d' CMakeLists.txt || die
+	fi
+	# Fix shebang in thumbnailer
+	sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUGMODE -D_DEBUG
+
+	local mycmakeargs=(
+		-DENABLE_UPDATER=OFF
+		-DFULLSCREEN_PLATFORM=ON
+		-DUSE_SHARED_ALLEGRO4=$(usex !bundled-libs)
+		-DUSE_SHARED_CURL=ON
+		-DUSE_SHARED_FREETYPE=ON
+		-DUSE_SHARED_GIFLIB=ON
+		-DUSE_SHARED_JPEGLIB=ON
+		-DUSE_SHARED_LIBLOADPNG=ON
+		-DUSE_SHARED_LIBPNG=ON
+		-DUSE_SHARED_PIXMAN=ON
+		-DUSE_SHARED_TINYXML=ON
+		-DUSE_SHARED_ZLIB=ON
+		-DUSE_SHARED_LIBWEBP=ON
+		-DWITH_DESKTOP_INTEGRATION=ON
+		-DWITH_GTK_FILE_DIALOG_SUPPORT="$(usex gtk3)"
+		-DWITH_QT_THUMBNAILER="$(usex kde)"
+		-DWITH_WEBP_SUPPORT="$(usex webp)"
+		-DENABLE_TESTS="$(usex test)"
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	if use !bundled-libs ; then
+		ewarn "Aseprite has been built with system-wide Allegro 4."
+		ewarn "Please note that you will not be able to resize the main window."
+		ewarn "For resizing support enable USE-flag bundled-libs and rebuild package."
+	fi
+}
diff --git a/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch b/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch
new file mode 100644
index 000000000000..ca0921437fc8
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch
@@ -0,0 +1,28 @@
+diff --git a/src/allegro/src/x/xkeyboard.c b/src/allegro/src/x/xkeyboard.c
+index f121e62..86fa4f7 100644
+--- a/src/allegro/src/x/xkeyboard.c
++++ b/src/allegro/src/x/xkeyboard.c
+@@ -356,6 +356,14 @@ static int find_unknown_key_assignment (int i)
+    return _xwin.keycode_to_scancode[i];
+ }
+
++/* unicode_getc:
++ * Reads a character from a Unicode string.
++ */
++static int unicode_getc(AL_CONST char *s)
++{
++   return *((unsigned short *)s);
++}
++
+
+
+ /* _xwin_keyboard_handler:
+@@ -412,7 +420,7 @@ void _xwin_keyboard_handler(XKeyEvent *event, int dga2_hack)
+       }
+       buffer[len] = '\0';
+       uconvert(buffer, U_UTF8, buffer2, U_UNICODE, sizeof buffer2);
+-      unicode = *(unsigned short *)buffer2;
++      unicode = unicode_getc(buffer2);
+
+ #ifdef ALLEGRO_XWINDOWS_WITH_XIM
+       r = XFilterEvent((XEvent *)event, _xwin.window);
diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
new file mode 100644
index 000000000000..67070f03bd3e
--- /dev/null
+++ b/dev-games/aseprite/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Animated sprite editor and pixel art tool
+	</longdescription>
+	<use>
+		<flag name="bundled-libs">Use the upstream provided bundled version of allegro 4.4.2</flag>
+		<flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag>
+		<flag name="webp">Enable webp image format support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">aseprite/aseprite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/cardpics-0.4 b/dev-games/cardpics-0.4
deleted file mode 100644
index c5943421f37a..000000000000
--- a/dev-games/cardpics-0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=set of free cards sets
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/cardpics/
-KEYWORDS=amd64 hppa x86
-LICENSE=GPL-2
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/cardpics/cardpics-0.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_=ccee334f657015b53e5090362edb55e9
diff --git a/dev-games/cardpics-0.4-r1 b/dev-games/cardpics-0.4-r1
deleted file mode 100644
index 77e11c8e0985..000000000000
--- a/dev-games/cardpics-0.4-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=set of free cards sets
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/cardpics/
-KEYWORDS=amd64 ~hppa x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/cardpics/cardpics-0.4.tar.bz2
-_md5_=048d29bf453850784f3fd2362cd3a4cc
diff --git a/dev-games/cardpics/Manifest b/dev-games/cardpics/Manifest
new file mode 100644
index 000000000000..e814f141f1bb
--- /dev/null
+++ b/dev-games/cardpics/Manifest
@@ -0,0 +1,4 @@
+DIST cardpics-0.4.tar.bz2 151425 BLAKE2B 6288352ad22dcb38610791ed44be955c473c9ebfb1e31c2b290e41e062866b4843ffdff074ebeb1e485fadb4917381b09492566dd761bb578d88f515711a4061 SHA512 7451112f5b7954326e381563a3730c677b261481de79ede3def451591ce081e651a86a4c24ff3259ab979ac109446588bb1cacd0beed6892a5a288f190bf6382
+EBUILD cardpics-0.4-r1.ebuild 328 BLAKE2B dc039060052afcd7520f8260d12bd87c4036fab07acca92f8f219fca1cf811c6e08c958312b62301426f6667fabd0938e158e59c80116a8b3063d5cb3947855b SHA512 9332a64344e91edf52fa5dbfc7485ec36b3841fc1e67d69f8a7006320f6d904d4b9bb9b3989af8ce05a5b0ff3dfa145a90cff3277d85328710a5930665542ddb
+EBUILD cardpics-0.4.ebuild 384 BLAKE2B b1f4253af23a2256df9b2dac3f2d6d0db51162dd17c4af198e1bcfe77c04a224b9ea0f35e78f2afc8a80b6ad6093f906063ffabedc73dc5c20a2e53ce919e4d6 SHA512 7b9ad606eba08dea69d59c233bedad164a0dc3971ce818a4faae4c0a277ce82f6e0a4a3117cd6de720f3c94907ad4a71eb8b09a8629ca5379ecd5ddaeb0e9726
+MISC metadata.xml 507 BLAKE2B 3c6055891c277cc7bcdb49bf0cdd1609ad86d87dd94cd7f06219aacb43f35de14a63a0b839c7714f7cf62e02468b88f9698356eb5dd23c77b33bdbb6d1b9c2bc SHA512 d460c3bb0906231f2dc1bcd65287aea962a9d88aa676ec87e313fa8057334976330b295cc9495cbd346af0b2f78c41454c9ef611be7aa815421ed037677644fc
diff --git a/dev-games/cardpics/cardpics-0.4-r1.ebuild b/dev-games/cardpics/cardpics-0.4-r1.ebuild
new file mode 100644
index 000000000000..dd4bc0b82cc6
--- /dev/null
+++ b/dev-games/cardpics/cardpics-0.4-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="set of free cards sets"
+HOMEPAGE="http://www.nongnu.org/cardpics/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE=""
diff --git a/dev-games/cardpics/cardpics-0.4.ebuild b/dev-games/cardpics/cardpics-0.4.ebuild
new file mode 100644
index 000000000000..e6044663c1d7
--- /dev/null
+++ b/dev-games/cardpics/cardpics-0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit games
+
+DESCRIPTION="set of free cards sets"
+HOMEPAGE="http://www.nongnu.org/cardpics/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/dev-games/cardpics/metadata.xml b/dev-games/cardpics/metadata.xml
new file mode 100644
index 000000000000..faa613d79a30
--- /dev/null
+++ b/dev-games/cardpics/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+cardpics is a set of free cards sets.
+
+If you are programming a card game and are looking for free cards, 
+Cardpics was made for you! Get a set of cards and include them in your 
+project, as soon as your project is free.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-games/cegui-0.8.7 b/dev-games/cegui-0.8.7
deleted file mode 100644
index 3422116eed0d..000000000000
--- a/dev-games/cegui-0.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) freeimage? ( media-libs/freeimage ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua:0 dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7:= ) opengl? ( virtual/opengl virtual/glu media-libs/glew:= ) pcre? ( dev-libs/libpcre ) 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-libs/boost:=[python,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(+)] ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] ) 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 doc? ( app-doc/doxygen ) opengl? ( media-libs/glm ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Crazy Eddie's GUI System
-EAPI=5
-HOMEPAGE=http://www.cegui.org.uk/
-IUSE=bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) freeimage? ( media-libs/freeimage ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua:0 dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7:= ) opengl? ( virtual/opengl virtual/glu media-libs/glew:= ) pcre? ( dev-libs/libpcre ) 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-libs/boost:=[python,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(+)] ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] )
-REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.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_=0fd5c3c227d8000707f8fbec9b194f30
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
new file mode 100644
index 000000000000..dcec0d57e0b7
--- /dev/null
+++ b/dev-games/cegui/Manifest
@@ -0,0 +1,4 @@
+AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3ccc79e8b361907e9ba1bf7c07a77ba5cf76a49f33d7ceca8d6aedf659f7bdd2826cc1eec3b72352a8a0ed6d7e SHA512 6a8838e8a6ddfb5b73bb765470185530a81ffeaec9d090e1038d317aca800a987b08d3a82744c0b77266d2f351ae2668bada741b26ac303be052071f9daf3408
+DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
+EBUILD cegui-0.8.7.ebuild 3222 BLAKE2B 8313bb7d2c46f774fb4106f0c3fe52e73bce957d7168a772d9621f82e3cbb83335e061a53e65a1704076e07a28685ab62417d9c41a8533dcfb93ccf851082e22 SHA512 6ee93d44cfe059b5db49a34669daf1741e7e847ad01def67c9afcb5162a079cc4fe0d8907e5e0d3815f3ac16cc3c6719bb5224085aad58beef55f71f2d07e496
+MISC metadata.xml 803 BLAKE2B da9534a051925be6cd6d285ce3335c65ba799481840f95aadedb2f81f7a06e05253e8949bf77e7626635437bc5ad5b91af11d6aa452f3524669efdd6216b3bd6 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996
diff --git a/dev-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7.ebuild
new file mode 100644
index 000000000000..179c88599c41
--- /dev/null
+++ b/dev-games/cegui/cegui-0.8.7.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# TODO: multiple ABI?
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic cmake-utils python-single-r1
+
+DESCRIPTION="Crazy Eddie's GUI System"
+HOMEPAGE="http://www.cegui.org.uk/"
+SRC_URI="mirror://sourceforge/crayzedsgui/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip"
+REQUIRED_USE="|| ( expat tinyxml xerces-c xml )
+	${PYTHON_REQUIRED_USE}" # bug 362223
+
+# gles broken
+#	gles? ( media-libs/mesa[gles1] )
+# directfb broken
+#	directfb? ( dev-libs/DirectFB )
+RDEPEND="
+	dev-libs/boost:=
+	virtual/libiconv
+	bidi? ( dev-libs/fribidi )
+	devil? ( media-libs/devil )
+	expat? ( dev-libs/expat )
+	freeimage? ( media-libs/freeimage )
+	irrlicht? ( dev-games/irrlicht )
+	lua? (
+		dev-lang/lua:0
+		dev-lua/toluapp
+	)
+	ogre? ( >=dev-games/ogre-1.7:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		media-libs/glew:=
+	)
+	pcre? ( dev-libs/libpcre )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	tinyxml? ( dev-libs/tinyxml )
+	truetype? ( media-libs/freetype:2 )
+	xerces-c? ( dev-libs/xerces-c )
+	xml? ( dev-libs/libxml2 )
+	zip? ( sys-libs/zlib[minizip] )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	opengl? ( media-libs/glm )"
+
+PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
+
+src_configure() {
+	# http://www.cegui.org.uk/mantis/view.php?id=991
+	append-ldflags $(no-as-needed)
+
+	local mycmakeargs=(
+		-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
+		$(cmake-utils_use devil CEGUI_BUILD_IMAGECODEC_DEVIL)
+		$(cmake-utils_use freeimage CEGUI_BUILD_IMAGECODEC_FREEIMAGE)
+		-DCEGUI_BUILD_IMAGECODEC_PVR=OFF
+		-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF
+		-DCEGUI_BUILD_IMAGECODEC_STB=ON
+		-DCEGUI_BUILD_IMAGECODEC_TGA=ON
+		$(cmake-utils_use lua CEGUI_BUILD_LUA_GENERATOR)
+		$(cmake-utils_use lua CEGUI_BUILD_LUA_MODULE)
+		$(cmake-utils_use python CEGUI_BUILD_PYTHON_MODULES)
+		-DCEGUI_BUILD_RENDERER_DIRECTFB=OFF
+		$(cmake-utils_use irrlicht CEGUI_BUILD_RENDERER_IRRLICHT)
+		-DCEGUI_BUILD_RENDERER_NULL=ON
+		$(cmake-utils_use ogre CEGUI_BUILD_RENDERER_OGRE)
+		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL)
+		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL3)
+		-DCEGUI_BUILD_RENDERER_OPENGLES=OFF
+		$(cmake-utils_use static-libs CEGUI_BUILD_STATIC_CONFIGURATION)
+		-DCEGUI_BUILD_TESTS=OFF
+		$(cmake-utils_use expat CEGUI_BUILD_XMLPARSER_EXPAT)
+		$(cmake-utils_use xml CEGUI_BUILD_XMLPARSER_LIBXML2)
+		-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
+		$(cmake-utils_use tinyxml CEGUI_BUILD_XMLPARSER_TINYXML)
+		$(cmake-utils_use xerces-c CEGUI_BUILD_XMLPARSER_XERCES)
+		$(cmake-utils_use truetype CEGUI_HAS_FREETYPE)
+		$(cmake-utils_use zip CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER)
+		$(cmake-utils_use pcre CEGUI_HAS_PCRE_REGEX)
+		-DCEGUI_SAMPLES_ENABLED=OFF
+		$(cmake-utils_use bidi CEGUI_USE_FRIBIDI)
+		-DCEGUI_USE_MINIBIDI=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && emake -C "${BUILD_DIR}" html
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml "${BUILD_DIR}"/doc/doxygen/html/*
+}
diff --git a/dev-games/cegui/files/cegui-0.8.7-icu-59.patch b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
new file mode 100644
index 000000000000..e64dfc97ab59
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,7 @@
+ 
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
++    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
+     set (CMAKE_C_STANDARD_REQUIRED TRUE)
+     set (CMAKE_C_STANDARD "99")
diff --git a/dev-games/cegui/metadata.xml b/dev-games/cegui/metadata.xml
new file mode 100644
index 000000000000..424b06f2e571
--- /dev/null
+++ b/dev-games/cegui/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="devil">Build the DevIL based ImageCodec module</flag>
+		<flag name="freeimage">Build the FreeImage based ImageCodec module</flag>
+		<flag name="irrlicht">Enable the Irrlicht renderer</flag>
+		<flag name="ogre">Enable the OGRE renderer</flag>
+		<flag name="tinyxml">Enable the Tiny XML parser module</flag>
+		<flag name="xerces-c">Enable the Xerces-C++ XML parser module</flag>
+		<flag name="zip">Enable the Minizip resource provider</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">crayzedsgui</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/clanlib-0.8.1 b/dev-games/clanlib-0.8.1
deleted file mode 100644
index d997312c1484..000000000000
--- a/dev-games/clanlib-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libpng:0 virtual/jpeg:0 virtual/glu virtual/opengl sdl? ( media-libs/libsdl[X] media-libs/sdl-gfx ) x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm media-libs/alsa-lib mikmod? ( media-libs/libmikmod ) vorbis? ( media-libs/libvorbis ) x11-base/xorg-proto
-DESCRIPTION=multi-platform game development library
-EAPI=5
-HOMEPAGE=http://www.clanlib.org/
-IUSE=doc ipv6 mikmod opengl sdl static-libs vorbis
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-RDEPEND=media-libs/libpng:0 virtual/jpeg:0 virtual/glu virtual/opengl sdl? ( media-libs/libsdl[X] media-libs/sdl-gfx ) x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm media-libs/alsa-lib mikmod? ( media-libs/libmikmod ) vorbis? ( media-libs/libvorbis )
-SLOT=0.8
-SRC_URI=http://clanlib.org/download/releases-0.8/ClanLib-0.8.1.tgz
-_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_=5bdd41946f84393ec979d7d8d1eb436b
diff --git a/dev-games/clanlib-2.3.7 b/dev-games/clanlib-2.3.7
deleted file mode 100644
index 48101fcc9c97..000000000000
--- a/dev-games/clanlib-2.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib X? ( media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype media-libs/fontconfig opengl? ( virtual/opengl ) app-arch/bzip2 x11-libs/libX11 ) sqlite? ( dev-db/sqlite:3 ) sound? ( media-libs/alsa-lib ) mikmod? ( media-libs/libmikmod media-libs/alsa-lib ) vorbis? ( media-libs/libogg media-libs/libvorbis media-libs/alsa-lib ) virtual/pkgconfig doc? ( app-doc/doxygen dev-lang/perl ) >=app-portage/elt-patches-20170422
-DESCRIPTION=multi-platform game development library
-EAPI=5
-HOMEPAGE=http://www.clanlib.org/
-IUSE=doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-RDEPEND=sys-libs/zlib X? ( media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype media-libs/fontconfig opengl? ( virtual/opengl ) app-arch/bzip2 x11-libs/libX11 ) sqlite? ( dev-db/sqlite:3 ) sound? ( media-libs/alsa-lib ) mikmod? ( media-libs/libmikmod media-libs/alsa-lib ) vorbis? ( media-libs/libogg media-libs/libvorbis media-libs/alsa-lib )
-REQUIRED_USE=opengl? ( X )
-SLOT=2.3
-SRC_URI=http://clanlib.org/download/releases-2.0/ClanLib-2.3.7.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	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_=e0efa6de0d8eba87fd4df96de7fc97bf
diff --git a/dev-games/clanlib-4.0.0 b/dev-games/clanlib-4.0.0
deleted file mode 100644
index c791b7867b13..000000000000
--- a/dev-games/clanlib-4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib X? ( media-libs/freetype:2 media-libs/fontconfig x11-libs/libX11 opengl? ( virtual/opengl x11-libs/libXrender ) ) sound? ( media-libs/alsa-lib ) virtual/pkgconfig doc? ( app-doc/doxygen dev-lang/perl media-gfx/graphviz ) >=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-platform game development library
-EAPI=6
-HOMEPAGE=https://github.com/sphair/ClanLib
-IUSE=cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=sys-libs/zlib X? ( media-libs/freetype:2 media-libs/fontconfig x11-libs/libX11 opengl? ( virtual/opengl x11-libs/libXrender ) ) sound? ( media-libs/alsa-lib )
-REQUIRED_USE=opengl? ( X )
-SLOT=4.0
-SRC_URI=https://github.com/sphair/ClanLib/archive/v4.0.0.tar.gz -> clanlib-4.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c0c618ee0086c1644fd2d7ce66b14af3
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
new file mode 100644
index 000000000000..6585b5d109dc
--- /dev/null
+++ b/dev-games/clanlib/Manifest
@@ -0,0 +1,17 @@
+AUX clanlib-0.8.1-gcc43.patch 605 BLAKE2B a3af8d2559139da5fede386a4663ce1b9a389309d9ac98efd9ff8580f4051ff1bb0d111d12194a90cf55a8fc681984cb8a93e94655925f93e66464ac343f5111 SHA512 c1269c01852fd2912e895af82f2b109e7d81120a18dc3a7e2542a7bdc80e1da151c5e8a82914eb1fece2e51db17b7f1b99198dde6a36fa437dad3e9b4d6a8b83
+AUX clanlib-0.8.1-gcc44.patch 1523 BLAKE2B d2e25975439249a139c7cef3af824e16bf28c138e467fbfd6f91576ed6ed89bdabd656de1a32ff91f6d5630612cb51c63e50016784fe7db9ff8c1f3158d4df7a SHA512 7c3b154affede758a0ac93f5c142144e8a26c65b7c50a443b49633e0c2835fdfab90c6363d4b1997bfb53b0112bc16ca12abc44aacf7af927329e102fc1424b7
+AUX clanlib-0.8.1-gcc47.patch 338 BLAKE2B c49f079043b1d77b3de13d2d4c1f1a8fbc9ddccc61f612940106007b2a594c808e6406e5bd3e9fed62e75608aced3569d4fab08fc629b678e8f8cf8571620402 SHA512 08f9719c97e0bf5fab83e56a881ac7a3edd162b052b5e8fea5878badedbf266b36788f77afd93032f4129ea8e50a83046f5672675e6616cdb29cb6fc5b6c635a
+AUX clanlib-0.8.1-gcc6.patch 530 BLAKE2B f076e15e0061aad13da8f608ed966f7929a2e71a00f0dd10822d42fcd28af33350494ad4273f80cba7d29dc51b96215c9483638239a8ce7910994a174f1b4932 SHA512 94a49f2aed8487fb03b97219802fd4b525b1de304d1dd3fcc9f7ccc392d5385438005c8198e3db8ec666f4fc875860159fbac94e5d90626c8aaf8730d3831f72
+AUX clanlib-0.8.1-libpng15.patch 377 BLAKE2B 50b99f4104ad4a5e71c5356a073f2dd561eb11856ec7c08e67e7d0503d5d874dc70c198962814950a60ada785aef1c31eb8d074b1cc5cfef9a7806326ec2b099 SHA512 735fd6cadbd1c76ff38a229361c82c1208ea8ba8db60bd8bff082424244da9e88f1c74d8067991516866887d6240846c551a24a7f392a12ae3a2d6ce50e8644f
+AUX clanlib-0.8.1-ndebug.patch 866 BLAKE2B db4f813d62220d283f1d4d43eef69ec40697855c387d444759eabb00a0cdd1cf8913662c6df81da6cd83e3de8a1cf8ebebb29ab212c702f7e58e8391b5fdcb51 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419
+AUX clanlib-2.3.7-autotools.patch 1602 BLAKE2B 054f64c02211799e964ab4b05700375fce18eec039144fc310e111607ee86df1954a815bb96e37eede3fc72ce2bc99961ff2e70c1306406ebf26a3329acd18b6 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa
+AUX clanlib-2.3.7-doc.patch 506 BLAKE2B 0ea958bd60b2b005919caaaabdf7643c1e3b3cfd62b168dae4370826b328111d6d0bb86a708f19c04fc6778b7db76f86ebb130d48cf96d47e8b5be67040f5f24 SHA512 df75223e466799bde70b07e8ea6f3724792dcd5fe96e417dad47b27d44a3d87b6b7157035f388a48ecce9985473a9e1d84a24de1c8f58247eb952fce457ceccb
+AUX clanlib-4.0.0-fix-build-system.patch 622 BLAKE2B 4dd50ea87fb7dc2dccf2f5db5b1e00941ead76313b847b6e6e574b85f8a9ac0b884fbd5b5548125e886f1a405efc1087c978317e9a935c0f0e1ac0dae2da1e76 SHA512 bda813264f552eff8cc7cea45ec4ea29517a8590066c4b435942e97ea7d68e8d2f21bebf83141b04f1fcc84e936bb3a7ad354b644184dd56b746ab3bfeff9e19
+AUX clanlib-4.0.0-freetype_pkgconfig.patch 1243 BLAKE2B 1ffe267b206dd5f17a30883e8b7602b37f12da0477f02d767db74fbb755befac07d0fbf697d212d59ac5786bd6955c03a4834f3aad885ccffa3b6830fd1bd1c9 SHA512 b6cc46f4e339d7f415c96baf7c7f9e24968d6e5961d438566e1bb111042f3aad3d434e8e6dd02128444db19259f3d81cb373a21513df0eb2d9d87975c49fc87d
+DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
+DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
+DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
+EBUILD clanlib-0.8.1.ebuild 2072 BLAKE2B 5958dd9e7654163edb82fab6072895cf5a2b2f14476599495239ae8d5c2458198ac084619c2704bcdafedf6497fd9cffc036c53c8d1552074a786226a5e299cb SHA512 8a95e0dba71b4f46080c5dffce02353dc792be4bc6a3991bd16422b1530207b0d70422fd258aa5a36ca674f829429f50d95c991607142fcd1b2bdbdccc65a17e
+EBUILD clanlib-2.3.7.ebuild 2150 BLAKE2B f20d5f06c5ef8adb1f68bde558cc9f114f678f14ebf7397565e37aaf26d9734f822fa874bd877de092aed352ed34fac9865f81db39d56e8427a845770a2db823 SHA512 845fea2f039d35a937f75b88deb866c7db55903254b664ae0fa86520f5d0a7ba111466284f6be99ef6422403b1cdfd45ba6f7ba0ff97d26309ab65ba80eeef57
+EBUILD clanlib-4.0.0.ebuild 1567 BLAKE2B 050e1c8a108dd5ac8ad39caed85e05be9bfea7b21b6e763f9b6e9fdecf940a780de970f94e2c7c480411c5e37d336a0be4f6db8f842f2271d873b281a1c6a11f SHA512 012b62b2ad5ee8a8ff87befccbf33f18186f81bdb0b202606f68a50d22ee978f51cfcdff4ed7119be101de0ae8a7e40202a8e007571616068240fbc502db8d0a
+MISC metadata.xml 3096 BLAKE2B a800d15375b63fd801b1941937815e34197ff8c598f7d6f539a0bb50205e182434506ccf44a9677527a9edd4c9470d3b7d344830d21d7c20386a1998f123fdf8 SHA512 7973a8121a9ae268d6572c9ae980f2b81650e159cfcbee7895097d906637159e4e3470fb7dadb1f58c4928d377860c73978b38c8bb03c44f8dc73d715d9139bd
diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild
new file mode 100644
index 000000000000..32096e028f55
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic eutils
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz"
+
+LICENSE="ZLIB"
+SLOT="0.8"
+KEYWORDS="amd64 x86" #not big endian safe #82779
+IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
+
+# opengl keyword does not drop the GL/GLU requirement.
+# Autoconf files need to be fixed
+RDEPEND="media-libs/libpng:0
+	virtual/jpeg:0
+	virtual/glu
+	virtual/opengl
+	sdl? (
+		media-libs/libsdl[X]
+		media-libs/sdl-gfx
+	)
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXxf86vm
+	media-libs/alsa-lib
+	mikmod? ( media-libs/libmikmod )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/ClanLib-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ndebug.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc6.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_configure() {
+	#clanSound only controls mikmod/vorbis so there's
+	# no need to pass --{en,dis}able-clanSound ...
+	#clanDisplay only controls X, SDL, OpenGL plugins
+	# so no need to pass --{en,dis}able-clanDisplay
+	# also same reason why we don't have to use clanGUI
+	econf \
+		--enable-dyn \
+		--enable-clanNetwork \
+		--disable-dependency-tracking \
+		$(use_enable x86 asm386) \
+		$(use_enable doc docs) \
+		$(use_enable opengl clanGL) \
+		$(use_enable sdl clanSDL) \
+		$(use_enable vorbis clanVorbis) \
+		$(use_enable mikmod clanMikMod) \
+		$(use_enable ipv6 getaddr) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	DOCS="CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux" \
+		default
+	if use doc ; then
+		dodir /usr/share/doc/${PF}/html
+		mv "${D}"/usr/share/doc/clanlib/* "${D}"/usr/share/doc/${PF}/html/ || die
+		rm -rf "${D}"/usr/share/doc/clanlib
+		cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
+	fi
+	prune_libtool_files
+}
diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild b/dev-games/clanlib/clanlib-2.3.7.ebuild
new file mode 100644
index 000000000000..994ee11d94ce
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic eutils autotools-utils
+
+MY_P=ClanLib-${PV}
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="amd64 x86" #not big endian safe #82779
+IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="sys-libs/zlib
+	X? (
+		media-libs/libpng:0
+		virtual/jpeg:0
+		media-libs/freetype
+		media-libs/fontconfig
+		opengl? ( virtual/opengl )
+		app-arch/bzip2
+		x11-libs/libX11
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	sound? ( media-libs/alsa-lib )
+	mikmod? (
+		media-libs/libmikmod
+		media-libs/alsa-lib
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/alsa-lib
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-doc.patch
+)
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(
+	CODING_STYLE
+	CREDITS
+	PATCHES
+	README
+)
+
+src_prepare() {
+	autotools-utils_src_prepare
+	ln -sf ../../../Sources/API Documentation/Utilities/ReferenceDocs/ClanLib
+}
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanGL1)
+		$(use_enable opengl clanGUI)
+		$(use_enable X clanDisplay)
+		$(use_enable vorbis clanVorbis)
+		$(use_enable mikmod clanMikMod)
+		$(use_enable sqlite clanSqlite)
+		$(use_enable ipv6 getaddr)
+	)
+	use sound \
+		|| use vorbis \
+		|| use mikmod \
+		|| myeconfargs+=( --disable-clanSound )
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+	autotools-utils_src_install
+	if use doc ; then
+		emake DESTDIR="${D}" install-html
+		dodoc -r Examples Resources
+	fi
+}
diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild b/dev-games/clanlib/clanlib-4.0.0.ebuild
new file mode 100644
index 000000000000..cc7115a38348
--- /dev/null
+++ b/dev-games/clanlib/clanlib-4.0.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_PN=ClanLib
+
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="https://github.com/sphair/ClanLib"
+SRC_URI="https://github.com/sphair/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+	sys-libs/zlib
+	X? (
+		media-libs/freetype:2
+		media-libs/fontconfig
+		x11-libs/libX11
+		opengl? (
+			virtual/opengl
+			x11-libs/libXrender
+		)
+	)
+	sound? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-lang/perl
+		media-gfx/graphviz
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0-fix-build-system.patch
+	"${FILESDIR}"/${PN}-4.0.0-freetype_pkgconfig.patch #658424
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanUI)
+		$(use_enable X clanDisplay)
+		$(use_enable sound clanSound)
+		$(use_enable ipv6 getaddr)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake html
+}
+
+src_install() {
+	default
+
+	use doc && emake DESTDIR="${D}" install-html
+	use examples && dodoc -r Examples Resources
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc43.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc43.patch
new file mode 100644
index 000000000000..ca1d898ce5ab
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc43.patch
@@ -0,0 +1,28 @@
+--- Sources/GL/opengl.cpp
++++ Sources/GL/opengl.cpp
+@@ -51,6 +51,8 @@
+ #endif
+ #endif
+ 
++#include <cstring>
++
+ std::vector<std::string> CL_OpenGL::m_ignored_gl_extension;
+ 
+ CL_ProcAddress *CL_OpenGL::get_proc_address(const std::string& function_name)
+@@ -414,4 +416,4 @@
+ #endif
+ 	
+ 	m_ignored_gl_extension.push_back(extension_name);
+-}
+\ No newline at end of file
++}
+--- Sources/Network/Socket/ip_address_getsock.cpp
++++ Sources/Network/Socket/ip_address_getsock.cpp
+@@ -40,6 +40,7 @@
+ #include "ip_address_getsock.h"
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #ifndef WIN32
+ 	#include <sys/socket.h>
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch
new file mode 100644
index 000000000000..ddf5a170b027
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch
@@ -0,0 +1,33 @@
+diff -Naur ClanLib-0.8.1-old/Sources/GL/canvas_opengl.cpp ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp
+--- ClanLib-0.8.1-old/Sources/GL/canvas_opengl.cpp	2009-08-01 18:15:44.000000000 +0200
++++ ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp	2009-08-01 18:08:55.000000000 +0200
+@@ -48,6 +48,7 @@
+ #include "graphic_context_opengl.h"
+ #include "surface_target_opengl.h"
+ #include <cstring>
++#include <cstdio>
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_Canvas_OpenGL construction:
+diff -Naur ClanLib-0.8.1-old/Sources/GL/GLX/input_device_linuxevent.cpp ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp
+--- ClanLib-0.8.1-old/Sources/GL/GLX/input_device_linuxevent.cpp	2009-08-01 18:17:25.000000000 +0200
++++ ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp	2009-08-01 18:11:23.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <errno.h>
+ #include <cstring>
++#include <cstdio>
+ 
+ #include "API/Core/System/error.h"
+ #include "API/Core/System/clanstring.h"
+diff -Naur ClanLib-0.8.1-old/Sources/GL/GLX/input_device_xinput.cpp ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp
+--- ClanLib-0.8.1-old/Sources/GL/GLX/input_device_xinput.cpp	2009-08-01 18:17:41.000000000 +0200
++++ ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp	2009-08-01 18:12:56.000000000 +0200
+@@ -29,6 +29,7 @@
+ 
+ #include <iostream>
+ #include <cstring>
++#include <cstdio>
+ #include "API/Core/System/log.h"
+ #include "API/Display/input_device.h"
+ #include "API/Display/input_event.h"
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch
new file mode 100644
index 000000000000..19ebab6fd07d
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc47.patch
@@ -0,0 +1,10 @@
+--- ./Sources/Core/IOData/Generic/inputsource_file.cpp.orig	2012-12-30 01:49:01.698950614 +0400
++++ ./Sources/Core/IOData/Generic/inputsource_file.cpp	2012-12-30 01:49:27.714977456 +0400
+@@ -32,6 +32,7 @@
+ #ifdef WIN32
+ #include <direct.h>
+ #endif
++#include <unistd.h>
+ #include <cstring>
+ #include <API/Core/IOData/inputsource_file.h>
+ 
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
new file mode 100644
index 000000000000..95284c2de4ca
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
@@ -0,0 +1,16 @@
+Bug: https://bugs.gentoo.org/596112
+
+--- a/Sources/Core/IOData/Generic/datafile_inputprovider.h
++++ b/Sources/Core/IOData/Generic/datafile_inputprovider.h
+@@ -142,9 +142,9 @@
+ 		void insert(const std::string &resource_id, int data_pos, int data_size)
+ 		{
+ 			cache.insert(
+-				std::make_pair<std::string const, std::pair<int, int> >(
++				std::pair<std::string const, std::pair<int, int> >(
+ 				resource_id,
+-				std::make_pair<int,int>(data_pos, data_size)));
++				std::pair<int,int>(data_pos, data_size)));
+ 		}
+ 
+ 	private:
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch b/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch
new file mode 100644
index 000000000000..03d0ba536acf
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- Sources/Display/Providers/png_provider_generic.cpp
++++ Sources/Display/Providers/png_provider_generic.cpp
+@@ -107,7 +107,7 @@
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ 		cl_assert(false);
+ 	}   
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ 		cl_assert(false);
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch b/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch
new file mode 100644
index 000000000000..e41bae1a3296
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch
@@ -0,0 +1,21 @@
+Patch for clanlib-0.7.8-r2 Bug 154513:
+
+Signal handler deinit() was not declared.
+
+This leads to a compilation failure when a release version
+rather than a debug version is built (-DNDEBUG).
+
+This patch adds the missing declaration, thus make the
+file compile with or without -DNDEBUG.
+
+diff -Naur clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp
+--- clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2003-09-19 10:33:02.000000000 +0000
++++ clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2007-10-26 13:36:39.000000000 +0000
+@@ -52,6 +52,7 @@
+ 	_begin_time = (long) tv.tv_sec*(long) 1000+(long) tv.tv_usec/(long) 1000;
+ 
+ 	#ifdef NDEBUG
++	sighandler_t deinit;
+ 	signal(SIGSEGV, deinit);
+ 	#endif
+ }
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch b/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch
new file mode 100644
index 000000000000..97db79ac4245
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch
@@ -0,0 +1,45 @@
+--- Documentation/Reference/Makefile.am.old	2012-09-25 10:39:25.973544935 +0200
++++ Documentation/Reference/Makefile.am	2012-09-25 10:39:42.560554053 +0200
+@@ -10,7 +10,7 @@
+ 	mkdir doxyoutput;
+ 	mkdir reftest
+ 	doxygen ./clanlib.doxygen
+-	make -C ../Utilities/ReferenceDocs
++	$(MAKE) -C ../Utilities/ReferenceDocs
+ 	../Utilities/ReferenceDocs/ReferenceDocs
+ 
+ install-html:
+--- configure.ac.old	2012-09-25 11:07:38.412537590 +0200
++++ configure.ac	2012-09-25 11:09:41.133939131 +0200
+@@ -337,11 +337,9 @@
+ 
+ 	dnl  Optional linux/joystick.h
+ 	AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)
+-	AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
+ 
+ 	dnl Optional linux/input.h
+ 	AC_CHECK_HEADERS(linux/input.h, linux_input=yes)
+-	AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ 	if test "$WIN32" = "no" && test "$enable_clanDisplay" != "no"; then
+ 	CLANLIB_CHECK_LIB(fontconfig,  [`cat $srcdir/Setup/Tests/fontconfig.cpp`],  clanDisplay, [ *** Cannot find fontconfig (See http://fontconfig.org/ ) (Try libfontconfig1-dev or better) ], [-lfontconfig])
+@@ -358,6 +356,8 @@
+ 			clanDisplay, [ *** Cannot find version 8 of DirectInput], [-ldxguid -lole32 -ldinput8])
+ 	fi
+ fi
++AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
++AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ have_xrender=no
+ 
+@@ -515,9 +515,9 @@
+ 	fi
+ 
+ 	if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
+-	AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ fi
++AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ if test "$enable_clanSound" != "no"; then
+ 	enable_clanSound=yes
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-doc.patch b/dev-games/clanlib/files/clanlib-2.3.7-doc.patch
new file mode 100644
index 000000000000..627df26785b4
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-doc.patch
@@ -0,0 +1,14 @@
+--- Documentation/Utilities/ReferenceDocs/Makefile.old	2014-09-12 20:06:52.970459560 +0200
++++ Documentation/Utilities/ReferenceDocs/Makefile	2014-09-12 20:08:17.387048685 +0200
+@@ -3,7 +3,10 @@
+ LIBS=clanCore
+ EXTRA_LIBS=-lpthread
+ 
+-include ../../../Examples/Makefile.conf
++CXXFLAGS += -pthread -std=c++0x -I.
++all: $(EXAMPLE_BIN)
++$(EXAMPLE_BIN): $(OBJF)
++	$(CXX) $(CXXFLAGS) $(OBJF) -o $(EXAMPLE_BIN) -Wl,-R../../Sources/Core/.libs -L../../../Sources/Core/.libs -lclan23Core $(EXTRA_LIBS)
+ 
+ # EOF #
+ 
diff --git a/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
new file mode 100644
index 000000000000..a3500e22f7e1
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
@@ -0,0 +1,25 @@
+* Fix AM_CONDITIONAL to always be invoked
+* Install html files in proper --htmldir
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -437,8 +437,8 @@
+ 	fi
+ 	
+ 	if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
+-	AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ fi
++AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ if test "$enable_clanNetwork" != "no"; then
+ 	echo "Checking for clanNetwork stuff"
+--- a/Documentation/Makefile.am
++++ b/Documentation/Makefile.am
+@@ -1,6 +1,6 @@
+ EXTRA_DIST = $(wildcart images/*.png)
+ 
+-HTML_PREFIX = $(datadir)/doc/@PACKAGE@-@LT_RELEASE@
++HTML_PREFIX = $(htmldir)
+ 
+ all-local:
+ 
diff --git a/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..34759a8d89d9
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,27 @@
+From af16d8a344b9bafc9131508fecfcdbfdc53cf100 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 25 Jun 2018 15:14:31 +0200
+Subject: [PATCH] Use pkg-config to find freetype.
+
+As of freetype-2.9.1 the freetype-config file no longer gets installed
+by default.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b9def916..c97e959f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -307,7 +307,7 @@ echo ""
+ if test "$enable_clanDisplay" != "no"; then
+ 	echo "Checking for clanDisplay stuff"
+ 	echo "=============================="
+-	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`freetype-config --libs` ], [ `freetype-config --cflags`])
++	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`pkg-config --libs freetype2` ], [ `pkg-config --cflags freetype2`])
+ 
+ 	dnl  Optional linux/joystick.h
+ 	AC_CHECK_HEADERS(linux/joystick.h, has_linux_joystick=yes)
+-- 
+2.18.0
+
diff --git a/dev-games/clanlib/metadata.xml b/dev-games/clanlib/metadata.xml
new file mode 100644
index 000000000000..c6bda8543208
--- /dev/null
+++ b/dev-games/clanlib/metadata.xml
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE 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>
+Welcome to ClanLib, a multi-platform game development library.
+
+ClanLib is a medium level development kit. At its lowest level, it provides a 
+platform independent (as much as that is possible in C++) way of dealing with 
+display, sound, input, networking, files, threadding and such.
+
+On top of that, ClanLib builds a generic game development framework, giving you 
+easy handling of resources, network object replication, graphical user 
+interfaces (GUI) with theme support, game scripting and more.
+
+The goal of ClanLib is to allow the game developer to focus on stuff that 
+matters, avoiding all those nasty (and boring) lowlevel trivials like setting up 
+a directdraw window, sound mixing, reading image files, etc. All those things 
+are simplified into object oriented classes and function calls, making it a joy 
+to write your game.
+
+ClanLib uses a resource system to keep track of images, fonts, samples and 
+music. It supports Targa, PCX, JPEG, PNG and BMP for images. Wave files for 
+sample. Ogg Vorbis (open sound format that has same sound quality as mp3) and 
+MikMod for music. By using a resource system, you cleanly seperate the physical 
+data formats from your code, and makes it easy to make themes and other plugins 
+for your game. The resource system is written in a manner that allows you to add 
+your own custom resources.
+
+All classes in clanlib focus on making simple interfaces that are customizeable 
+and expandable. This keeps your game code clean and simple; but still allows you 
+to do advanced stuff. As an example, look at some sound code:
+CL_SoundBuffer my_sample("Weapon/Minigun/sound", resources);
+my_sample.play();
+
+In this example, we play a simple sound effect, and afterwards forget all about 
+it. Nice and simple. But if we want to adjust the frequency during its playback 
+(eg. for a dobbler effect), it could look like this:
+CL_SoundBuffer_Session playback = my_sample.play();
+playback.set_frequency(1.2f); // increase frequency by 20%
+
+We only need to keep the session handle if we are going to use it. Keep things 
+simple when they are simple, and make them complex when they are complex. :)
+
+The object oriented nature of ClanLib allows you to operate both at high and low 
+levels, minimizing redundant code and still allows you to do stuff that isnt 
+supported by clanlib's high level APIs.
+
+ClanLib currently support Windows 98, Windows 2000, Windows XP and Linux. The 
+following display targets are supported under linux: X11 and OpenGL. Some parts 
+of ClanLib still isnt entirely endian clean, so it will currently only work 
+without problems on the x86 architecture. Work is underway for a MacOS port. 
+Current compilers supported is VC++ 6.0, VC++ 7.0, GCC, Borland and MingW.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sphair/ClanLib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/flatzebra-0.1.6 b/dev-games/flatzebra-0.1.6
deleted file mode 100644
index 266683d5b01c..000000000000
--- a/dev-games/flatzebra-0.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer virtual/pkgconfig
-DESCRIPTION=A generic game engine for 2D double-buffering animation
-EAPI=5
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev
-IUSE=static-libs
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer
-SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/flatzebra-0.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_=f063ee26a47645e34cce6ebd7c7d3ac5
diff --git a/dev-games/flatzebra/Manifest b/dev-games/flatzebra/Manifest
new file mode 100644
index 000000000000..f1e6bb3437ac
--- /dev/null
+++ b/dev-games/flatzebra/Manifest
@@ -0,0 +1,3 @@
+DIST flatzebra-0.1.6.tar.gz 359098 BLAKE2B 8f17c76ea70013bc916ef062dbbf333abd5d8935f5daabd47a101a3c16c7dfab169b80dc406e6175d2626b6265f9bc009b8a5f7a5d4bf2dc1ed766e632977d5a SHA512 500df95ee23bd2decf1e11be76725733d9219ef06a844f2de337fc11494eeea57e5ab6298cb4235c394216dd75bfb64a4e9f732362ca5ee95c43086b2ca38f75
+EBUILD flatzebra-0.1.6.ebuild 714 BLAKE2B c492f07a780afd8fb8a0d2597aab1bec8514e877ddec31458e603d65aa0138d5afd72adc9787644c28305f4590289825f402887389e3b06b81d02470645258c2 SHA512 065476edfb99031057a11afb51a6eaa748ef9ea9c67e9a1381f06b5bcd5d0369c990ac9e223354caf5acdd2fddae48d87046238209dcf7a0e93e0b3a42494bf6
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/flatzebra/flatzebra-0.1.6.ebuild b/dev-games/flatzebra/flatzebra-0.1.6.ebuild
new file mode 100644
index 000000000000..a8ca6daebdbc
--- /dev/null
+++ b/dev-games/flatzebra/flatzebra-0.1.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A generic game engine for 2D double-buffering animation"
+HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev"
+SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e '/^doc_DATA =/s/^/NOTHANKS/' \
+		Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+}
diff --git a/dev-games/flatzebra/metadata.xml b/dev-games/flatzebra/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/dev-games/flatzebra/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-games/flinker-1.72 b/dev-games/flinker-1.72
deleted file mode 100644
index 095f1597d0fa..000000000000
--- a/dev-games/flinker-1.72
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=GBA cart writing utility by Jeff Frohwein
-EAPI=5
-HOMEPAGE=http://www.devrs.com/gba/software.php#misc
-KEYWORDS=x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.devrs.com/gba/files/flgba.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e6df6a918ff4270822e971842a546af0
diff --git a/dev-games/flinker/Manifest b/dev-games/flinker/Manifest
new file mode 100644
index 000000000000..e775c90755a2
--- /dev/null
+++ b/dev-games/flinker/Manifest
@@ -0,0 +1,3 @@
+DIST flgba.zip 41380 BLAKE2B 88de6174c81560c6b43925f256dc6f849579f79662dd2b793552017e98e50b7c4f4ffaac20f55c5877864957d3e0da1ef84088d0f7ae17516d869ecb7f618623 SHA512 36e9542d5588c655b3001f7515cca487d0f820cbc7e8613afcda5dbcd1b9c48e4d2f9c3c8b755a466eb421ea6198102408494006c14e3ea3e6a22c2e0da6bb1c
+EBUILD flinker-1.72.ebuild 662 BLAKE2B fc779253dcaecb66831c65ef6db6758c23c45037be563c8de8a8f68a4c62a637cf1eccb5fd1c9b46eb12062a99bc661b0c0ac35b619af3c8a480948d46c7873d SHA512 afc6e48351d07d5cc6a839117657077a30a0889d90d43a48b04a14048343cba022d30cf5ab36adeeb8228af3802374a19ccba4038b790b33416ea1168afcbdca
+MISC metadata.xml 520 BLAKE2B 5afa3a8198ebfaf50e9c4621c02d993134a30e13c817241745610b712e39aec6139e6d129cfa6672caf44314231704961b1f9ac3db6d8c47c38257879587714f SHA512 43499a6b69b0fd7e4fbe773b9f3a4e64e69f49fd2f72c9b03f63035fa660b496d7695d9fe1bd4572d7dee14ab44c159882b32578f4d98d9e9348c2d2f09c73d6
diff --git a/dev-games/flinker/flinker-1.72.ebuild b/dev-games/flinker/flinker-1.72.ebuild
new file mode 100644
index 000000000000..f949e6f6ad24
--- /dev/null
+++ b/dev-games/flinker/flinker-1.72.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="GBA cart writing utility by Jeff Frohwein"
+HOMEPAGE="http://www.devrs.com/gba/software.php#misc"
+SRC_URI="http://www.devrs.com/gba/files/flgba.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	sed -i \
+		-e '/unistd/s:^//::' \
+		-e 's:asm/io.h:sys/io.h:' \
+		fl.c || die
+	echo >> fl.c
+	echo >> cartlib.c
+}
+src_compile() {
+	$(tc-getCC) ${LDFLAGS} -o FLinker ${CFLAGS} fl.c || die
+}
+
+src_install() {
+	dobin FLinker
+	dodoc readme
+}
diff --git a/dev-games/flinker/metadata.xml b/dev-games/flinker/metadata.xml
new file mode 100644
index 000000000000..ae80ddb23f3c
--- /dev/null
+++ b/dev-games/flinker/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+Here's a dos/linux program (with src) that allows you program a Visoly flash 
+cart (up to 50% faster than official software) or an official Nintendo flash 
+cart (2-3 times faster than official hw/sw) by using the Visoly flash linker.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-games/goatee-0.3.0 b/dev-games/goatee-0.3.0
deleted file mode 100644
index 5557e56120a3..000000000000
--- a/dev-games/goatee-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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-libs/gmp-5:= virtual/libffi:= >=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 - library
-EAPI=5
-HOMEPAGE=http://khumba.net/projects/goatee
-IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3
-RDEPEND=>=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-libs/gmp-5:= virtual/libffi:=
-SLOT=0/0.3.0
-SRC_URI=mirror://hackage/packages/archive/goatee/0.3.0/goatee-0.3.0.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_=0cd82ed2c02d04fd36fcf9e745ac9ac1
diff --git a/dev-games/goatee-0.3.1.1 b/dev-games/goatee-0.3.1.1
deleted file mode 100644
index c3f5b7658e79..000000000000
--- a/dev-games/goatee-0.3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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 - library
-EAPI=6
-HOMEPAGE=http://khumba.net/projects/goatee
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=>=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/0.3.1.1/goatee-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_=8aa1cdf2cedf38557f234e6bf8ed8554
diff --git a/dev-games/goatee-0.3.1.2 b/dev-games/goatee-0.3.1.2
deleted file mode 100644
index f538137094b2..000000000000
--- a/dev-games/goatee-0.3.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=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 - library
-EAPI=6
-HOMEPAGE=http://khumba.net/projects/goatee
-IUSE=doc hscolour profile test
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3
-RDEPEND=>=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.2
-SRC_URI=mirror://hackage/packages/archive/goatee/0.3.1.2/goatee-0.3.1.2.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_=0abdb7077adee24aa4c91d436f0b5eed
diff --git a/dev-games/goatee/Manifest b/dev-games/goatee/Manifest
new file mode 100644
index 000000000000..180a094735f8
--- /dev/null
+++ b/dev-games/goatee/Manifest
@@ -0,0 +1,8 @@
+AUX goatee-0.3.0-ghc-7.10.patch 546 BLAKE2B a14a14f4b1f5a4cb5f896f1a79a5c3113d85bfc2b2f7092f12728147b7db9cb7ab466eb14657abaa2c2acfc3cbc7be080683ddf693d58a2497a86388f062b62b SHA512 2551f95738d40fdb231244612ce795170bc829017f547512351975a52f608adb9feb7275fca57eddbb4cf6b6f0c178dafa3e805942c9373dff19cdcee4346ce2
+DIST goatee-0.3.0.tar.gz 83679 BLAKE2B 53ccdd9b46024f854c25818158e0e79f70f8494202d1a609a9df0f0c2410aacdd653307d9cd1436a98a7d4e8d8289a10067d2c95448fdbe9229dd9e2196d4f83 SHA512 57c5340ba6aadbd4fd5d328702012e02a5e36c50be7f714bc1f8adedb3270c2174ad3c60d30dd7b93b93b4a3a3e6436ec9e5957561e13046dfde869b71ec2cd6
+DIST goatee-0.3.1.1.tar.gz 84493 BLAKE2B b3264abcbfa53b4a549fc2339df610a7510c23921e8b6b7c760c0c68b7836d4f6389ccb17d0419277e33a5220b5bb0bf836a2cc0c04511ce20f31f2c95f553d1 SHA512 cc08009476a9f5d670874f3a4417d9c1c942e7c38ad88fe45dccc008585ad9e4d7cc3db61eeb84ebb65ff31cec7ba387a6ab5f27490152796a148b6bca3a47c0
+DIST goatee-0.3.1.2.tar.gz 84576 BLAKE2B 66eea2e0685279acadba0ae857786bc8bf5eec26d4856745f6a040ac220a824d02e7c9ccf36e38d81ad8a60e90972681f9e2ab2e5f67fa4af267e5f8bb5cc98c SHA512 b8723679823dbb092346f8a6c556c3391888f004d609d6b61c73c9f590901abc5d4024d0ad4063692078637be0171d78e9a91c9436735423d597f310226ee9db
+EBUILD goatee-0.3.0.ebuild 863 BLAKE2B cd6d59ce29ee4b8d61362d9da7d4420794a3d0b9310f87cd067dec4f7a68a88ebbfa7458f3bd074070fce128c52383a3953fe2ee42f7b22d951c37d986cb9fd1 SHA512 51281e3cf0975299225f4479f7c15e8cc04452bf803c0dedf5dee0caf98cbcaee1931f014a433b38f7d18f16ff9a91c91d19f531dcc6f24a6f86486b1bcda232
+EBUILD goatee-0.3.1.1.ebuild 835 BLAKE2B ae0ee1b272c6f30c7f307776343050c1d35af80745cdf8dc5868ccb608e1daa53d9fd15bfdebb994d4d115d3007860a315831e71bf82a6d6024bca55e9b94586 SHA512 3fbaf090b2423ce21a66912438271e9cdc935a234ca4059718ea599cbc1686c4aef9025210ad487a7b4784cb7f05da169991ef1122fdb0fef8178ce444ed2c63
+EBUILD goatee-0.3.1.2.ebuild 770 BLAKE2B 56ea91a4113b8c7b90013d15d59adca9f9c9e58f7bfcb07ad1f410f56ebc951e38ea2e7ba949880af940813379a186fc766f59b2e81e3fe48275778d2c569c82 SHA512 11e30dfa40a908c1e2cb5fdc04f98642fe0c95a91536f315fa666ad9329e080f8ac0c728933d40d1c732f9cbb19525a226ebdf0cba72fbaa0312fc79816af9a1
+MISC metadata.xml 815 BLAKE2B ec7785235c9879ff74718aa5240e07455f1e36ecf3fccef95e7a49cad7f4f79d3dcb729ea2d50271e277410a3dfdcbcdbd63f155c84d0fcb061761ccbe1bd2fb SHA512 34c22d6f4785a966025c02f5e51ae0159e4dea45359a97e795865b3c75a119dbeb5d9c9485c897381ed932e21c7ce846753de66926b0bf4ff0a5a08a4472ef49
diff --git a/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch b/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch
new file mode 100644
index 000000000000..e2881220fec4
--- /dev/null
+++ b/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/Game/Goatee/CommonTest.hs b/tests/Game/Goatee/CommonTest.hs
+index bf27662..33e4f24 100644
+--- a/tests/Game/Goatee/CommonTest.hs
++++ b/tests/Game/Goatee/CommonTest.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -- This file is part of Goatee.
+diff --git a/tests/Game/Goatee/Lib/MonadTest.hs b/tests/Game/Goatee/Lib/MonadTest.hs
+index c5b505f..bf10f4e 100644
+--- a/tests/Game/Goatee/Lib/MonadTest.hs
++++ b/tests/Game/Goatee/Lib/MonadTest.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -- This file is part of Goatee.
diff --git a/dev-games/goatee/goatee-0.3.0.ebuild b/dev-games/goatee/goatee-0.3.0.ebuild
new file mode 100644
index 000000000000..eaa730300920
--- /dev/null
+++ b/dev-games/goatee/goatee-0.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - library"
+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-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-libs/gmp-5:=
+	virtual/libffi:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+
+	cabal_chdeps \
+		'HUnit >= 1.2 && < 1.3' 'HUnit >= 1.2'
+}
diff --git a/dev-games/goatee/goatee-0.3.1.1.ebuild b/dev-games/goatee/goatee-0.3.1.1.ebuild
new file mode 100644
index 000000000000..316620ad346a
--- /dev/null
+++ b/dev-games/goatee/goatee-0.3.1.1.ebuild
@@ -0,0 +1,34 @@
+# 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="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - library"
+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-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'
+}
diff --git a/dev-games/goatee/goatee-0.3.1.2.ebuild b/dev-games/goatee/goatee-0.3.1.2.ebuild
new file mode 100644
index 000000000000..36c88ba4c3ee
--- /dev/null
+++ b/dev-games/goatee/goatee-0.3.1.2.ebuild
@@ -0,0 +1,27 @@
+# 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="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - library"
+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-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 )
+"
diff --git a/dev-games/goatee/metadata.xml b/dev-games/goatee/metadata.xml
new file mode 100644
index 000000000000..7bb68a35c426
--- /dev/null
+++ b/dev-games/goatee/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<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 shared library.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-games/gtkradiant-1.5.0_pre20060302 b/dev-games/gtkradiant-1.5.0_pre20060302
deleted file mode 100644
index e0a92eeea275..000000000000
--- a/dev-games/gtkradiant-1.5.0_pre20060302
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=FPS level editor
-EAPI=5
-HOMEPAGE=http://www.qeradiant.com/?data=editors/gtk
-KEYWORDS=-* x86
-LICENSE=qeradiant
-RDEPEND==media-libs/libpng-1.2* sys-libs/zlib app-crypt/mhash =dev-libs/glib-2* x11-libs/gtk+:2 dev-libs/atk x11-libs/pango x11-libs/gtkglext dev-libs/libxml2 sys-libs/glibc virtual/opengl games-misc/games-envd
-SLOT=0
-SRC_URI=http://zerowing.idsoftware.com/files/radiant/nightly/1.5/gtkradiant-1.5.0-2006-03-02.i386.rpm
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=456a6e8d02940975a4948638ae7d8ec8
diff --git a/dev-games/gtkradiant/Manifest b/dev-games/gtkradiant/Manifest
new file mode 100644
index 000000000000..d429f071cb03
--- /dev/null
+++ b/dev-games/gtkradiant/Manifest
@@ -0,0 +1,3 @@
+DIST gtkradiant-1.5.0-2006-03-02.i386.rpm 3130735 BLAKE2B ec104a4316d5a5a26e0ef8a094763bc736b75745d1ab5fb2bb252e457dcd4a6150b81dda69d1fb3770834c173a30ec7e1ac55cfb815057e6f9826685a2e0f836 SHA512 198c36d505dc68e5bbe550248eb57264527c3ce135d0f63513962fd10255aa6b7176b4262b6392361628098e09cf983991ebb4bc0bb75c54a996a0c8eda9dd2d
+EBUILD gtkradiant-1.5.0_pre20060302.ebuild 884 BLAKE2B 3b0efe610c76f14b583d916e03b30f2de596b5d53c4718a53613bc54d0f2ef0b60c40b4e51a5cad371b4c7cf30a88f5688bd0f8c897c3051b71d9c7b40c91f60 SHA512 c378d7da74a9d20d3c8fcda4d2074250df18cb92b445022c01c407e17f2b129e647b619617cc935c32e5403ff38c2ec672cf84c868c4f78e43253592576a1804
+MISC metadata.xml 537 BLAKE2B b6f656860ab1911d55ba9fd5280c11e8b03c77010c8a0e62aea75be50c9d938c9fb58221b6db66b6f3a08d6855ab5a8af3449ee89ca0a5487002be351c1e6622 SHA512 2deacb6b6cf45f2bf2acbdc564a14a0e36e79bcdec05ce8e0dc8d0cf1d9245b31470839086b9e5eb563f97895d2d01de304d2b3507202d4587d21bedf57a2266
diff --git a/dev-games/gtkradiant/gtkradiant-1.5.0_pre20060302.ebuild b/dev-games/gtkradiant/gtkradiant-1.5.0_pre20060302.ebuild
new file mode 100644
index 000000000000..7ac136d9547f
--- /dev/null
+++ b/dev-games/gtkradiant/gtkradiant-1.5.0_pre20060302.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games rpm
+
+DS="${PV/*_pre}"
+DESCRIPTION="FPS level editor"
+HOMEPAGE="http://www.qeradiant.com/?data=editors/gtk"
+SRC_URI="http://zerowing.idsoftware.com/files/radiant/nightly/${PV:0:3}/gtkradiant-${PV/_pre*}-${DS:0:4}-${DS:4:2}-${DS:6:2}.i386.rpm"
+
+LICENSE="qeradiant"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+
+RDEPEND="=media-libs/libpng-1.2*
+	sys-libs/zlib
+	app-crypt/mhash
+	=dev-libs/glib-2*
+	x11-libs/gtk+:2
+	dev-libs/atk
+	x11-libs/pango
+	x11-libs/gtkglext
+	dev-libs/libxml2
+	sys-libs/glibc
+	virtual/opengl"
+
+S=${WORKDIR}/opt/${PN}
+
+src_install() {
+	local dir="${GAMES_PREFIX_OPT}/${PN}"
+	dodir "${dir}"
+
+	cp -pPR * "${D}/${dir}/" || die
+	games_make_wrapper q3map2 ./q3map2.x86 "${dir}"
+	games_make_wrapper radiant ./radiant.x86 "${dir}"
+
+	prepgamesdirs
+}
diff --git a/dev-games/gtkradiant/metadata.xml b/dev-games/gtkradiant/metadata.xml
new file mode 100644
index 000000000000..7e463cc7009f
--- /dev/null
+++ b/dev-games/gtkradiant/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+GtkRadiant is a level editor supporting multiple games and mods: Quake III Arena, Quake III: Team Arena, Quake III Arena modifications, Return To Castle Wolfenstein, Jedi Knight II: Jedi Outcast, Soldier Of Fortune II, Star Trek Voyager: Elite Force.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-games/guichan-0.8.2 b/dev-games/guichan-0.8.2
deleted file mode 100644
index 84f92494fd9d..000000000000
--- a/dev-games/guichan-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl 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
-DESCRIPTION=a portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL
-EAPI=5
-HOMEPAGE=http://guichan.sourceforge.net/
-IUSE=allegro opengl sdl static-libs
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl media-libs/sdl-image )
-SLOT=0
-SRC_URI=https://guichan.googlecode.com/files/guichan-0.8.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_=d2c2654c254f711a163894c7a2e5fca1
diff --git a/dev-games/guichan/Manifest b/dev-games/guichan/Manifest
new file mode 100644
index 000000000000..2676d9773472
--- /dev/null
+++ b/dev-games/guichan/Manifest
@@ -0,0 +1,5 @@
+AUX guichan-0.8.2-as-needed.patch 545 BLAKE2B d7e42927c989ed2271432c48c427c52f6753362b0b7d36e2121f50f00bfa75877d307925bfe96965f5eddc52a32e233b6ef2be68d112abde9256c2cbd1dccf4e SHA512 521fc3fa1e85d8ffc5758b5b8ae16a04e44391867b7a660179505980fd572d8e3430e2c2ed4bcf7def645ae1a1b54d16802b06c1cfd254e11cd9813529f06de1
+AUX guichan-0.8.2-automake-1.13.patch 263 BLAKE2B 0b6eb223af234dd3731909bb433bb2757d83167d5422479fa7b354931e4da9ad3cf624f6c6f3e6b7f0e2f60d010fcf1a0a4c300553f7f15b33d280a06a4c1521 SHA512 804684f620de981890e60d68c25c7d36cb23faae038144b6e65df2927ddc20b6d072fcc9fd6aecd9c73410bc21e532087f349f7d5acd17a9799e6073d53af410
+DIST guichan-0.8.2.tar.gz 574662 BLAKE2B eb8d5754d86c57e28bffe20420873ca4c5c0d0e72ad98d09717385be06ccb2572ae1f09e80d5b3119fb01d77f1ad7181af683b536e8ed3e493686687a9cef212 SHA512 b05b3da3c998399eadbaf3154de533038bb394919569c361c26245aa0e7072493b12d3556c94a2420622007525e19dcd76a27db06a76fb56ec96d50429a6ed98
+EBUILD guichan-0.8.2.ebuild 941 BLAKE2B 7bbd50c062804de37c242cb100e212dcafc747fa364f6c7042dbae5c0e2670c03fe0564ac7ce1c7cd941305d4ba208e15ce08ff093d3b51efc760aebcc48adce SHA512 e969ffc89ee76cb66f85adf9f754b49e2459bedeac76e5faef8d69cf1f36006b6b2d55a9f58d215789768d042229b2e4db184a36efa7a07eadcb92485bf97e77
+MISC metadata.xml 454 BLAKE2B 3a64aa2bb08b19c9543193b15c7af1cd35fcc62db103f746e707204c9ffa10bef91c79c5d4b0e00e409c1c7862344b22ac8ad3570896a6086d7e5ff95aef0e57 SHA512 251a56d1bc96013f0b04e30586ab367d9ccf3ef6f39b375ee48186e40669574f3026297c7d3214cc5dca143bf71d7d91db071f64dd05ee9c07a8005ed483af09
diff --git a/dev-games/guichan/files/guichan-0.8.2-as-needed.patch b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch
new file mode 100644
index 000000000000..79eb563c0f8d
--- /dev/null
+++ b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch
@@ -0,0 +1,19 @@
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib
++SUBDIRS = widgets . @GUICHAN_EXTRADIRS@ hge openlayer contrib
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
+--- src/sdl/Makefile.am
++++ src/sdl/Makefile.am
+@@ -6,6 +6,8 @@
+ 
+ libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
++libguichan_sdl_la_LIBADD = -lSDL_image -L$(top_srcdir)/src -lguichan
++
+ libguichan_sdl_la_SOURCES =	\
+ 	sdl.cpp			\
+ 	sdlgraphics.cpp		\
diff --git a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch
new file mode 100644
index 000000000000..e2f46097b82a
--- /dev/null
+++ b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- guichan-0.8.2/configure.in
++++ guichan-0.8.2/configure.in
+@@ -38,7 +38,7 @@
+ AC_SUBST(LT_AGE)
+ 
+ AM_INIT_AUTOMAKE(guichan, $GUICHAN_VERSION)
+-AM_CONFIG_HEADER([include/config.hpp])
++AC_CONFIG_HEADERS([include/config.hpp])
+ 
+ AC_CONFIG_SRCDIR([src/gui.cpp])
+ 
diff --git a/dev-games/guichan/guichan-0.8.2.ebuild b/dev-games/guichan/guichan-0.8.2.ebuild
new file mode 100644
index 000000000000..16a681c1f6e5
--- /dev/null
+++ b/dev-games/guichan/guichan-0.8.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="a portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL"
+HOMEPAGE="http://guichan.sourceforge.net/"
+SRC_URI="https://guichan.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="allegro opengl sdl static-libs"
+
+DEPEND="allegro? ( <media-libs/allegro-5 )
+	opengl? ( virtual/opengl )
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-image
+	)"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-automake-1.13.patch
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable allegro) \
+		$(use_enable opengl) \
+		$(use_enable sdl) \
+		$(use_enable sdl sdlimage) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-games/guichan/metadata.xml b/dev-games/guichan/metadata.xml
new file mode 100644
index 000000000000..f0f0f67b46f8
--- /dev/null
+++ b/dev-games/guichan/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="allegro">Build the Allegro frontend</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">guichan</remote-id>
+		<remote-id type="sourceforge">guichan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/hawknl-1.68-r2 b/dev-games/hawknl-1.68-r2
deleted file mode 100644
index 7c8870efabfa..000000000000
--- a/dev-games/hawknl-1.68-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A cross-platform network library designed for games
-EAPI=5
-HOMEPAGE=http://www.hawksoft.com/hawknl/
-IUSE=doc
-KEYWORDS=amd64 hppa x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.sonic.net/~philf/download/HawkNL168src.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_=87d20cf3752cf2e6a74c624c1a353f1b
diff --git a/dev-games/hawknl/Manifest b/dev-games/hawknl/Manifest
new file mode 100644
index 000000000000..f76c5794d3f5
--- /dev/null
+++ b/dev-games/hawknl/Manifest
@@ -0,0 +1,4 @@
+AUX hawknl-1.68-build.patch 1538 BLAKE2B 08f02aee539b5436dbadaadba32336dbaf54d7ec08b4e902d12124c40c97b449e5641ab5b2485d5f7aeb864c8ac410c1720dc2406213f4c676b4f0aa00be7e60 SHA512 c3bce38bd43987dbe2707c7ab0f13f36689f322e15b9ef7c9bba4d39bae30f2f4992593d74ee11a97c0367eabda42e6d3af84f0821062c0f984dbaea0066467a
+DIST HawkNL168src.tar.gz 181263 BLAKE2B cbd16d6564782dc2a0a70ba875fbe64968063ac2fc2a4f9cd98f268c221d07e3ca0649cf27a6fcfd7735ed43e3e3adb634c1715f83f6bad2924239f79811cdf3 SHA512 52d518a19aaa8005e2e43a693571244a81a5a4450e2f92e6c0a64efb4b32ebfc3aff5d5b3ed09a3cdbee2e444d83067471ac714d7ae03d8cd78f905364c510f0
+EBUILD hawknl-1.68-r2.ebuild 853 BLAKE2B 95490fab3afc628a0491209a7fcef5962905990aa2185713c7c33592f20ad7fbfbb045c4e6bb5d8e964499f62005d9b58a92d716f14157a9692e576e21cb4f4c SHA512 5749a3bb03b77a857ab79eaf8d65307aa9c12a2bb18319a63dd87d20f63d1dd059aefb3df9ee984c44add2c89cc13d248c3fd83033006be3b7e2a7173e123e27
+MISC metadata.xml 1140 BLAKE2B a7fa35900288b1da3adce095bb122b135d1c9af7eea15b180b6eecbcdc394a7755cc04874bab72e1f88a39b21ac4a9a6070af036bcee2eea03d69af596ba0b0a SHA512 088f17589d2c28f7673b68de696fab59559d1074092b804d72550cfd591094fdaf487250928092cf926e90c7699780145d07c49c1132d472b99a3c6caeec7381
diff --git a/dev-games/hawknl/files/hawknl-1.68-build.patch b/dev-games/hawknl/files/hawknl-1.68-build.patch
new file mode 100644
index 000000000000..d94daaaf6d88
--- /dev/null
+++ b/dev-games/hawknl/files/hawknl-1.68-build.patch
@@ -0,0 +1,32 @@
+--- src/makefile.linux.orig	2005-12-16 22:03:24.000000000 -0500
++++ src/makefile.linux	2005-12-16 22:04:18.000000000 -0500
+@@ -34,13 +34,14 @@
+ nltime.o : nlinternal.h nltime.c
+ 
+ install:
++	mkdir -p $(LIBDIR) $(INCDIR) ; chmod 755 $(LIBDIR) $(INCDIR)
+ 	cp $(OUTPUT) $(LIBDIR)
+ 	cp $(STATIC) $(LIBDIR)
+ 	chmod 755 $(LIBDIR)/$(OUTPUT)
+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)
+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so
+-	ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/$(LIBNAME).so
++	ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION)
++	ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION)
++	ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so
++	ln -s $(OUTPUT) $(LIBDIR)/$(LIBNAME).so
+ 	cp ../include/nl.h $(INCDIR)/nl.h
+ 	chmod 644 $(INCDIR)/nl.h
+ 
+--- src/makefile.linux.old	2010-09-10 09:44:53.000000000 +0200
++++ src/makefile.linux	2010-09-10 09:45:09.000000000 +0200
+@@ -13,7 +13,7 @@
+ STATIC = libNL.a
+ OPTFLAGS = -funroll-all-loops -ffast-math -fomit-frame-pointer -O2 -D_GNU_SOURCE -D_REENTRANT
+ CFLAGS = -Wall -fPIC $(INCLUDE) $(OPTFLAGS)
+-LIBFLAGS = -shared -Wl,-soname,NL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
++LIBFLAGS = ${LDFLAGS} -shared -Wl,-soname,libNL.so.$(MAJOR_VERSION).$(MINOR_VERSION) -rdynamic -lpthread
+ OBJECTS = crc.o errorstr.o nl.o sock.o group.o loopback.o err.o thread.o mutex.o condition.o nltime.o
+ 
+ all: $(OBJECTS)
diff --git a/dev-games/hawknl/hawknl-1.68-r2.ebuild b/dev-games/hawknl/hawknl-1.68-r2.ebuild
new file mode 100644
index 000000000000..ff46abad3e7a
--- /dev/null
+++ b/dev-games/hawknl/hawknl-1.68-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="A cross-platform network library designed for games"
+HOMEPAGE="http://www.hawksoft.com/hawknl/"
+SRC_URI="http://www.sonic.net/~philf/download/HawkNL${PV/./}src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/hawknl${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i\ -e '/echo /d' src/makefile.linux || die
+}
+
+src_compile() {
+	emake -C src -f makefile.linux \
+		CC="$(tc-getCC)" \
+		OPTFLAGS="${CFLAGS} -D_GNU_SOURCE -D_REENTRANT"
+}
+
+src_install() {
+	emake -j1 -C src -f makefile.linux \
+		LIBDIR="${D}/usr/$(get_libdir)" \
+		INCDIR="${D}/usr/include" install
+	if use doc ; then
+		dodoc -r samples
+	fi
+}
diff --git a/dev-games/hawknl/metadata.xml b/dev-games/hawknl/metadata.xml
new file mode 100644
index 000000000000..20b595958d04
--- /dev/null
+++ b/dev-games/hawknl/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+HawkNL is a free, open source, game oriented network API released under 
+the GNU Library General Public License (LGPL). HawkNL (NL) is a fairly 
+low level API, a wrapper over Berkeley/Unix Sockets and Winsock. But NL 
+also provides other features including support for many OSs, groups of 
+sockets, socket statistics, high accuracy timer, CRC functions, macros 
+to read and write data to packets with endian conversion, and support 
+for multiple network transports. NL has been tested on Windows 
+9x/ME/NT/2000/XP/CE, Linux, Solaris, IRIX, AIX, BSDs, MacOS 7-9 and 
+MacOS X. There are also the two high level APIs, HawkNLU(tm) (NLU) 
+and HawkVoice(tm), which are built on top of NL. It is NLU and 
+HawkVoice(tm) that are most exciting, since they give developers 
+portable, easy to use alternatives to Microsoft®'s DirectPlay® and 
+DirectPlay® Voice.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-games/hdl_dump-0.8.6.20060901 b/dev-games/hdl_dump-0.8.6.20060901
deleted file mode 100644
index 0ed33d345825..000000000000
--- a/dev-games/hdl_dump-0.8.6.20060901
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=game installer for playstation 2 HD Loader
-EAPI=5
-HOMEPAGE=http://www.psx-scene.com/hdldump/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.psx-scene.com/hdldump/hdl_dumx-0.8.6-20060901-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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=292f52a7aa77bffb47eccf8d9b800b6d
diff --git a/dev-games/hdl_dump/Manifest b/dev-games/hdl_dump/Manifest
new file mode 100644
index 000000000000..345f06bcfb99
--- /dev/null
+++ b/dev-games/hdl_dump/Manifest
@@ -0,0 +1,4 @@
+AUX hdl_dump-0.8.6.20060901-fortify.patch 1443 BLAKE2B 4be87a044e2a7bb55aa3054b9fd11f041e13035c5de36598d9d10877a55f67a7156b82cc0819b299d9f80a8b27d91f09b95b044bdc0d4b09c6b77a5b9f09cfcb SHA512 7af0cd2dfcc0b3535cdfd6d8e3b85e475187e89ef46801f2306032d9c8b7d5bdfaf2b5b1f399d8dc3d54251fc0fb063ee7778f3cf2e70f0c685ae81ceafb17e9
+DIST hdl_dumx-0.8.6-20060901-src.tar.bz2 156322 BLAKE2B f05ce1ccc10e23980ec24d75555bc609b913b0d2c32606b2eb616a7721d7c11ceee6c2a3b8e8bd9020c1747dfb8d514d4924798a512e11e606249c5a8725c45d SHA512 c54c72c3f4d57ca8f3299c0b6044ec5376504f7b7a4c7977d71b996bc8d98577ffa868891e1a599aebbe58b8d3ccf2513c5cf8a47350c0b0f53fd21a0e64bbc8
+EBUILD hdl_dump-0.8.6.20060901.ebuild 699 BLAKE2B f783e29e98f7119afc6b42ea32344908acd496854abe48e6a786fdd5e6768d981bfa2bc0e02c8b7ed0ba49c2bb1aee1bc2032dc6fb59d240f40cd7ec351ffa2f SHA512 e93e9db6acf82a74d6960cc4d52ad670e007c9845eaa85bb92f5359ee56279e52f4c2e4601714ee689f957ff667578c9c769582199467f81f99e400824aa5df0
+MISC metadata.xml 249 BLAKE2B fe8f0b0b97ffe948e8c6fd17a3e9b5d2a5662e5e3f34e7e6ca95d12cbe91ad39b1d138a923972ac44b337b5d962e4604e129efc3a6d91ce67fb354499dcbceaa SHA512 738a899d8e0481cb1c3401c552abae01b86e30a2aaefd1efac7f381b7ae246a3d8467b3e871b5a8f1fe697c59c38bdfb7f62e59ed828646b2c9239049f6a0f02
diff --git a/dev-games/hdl_dump/files/hdl_dump-0.8.6.20060901-fortify.patch b/dev-games/hdl_dump/files/hdl_dump-0.8.6.20060901-fortify.patch
new file mode 100644
index 000000000000..96f85d4609af
--- /dev/null
+++ b/dev-games/hdl_dump/files/hdl_dump-0.8.6.20060901-fortify.patch
@@ -0,0 +1,45 @@
+http://bugs.gentoo.org/340145
+
+fix buffer overflows in path handling.  these defines should only be used
+with host paths, so bumping them up to a larger value should be fine.
+
+--- a/common.h
++++ b/common.h
+@@ -35,7 +35,8 @@
+ C_START
+ 
+ #if !defined (MAX_PATH)
+-#  define MAX_PATH 128
++/* This needs to be at least 256 bytes -- see iin_gi_probe_path */
++#  define MAX_PATH 1024
+ #endif
+ 
+ 
+--- a/osal.h
++++ b/osal.h
+@@ -62,7 +62,8 @@ typedef struct
+ #  define OSAL_HANDLE_INIT { -1 } /* file descriptor */
+ #  define OSAL_IS_OPENED(x) ((x).desc != -1)
+ 
+-#  define MAX_PATH 256
++/* This needs to be at least 256 bytes -- see iin_gi_probe_path */
++#  define MAX_PATH 1024
+ 
+ #endif
+ typedef /*@special@*/ /*@only@*/ /*@out@*/ osal_handle_t* osal_handle_p_t;
+
+the magic field is 32 bytes, so strcpy-ing 32 bytes will add a 33rd NUL char.
+this isn't a problem in practice as the 33rd char is "unknown_0x02", but let's
+fix the issue anyways.
+
+--- a/apa.c
++++ b/apa.c
+@@ -1270,7 +1270,7 @@ apa_initialize_ex (hio_t *hio)
+   set_u32 (&header.length, 128 * 1024 * 2);
+   set_u16 (&header.type, 0x0001);
+   set_ps2fs_datetime (&header.created, time (NULL));
+-  strcpy (header.mbr.magic, "Sony Computer Entertainment Inc.");
++  memcpy (header.mbr.magic, "Sony Computer Entertainment Inc.", 32);
+   header.mbr.unknown_0x02 = 0x02;
+   set_ps2fs_datetime (&header.mbr.created, time (NULL));
+   set_u32 (&header.checksum, apa_partition_checksum (&header));
diff --git a/dev-games/hdl_dump/hdl_dump-0.8.6.20060901.ebuild b/dev-games/hdl_dump/hdl_dump-0.8.6.20060901.ebuild
new file mode 100644
index 000000000000..470f81f67c20
--- /dev/null
+++ b/dev-games/hdl_dump/hdl_dump-0.8.6.20060901.ebuild
@@ -0,0 +1,31 @@
+# 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=$(replace_version_separator 3 -)
+DESCRIPTION="game installer for playstation 2 HD Loader"
+HOMEPAGE="http://www.psx-scene.com/hdldump/"
+SRC_URI="http://www.psx-scene.com/hdldump/hdl_dumx-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fortify.patch #340145
+	sed -i \
+		-e "s/-O0 -g/${CFLAGS}/" \
+		-e "s/@\$(CC)/$(tc-getCC)/" \
+		-e '/LDFLAGS =/d' \
+		Makefile || die
+}
+
+src_install() {
+	dobin hdl_dump
+	dodoc AUTHORS CHANGELOG README TODO
+}
diff --git a/dev-games/hdl_dump/metadata.xml b/dev-games/hdl_dump/metadata.xml
new file mode 100644
index 000000000000..b5988412c8c3
--- /dev/null
+++ b/dev-games/hdl_dump/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-games/higan-ananke-094 b/dev-games/higan-ananke-094
deleted file mode 100644
index 3a3ba8550579..000000000000
--- a/dev-games/higan-ananke-094
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A higan helper library needed for extra rom load options
-EAPI=5
-HOMEPAGE=http://byuu.org/higan/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://byuu.org/files/higan_v094-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_=f3393e29b8757cf8233ff4d2dbf47d88
diff --git a/dev-games/higan-ananke/Manifest b/dev-games/higan-ananke/Manifest
new file mode 100644
index 000000000000..313a508dbc20
--- /dev/null
+++ b/dev-games/higan-ananke/Manifest
@@ -0,0 +1,4 @@
+AUX higan-ananke-094-makefile.patch 1080 BLAKE2B 92f975e2d56a08d6f5aedeaa055adc5b111282233e110cd1daa19b04a3230573c5319f704202e3b616d804684922cbee9ef1492e09ae412714982a5065abe6ef SHA512 d227e478980d987225cee50a632f5282efb8805588f62c020d719c4f828cdfaa41d400ec8ba7a523af72d304bcf6c6e0b9fe6eaea72eb337d885750825de60e0
+DIST higan_v094-source.tar.xz 882732 BLAKE2B fb2794a95060befc3495f347328e62c45ee8a21b888a9958857f739f5fb138704275b3624241fee4224e78678746e68d534db6d8d839eb4a6973c092819c509b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da
+EBUILD higan-ananke-094.ebuild 696 BLAKE2B 8c832616f50292617d11e5fba2ac9cf325f9826e807484e743c9fc3877706494a1ca9968c8d3d6a324a96a0f7b94b4015bddb4055030e74622d3668ecc450397 SHA512 597df8cc24e7b17ae4e4f001d0aebf256da44af8008326952c0286412844ea2d6e1ec15a4f1b635c1cc9768ad0e8fe15b51b09469fff041babce5bed0a2af31a
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/dev-games/higan-ananke/files/higan-ananke-094-makefile.patch b/dev-games/higan-ananke/files/higan-ananke-094-makefile.patch
new file mode 100644
index 000000000000..14639614cad7
--- /dev/null
+++ b/dev-games/higan-ananke/files/higan-ananke-094-makefile.patch
@@ -0,0 +1,38 @@
+--- a/ananke/Makefile
++++ b/ananke/Makefile
+@@ -2,7 +2,7 @@
+ include ../phoenix/Makefile
+ 
+ path := /usr/local/lib
+-flags := $(flags) -O3 -fomit-frame-pointer -I..
++flags := $(flags) $(CXXFLAGS) -I..
+ 
+ all:
+ 	$(compiler) $(cppflags) $(flags) -fPIC -o obj/ananke.o -c ananke.cpp
+@@ -13,7 +13,7 @@
+ else ifeq ($(platform),macosx)
+ 	$(compiler) $(link) -shared -dynamiclib -undefined suppress -flat_namespace -o libananke.dylib obj/ananke.o
+ else
+-	$(compiler) $(link) -shared -Wl,-soname,libananke.so.1 -o libananke.so obj/ananke.o
++	$(compiler) $(link) $(LDFLAGS) -shared -Wl,-soname,libananke.so.1 -o libananke.so obj/ananke.o
+ endif
+ 
+ resource: force
+--- a/nall/Makefile
++++ b/nall/Makefile
+@@ -53,11 +53,11 @@
+     link :=
+   endif
+ 
+-  cflags := -x c -std=c99
+-  objcflags := -x objective-c -std=c99
+-  cppflags := -x c++ -std=c++11
+-  objcppflags := -x objective-c++ -std=c++11
+ endif
++cflags := -x c -std=c99
++objcflags := -x objective-c -std=c99
++cppflags := -x c++ -std=c++11
++objcppflags := -x objective-c++ -std=c++11
+ 
+ # cross-compilation support
+ ifeq ($(arch),x86)
diff --git a/dev-games/higan-ananke/higan-ananke-094.ebuild b/dev-games/higan-ananke/higan-ananke-094.ebuild
new file mode 100644
index 000000000000..b3b0566ec1bb
--- /dev/null
+++ b/dev-games/higan-ananke/higan-ananke-094.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_P=higan_v${PV}-source
+
+DESCRIPTION="A higan helper library needed for extra rom load options"
+HOMEPAGE="http://byuu.org/higan/"
+SRC_URI="http://byuu.org/files/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}/ananke
+
+src_prepare() {
+	cd "${WORKDIR}/${MY_P}"
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake \
+		platform="linux" \
+		compiler="$(tc-getCXX)"
+}
+
+src_install() {
+	newlib.so libananke.so libananke.so.1
+	dosym libananke.so.1 /usr/$(get_libdir)/libananke.so
+}
diff --git a/dev-games/higan-ananke/metadata.xml b/dev-games/higan-ananke/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/dev-games/higan-ananke/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-games/hlsdk-2.3-r1 b/dev-games/hlsdk-2.3-r1
deleted file mode 100644
index 7ce7246273c0..000000000000
--- a/dev-games/hlsdk-2.3-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Half-Life Software Development Kit for mod authors
-EAPI=6
-HOMEPAGE=http://www.valvesoftware.com/hlsdk.htm
-KEYWORDS=x86
-LICENSE=ValveSDK
-SLOT=0
-SRC_URI=http://www.metamod.org/files/sdk/hlsdk-2.3.tgz
-_md5_=c3c6a745f3614ee4fa5da5e595082483
diff --git a/dev-games/hlsdk/Manifest b/dev-games/hlsdk/Manifest
new file mode 100644
index 000000000000..623a7ea5d169
--- /dev/null
+++ b/dev-games/hlsdk/Manifest
@@ -0,0 +1,3 @@
+DIST hlsdk-2.3.tgz 4542895 BLAKE2B d71fe308b29a473776fa6a116e71739ca271baf30a0f89b618077cdfd4cfb27ec2daea8700703a971d23aa4d834d5f8df7091332438883b1bffd8e6c3c3c78b4 SHA512 fbcaf03240851903ad18971acc5a522a4ad9fd48087e1c85b7d2c12999702f69d0b487f3a2f51157859f4373cecc57415e8e048facd874a45553b9b609b2df6b
+EBUILD hlsdk-2.3-r1.ebuild 549 BLAKE2B 6540e433bb48f0a313bffba1f9b14aa744cf26f5533110ce7972b899d920f830d1edf7628462d34a598404368cb072be5452ca5db03ef6f8c31d9313da5a6c1d SHA512 d11daad4b60713b4376eaa0a70c21c4f53473545b9a5c57a5d2a8b93068809500cfb7c941c50f579c46f0536f05f0fc74da9a168e12e427071e4590266b8b43d
+MISC metadata.xml 791 BLAKE2B f1d2bdcb83df16556745e5e0b32b4f1182c0e93ace650e2d0f225ea4d2bbb2aa8757241064396e880e1728dbfe0758a22b988e1d46270b24219e478e678333cf SHA512 665bcb56912ac4ae599138bf80eb7d88c314fab9bf7b87200e977c788b30a4b05576f9b2c8f85167c85c655b671683bf7159dec624f7bbfdf0e7f902eefa3fa2
diff --git a/dev-games/hlsdk/hlsdk-2.3-r1.ebuild b/dev-games/hlsdk/hlsdk-2.3-r1.ebuild
new file mode 100644
index 000000000000..fb397c5dcc84
--- /dev/null
+++ b/dev-games/hlsdk/hlsdk-2.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Half-Life Software Development Kit for mod authors"
+HOMEPAGE="http://www.valvesoftware.com/hlsdk.htm"
+SRC_URI="http://www.metamod.org/files/sdk/${P}.tgz"
+
+LICENSE="ValveSDK"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+src_prepare() {
+	default
+	find -iname '*.orig' -exec rm -f '{}' + || die
+}
+
+src_install() {
+	insinto "$(get_libdir)"/${PN}
+	doins -r multiplayer singleplayer
+	dodoc metamod.hlsdk-2.3.txt metamod.hlsdk-2.3.patch
+}
diff --git a/dev-games/hlsdk/metadata.xml b/dev-games/hlsdk/metadata.xml
new file mode 100644
index 000000000000..5b8bc1ac5475
--- /dev/null
+++ b/dev-games/hlsdk/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+Half-Life SDK
+
+The current version of the Half-Life SDK is 2.3, which includes new functionality 
+for mod authors, greatly increasing their power to create a wide variety of games 
+using the Half-Life engine. The new features included with version 2.3 are the 
+inclusion of the Ricochet source code (with multi-serve technology), first-person 
+spectator code, and updated information on the server query protocol.
+
+Note:
+This is the version from metamod ... it's been ported and updated for use in linux.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-games/irrlicht-1.8.4 b/dev-games/irrlicht-1.8.4
deleted file mode 100644
index 1eb709ac8c9f..000000000000
--- a/dev-games/irrlicht-1.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/jpeg:0 media-libs/libpng:0= app-arch/bzip2 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm app-arch/unzip x11-base/xorg-proto
-DESCRIPTION=open source high performance realtime 3D engine written in C++
-EAPI=6
-HOMEPAGE=http://irrlicht.sourceforge.net/
-IUSE=debug doc static-libs
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-RDEPEND=virtual/jpeg:0 media-libs/libpng:0= app-arch/bzip2 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=mirror://sourceforge/irrlicht/irrlicht-1.8.4.zip https://dev.gentoo.org/~mgorny/dist/irrlicht-1.8.4-patchset.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_=6b6d3f5c952c250c87ed7780968a3453
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
new file mode 100644
index 000000000000..164d7be056a6
--- /dev/null
+++ b/dev-games/irrlicht/Manifest
@@ -0,0 +1,4 @@
+DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602
+DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
+EBUILD irrlicht-1.8.4.ebuild 1791 BLAKE2B fa82391d90d0d1ab65a621e52318c509d30285caddfac29d39dff1300bb04924b0f6012754c856f864185db4b65287d2bc494b4232733ce7a39f855e26be9b3e SHA512 b2e2891bcffa536532c3bbf7ccb9f93a4dd1c9e73f33fd8997394349379ee44e05de0a54af5362dad7f5a80b1841dab740e07812ef9dfbd674cea6bf44fcff89
+MISC metadata.xml 964 BLAKE2B 53a776bc251d381e194ad54eb4f0a24e3d1b0729281d69e1f48d1b744a1de1f33b7e5b400123d4cd04aa74a3e5db0a00682a67f389744fd33c4307437d0e5a30 SHA512 858c0cf4a2ac22ca6728a1449e59fd7a8c098a01587cd039e725b26ee71feb13217036f24bb5de2cbde6f27855eeb0347b43887a56f64a6f7a98f47b0f481503
diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
new file mode 100644
index 000000000000..e843c52e456a
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="open source high performance realtime 3D engine written in C++"
+HOMEPAGE="http://irrlicht.sourceforge.net/"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc static-libs"
+
+RDEPEND="virtual/jpeg:0
+	media-libs/libpng:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${P}/source/${PN^}
+
+PATCHES=( "${WORKDIR}"/${P}-patchset/${P}-gentoo.patch
+	"${WORKDIR}"/${P}-patchset/${P}-config.patch
+	"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
+	"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
+	"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch )
+
+DOCS=( changes.txt readme.txt )
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	edos2unix include/IrrCompileConfig.h
+	sed -i \
+		-e 's:\.\./\.\./media:../media:g' \
+		$(grep -rl '\.\./\.\./media' examples) \
+		|| die 'sed failed'
+	default
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "")
+}
+
+src_install() {
+	cd "${WORKDIR}"/${P} || die
+
+	use static-libs && dolib.a lib/Linux/libIrrlicht.a
+	dolib.so lib/Linux/libIrrlicht.so*
+
+	# create library symlinks
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so
+
+	insinto /usr/include/${PN}
+	doins include/*
+
+	einstalldocs
+
+	# don't do these with einstalldocs because they shouldn't be compressed
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples media
+	fi
+}
diff --git a/dev-games/irrlicht/metadata.xml b/dev-games/irrlicht/metadata.xml
new file mode 100644
index 000000000000..d7f0def17f75
--- /dev/null
+++ b/dev-games/irrlicht/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+The Irrlicht Engine is an open source high performance realtime 3D engine written in 
+C++. It is completely cross-platform, using D3D, OpenGL and its own software renderer, 
+and has all of the state-of-the-art features which can be found in commercial 3d 
+engines.
+We've got a huge active community, and there are lots of games in development that use 
+the engine. You can find enhancements for Irrlicht all over the web, like alternative 
+terrain renderers, portal renderers, world layers, tutorials, editors, bindings for 
+perl, ruby, python, and so on. And best of all: It's completely free.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">irrlicht</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/libmaitretarot-0.1.98 b/dev-games/libmaitretarot-0.1.98
deleted file mode 100644
index 832fad9211e4..000000000000
--- a/dev-games/libmaitretarot-0.1.98
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig
-DESCRIPTION=backend library for the maitretarot games
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/maitretarot/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmaitretarot.pkg/0.1.98/libmaitretarot-0.1.98.tar.bz2
-_md5_=e324b114abfad10a9ac5fb255a35bb77
diff --git a/dev-games/libmaitretarot/Manifest b/dev-games/libmaitretarot/Manifest
new file mode 100644
index 000000000000..41f6e8b5a9bf
--- /dev/null
+++ b/dev-games/libmaitretarot/Manifest
@@ -0,0 +1,3 @@
+DIST libmaitretarot-0.1.98.tar.bz2 158060 BLAKE2B 0883c6232e53caa633091022e9f2488362b400723e78c71b836cf79a0189d304e5aaeadff0de4d3a67f9316c37a848ef5ae56312c79a6f20c287f196dec5675f SHA512 1626f7cd8d53be97b70f4258e83fccefc8edc0605e8850466e94a09f9cfbecf9f763ca7b9154f1fb77da15e9856398b8fce12b12064463a0a9293f8273e95d90
+EBUILD libmaitretarot-0.1.98.ebuild 444 BLAKE2B 9626dde5315059cbf88fba3eddc585d23a5ebd45f7509f15a839a1ec186127b51577e390fe5800d5c50e810470a38d0913b98977d34d8e45f33cf252947eb84d SHA512 ef0d212322583dfb722bb07806380e1e67277ced204cf24691e5d154bfc8085bcf92a2c0594a9fa4a10cffbf87e97ce3092a78e77d4bbeac1793c883bba9cb6c
+MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b
diff --git a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild b/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
new file mode 100644
index 000000000000..82da3cb36b6c
--- /dev/null
+++ b/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DESCRIPTION="backend library for the maitretarot games"
+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=""
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/dev-games/libmaitretarot/metadata.xml b/dev-games/libmaitretarot/metadata.xml
new file mode 100644
index 000000000000..64ab523b4aaf
--- /dev/null
+++ b/dev-games/libmaitretarot/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		MaitreTarot is a Tarot card game. Understand a game like freecell or poker,
+		nothing to do with astrology. Tarot is rather a French game.
+
+		MaitreTarot is made of two kind of elements:
+
+		* A server, that knows the rules, that gives the cards to the clients, that
+		counts the points, and everything else that a server should do.
+		* Clients. The main idea is to have differents clients. Some would be
+		clients for human players, with a GUI (gtk+, qt, web, ncurses, win32...). And
+		some would be AI. That would allow users to play with AI, and even AI
+		tournaments could be played in order to know the best AI!
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-games/libmt_client-0.1.98 b/dev-games/libmt_client-0.1.98
deleted file mode 100644
index 76bb62f24041..000000000000
--- a/dev-games/libmt_client-0.1.98
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-DESCRIPTION=backend library for the maitretarot clients
-EAPI=5
-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/libmt_client.pkg/0.1.98/libmt_client-0.1.98.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_=cf0cb7d19870731260f5916bfa440c4f
diff --git a/dev-games/libmt_client/Manifest b/dev-games/libmt_client/Manifest
new file mode 100644
index 000000000000..e0eec73e9673
--- /dev/null
+++ b/dev-games/libmt_client/Manifest
@@ -0,0 +1,4 @@
+AUX libmt_client-0.1.98-format.patch 2325 BLAKE2B 01827a1a89ae4ad36c6c655b1bfa6a0391cb0e556777873fcf01840ab13ef133dde7e0330b9ef266d3a6b0eb5c5a85fe731bff03ec8be6e7ffbb499edd8b9dd1 SHA512 c4ee6b5a5ef2a62f8022fe6672c2cf9769e9f120fad3abcbbd86c1ff12bc66c5d36ba285b8576eb410cb337c9bbb3e11c9941761a024f0d445b143a1d3de4d65
+DIST libmt_client-0.1.98.tar.bz2 146319 BLAKE2B 0edd2690f8139f62a9f31a19bd869e98f213b613a76ca735b5b95fdc7fb01f8d3e4739828f0d5c3ab0f0f4597875c1334304b1888e3dd237d0e2f6fb19c553ba SHA512 1eb53bd36a171dbc3138942ec8314aaf8a71ca207060ea6d7499d18c2680fe8ebc822d8ec9843675a7c329039d2c985783f239b74b13c004e47a38250a8c4411
+EBUILD libmt_client-0.1.98.ebuild 527 BLAKE2B cdfc8e71ad30f2a174e4d6741fc25532b35a09c0bf58f8ef3b14bf01ce32b0e76c9d98fea1b04403fdf4422f90d1cd516b237f24442b7ffd69d32fe2b6e05ae2 SHA512 f3739072f22a10bd7713ba4a3263c571ecfdc488b6ba0e152fd0be417ebeca8c389ec873974db5daebdaef24c5efe7815d40430059ea9e032c168c461ee7868f
+MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b
diff --git a/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch b/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch
new file mode 100644
index 000000000000..5173853849cc
--- /dev/null
+++ b/dev-games/libmt_client/files/libmt_client-0.1.98-format.patch
@@ -0,0 +1,50 @@
+--- src/mt_client_game.c.old	2015-12-22 08:51:19.858561807 +0100
++++ src/mt_client_game.c	2015-12-22 08:52:48.934904973 +0100
+@@ -56,7 +56,7 @@
+ 	}
+       else
+ 	{
+-	  g_printerr (str_err_function[num]);
++	  g_printerr ("%s\n", str_err_function[num]);
+ 	  exit (-1);
+ 	}
+     }
+@@ -110,27 +110,27 @@
+     }
+ 
+   str_err_function[LIBMT_CLIENT_FUNCTION_INIT] =
+-    _("libmt_client_function INIT : not initialised\n");
++    _("libmt_client_function INIT : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_GAME_INIT] =
+-    _("libmt_client_function GAME_INIT : not initialised\n");
++    _("libmt_client_function GAME_INIT : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_MAKE_BID] =
+-    _("libmt_client_function MAKE_BID : not initialised\n");
++    _("libmt_client_function MAKE_BID : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_MAKE_CHIEN] =
+-    _("libmt_client_function MAKE_CHIEN : not initialised\n");
++    _("libmt_client_function MAKE_CHIEN : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_NOT_MAKE_CHIEN] =
+-    _("libmt_client_function NOT_MAKE_CHIEN : not initialised\n");
++    _("libmt_client_function NOT_MAKE_CHIEN : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_CHOOSE_CARD] =
+-    _("libmt_client_function CHOOSE_CARD : not initialised\n");
++    _("libmt_client_function CHOOSE_CARD : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_DRAW] =
+-    _("libmt_client_function DRAW : not initialised\n");
++    _("libmt_client_function DRAW : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_REMOVE_CARD] =
+-    _("libmt_client_function REMOVE CARD : not initialised\n");
++    _("libmt_client_function REMOVE CARD : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_ACK_REPLAY] =
+-    _("libmt_client_function ACK REPLAY : not initialised\n");
++    _("libmt_client_function ACK REPLAY : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_LOST_CONNECTION] =
+-    _("libmt_client_function LOST CONNECTION : not initialised\n");
++    _("libmt_client_function LOST CONNECTION : not initialised");
+   str_err_function[LIBMT_CLIENT_FUNCTION_NORMAL_CLOSE] =
+-    _("libmt_client_function NORMAL CLOSE : not initialised\n");
++    _("libmt_client_function NORMAL CLOSE : not initialised");
+ 
+   return (0);
+ }
diff --git a/dev-games/libmt_client/libmt_client-0.1.98.ebuild b/dev-games/libmt_client/libmt_client-0.1.98.ebuild
new file mode 100644
index 000000000000..4b26528a061a
--- /dev/null
+++ b/dev-games/libmt_client/libmt_client-0.1.98.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="backend library for the maitretarot clients"
+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}
+
+src_prepare () {
+	epatch "${FILESDIR}"/${P}-format.patch
+}
diff --git a/dev-games/libmt_client/metadata.xml b/dev-games/libmt_client/metadata.xml
new file mode 100644
index 000000000000..64ab523b4aaf
--- /dev/null
+++ b/dev-games/libmt_client/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		MaitreTarot is a Tarot card game. Understand a game like freecell or poker,
+		nothing to do with astrology. Tarot is rather a French game.
+
+		MaitreTarot is made of two kind of elements:
+
+		* A server, that knows the rules, that gives the cards to the clients, that
+		counts the points, and everything else that a server should do.
+		* Clients. The main idea is to have differents clients. Some would be
+		clients for human players, with a GUI (gtk+, qt, web, ncurses, win32...). And
+		some would be AI. That would allow users to play with AI, and even AI
+		tournaments could be played in order to know the best AI!
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-games/libnw-1.30.02 b/dev-games/libnw-1.30.02
deleted file mode 100644
index 25776f92dd8a..000000000000
--- a/dev-games/libnw-1.30.02
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-devel/bison sys-devel/flex
-DESCRIPTION=Tools and libraries for NWN file manipulation
-EAPI=5
-HOMEPAGE=http://openknights.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=openknights
-RDEPEND=!sci-biology/newick-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/openknights/libnw-1.30.02.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2badb3f23b99442081e0c04bfb294c17
diff --git a/dev-games/libnw/Manifest b/dev-games/libnw/Manifest
new file mode 100644
index 000000000000..7feda622ba2d
--- /dev/null
+++ b/dev-games/libnw/Manifest
@@ -0,0 +1,3 @@
+DIST libnw-1.30.02.tar.gz 317336 BLAKE2B 0e7298b409bfa6034a28f5f27e3c4103367fd8adca58bb7510d12aa641a3bea162e82e17343adbd3a1ded94ec9834231def9e4d0ad264512923ffcc0b63625f1 SHA512 5175fe6737dc1a3ddd5e53354435ff0db56ad560f24e330f348190b2ed9e6d2418dc20497dcb64f316572c4c75b298fe12794fde73516347d70e737700f67939
+EBUILD libnw-1.30.02.ebuild 648 BLAKE2B af2d39bc7da110cc96b3ce1464be80cd4ae5fd5ad8527cfab52e2d5f5891f17f193e5fc65d63fc56765427556482e19016059558cbc4d531aa8e3e4937955ed2 SHA512 ed38b757ccb6a879f746d926a6ad0028a77dd8250d09bfcac425a4ce2ab41978104714c1d0756ecd7d54b88fbae1d559b1a32e2c29e6161b80ff10b386c65517
+MISC metadata.xml 1005 BLAKE2B c05bcb17a2d3154e59d8df433ae4d2d4a68243d8031b1393890e528dec94886434a45bf967e9f3c5e11cdd0487d200b517c39bc95ddf8047054ad953c122d974 SHA512 126197d5c5117e3a491dfe5c18103a3544ffdef8c6bd8ac300fecb716e4324f2d0ea07183cd648ac552c8a2b2c37a3cb9a33a5a2898596678da88416bd697ab7
diff --git a/dev-games/libnw/libnw-1.30.02.ebuild b/dev-games/libnw/libnw-1.30.02.ebuild
new file mode 100644
index 000000000000..7cd617c7c93e
--- /dev/null
+++ b/dev-games/libnw/libnw-1.30.02.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Tools and libraries for NWN file manipulation"
+HOMEPAGE="http://openknights.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openknights/${P}.tar.gz"
+
+LICENSE="openknights"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-devel/bison
+	sys-devel/flex"
+RDEPEND="!sci-biology/newick-utils"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CXX =/d' \
+		$(find . -name Makefile.in) || die
+	tc-export CC CXX
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README README.tech TODO" \
+		default
+}
diff --git a/dev-games/libnw/metadata.xml b/dev-games/libnw/metadata.xml
new file mode 100644
index 000000000000..2429b89627b6
--- /dev/null
+++ b/dev-games/libnw/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE 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>
+libnw - libnw's aim is to provide platform-independent routines for the low- and 
+mid-level manipulation of NWN resources, as members of game data files, modules, hak 
+paks, export files, or stand alone. As a side effect, command-line programs are 
+often produced to exercise portions of the library. Ultimately, these routines are 
+intended to be assembled along with some form of GUI to make an equivalent to 
+BioWare's Aurora Toolset.
+libnw is very much a work in progress, coded in C, and initially developed on ia32 
+hardware running GNU/Linux. Members of the OK Project have assisted in porting the 
+code to Mac OS X, as well.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">openknights</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/mercator-0.3.3 b/dev-games/mercator-0.3.3
deleted file mode 100644
index 401c4e0f0a7f..000000000000
--- a/dev-games/mercator-0.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-games/wfmath-1 doc? ( app-doc/doxygen ) virtual/pkgconfig
-DESCRIPTION=WorldForge library primarily aimed at terrain
-EAPI=5
-HOMEPAGE=https://www.worldforge.org/index.php/components/mercator/
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-games/wfmath-1
-SLOT=0
-SRC_URI=mirror://sourceforge/worldforge/mercator-0.3.3.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_=801bdb60f4f732731bf46bf608ecc5d6
diff --git a/dev-games/mercator/Manifest b/dev-games/mercator/Manifest
new file mode 100644
index 000000000000..6dc8f651a4aa
--- /dev/null
+++ b/dev-games/mercator/Manifest
@@ -0,0 +1,3 @@
+DIST mercator-0.3.3.tar.gz 436499 BLAKE2B da807a954e83da39c52b88cfec4ee9c61cff98e6cf71b9c0d0f18540e07811b5d6512ed8b48441c7512f6f6f5c223fa030efe7fb4fca65a750beb0ab3b950e6b SHA512 d8f0bcec904c77ceaadd11474a4a83ec4d5e5086f0c878b147b00f3fb3ef2ae6596553d2d4548f943aa280672dde938d34f4d231782b10149190f5d8029e039a
+EBUILD mercator-0.3.3.ebuild 602 BLAKE2B e6fd18a4d1d79547110893ae36f95178f70e90bb85d449ee7a890b4a9022327a0ebe8f0ade724ad4d02aa283d2e3e63c435b8fcc238bf705578b5e6bbd685ecc SHA512 379570b5258244732f5fabd10601cbf6d9413002df078ed7c2ba45ffd486d911df92826578de103dfa4d74e6fb23a0d950af7ed4637e4714d758a3a8d8b8d15a
+MISC metadata.xml 1299 BLAKE2B e94d86dabd63c3b9588e1f8f380389485a6ba3e0124933a1b18acb48f39ccec50d99a58dc0bda0891258182ec3e2848286da89e77b95fc813222bff70f729b3e SHA512 5c9db3c98c40f56c1859ce211e9a485a70a60dcc05065c7ad7af1bd16cf95b654da6660fafa0e617f99d7159dfe64629ab53d8529015a50b02872c35d698dc60
diff --git a/dev-games/mercator/mercator-0.3.3.ebuild b/dev-games/mercator/mercator-0.3.3.ebuild
new file mode 100644
index 000000000000..92cdc48b0a23
--- /dev/null
+++ b/dev-games/mercator/mercator-0.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="WorldForge library primarily aimed at terrain"
+HOMEPAGE="https://www.worldforge.org/index.php/components/mercator/"
+SRC_URI="mirror://sourceforge/worldforge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+SLOT="0"
+
+RDEPEND=">=dev-games/wfmath-1"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	default
+	use doc && dohtml -r doc/html/*
+	prune_libtool_files
+}
diff --git a/dev-games/mercator/metadata.xml b/dev-games/mercator/metadata.xml
new file mode 100644
index 000000000000..4b1795998d19
--- /dev/null
+++ b/dev-games/mercator/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE 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">
+Mercator is primarily aimed at terrain for multiplayer online games and forms
+one of the WorldForge core libraries. It is intended to be used as a terrain
+library on the client, while a subset of features are useful on the server.
+
+Mercator is designed in such a way that individual tiles can be generated
+on-the-fly from a very small source data set. Each tile uses a fast
+deterministic random number generation to ensure that identical results are
+produced "anytime, anywhere". This enables transmission of terrain across low
+bandwidth links as part of the standard data stream, or server side collision
+detection with the same terrain that the player sees.
+
+The use of tiles means that there is inherently a large degree of gross control
+of the shape of the terrain. Finer control is implemented by allowing geometric
+modifications - for example, a polygonal area might be flattened, or a crater
+could be applied. 
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">worldforge</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/metadata.xml b/dev-games/metadata.xml
new file mode 100644
index 000000000000..b9454811d16e
--- /dev/null
+++ b/dev-games/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-games category contains libraries and utilities relevant to
+		games programming.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-games enthält Bibliotheken und Werkzeuge für die 
+		Spieleprogrammierung.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-games contiene librerias y utilidades referentes 
+		a la programación de juegos.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-gamesカテゴリーにはゲーム・プログラミングに関連したライブラリーと
+		ユーティリティが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-games categorie bevat bibliotheken en hulpmiddelen voor het
+		ontwikkelen van spellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-games chứa các thư viện và tiện ích liên quan
+		đến lập trình trò chơi.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória dev-games obsahuje knižnice a utility pre programovanie hier.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-games contiene librerie ed utilità per lo sviluppo di giochi.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-games contém bibliotecas e utilitários
+		referentes a programação de jogos.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-games zawiera biblioteki i narzędzia związane z
+		programowaniem gier.
+	</longdescription>
+</catmetadata>
+
diff --git a/dev-games/mygui-3.2.2 b/dev-games/mygui-3.2.2
deleted file mode 100644
index 717f057bb783..000000000000
--- a/dev-games/mygui-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=media-libs/freetype:2 ogre? ( dev-games/ogre:=[freeimage,opengl] samples? ( dev-games/ois ) ) opengl? ( virtual/opengl media-libs/glew ) tools? ( dev-games/ois ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library for creating GUIs for games
-EAPI=5
-HOMEPAGE=http://mygui.info/
-IUSE=debug doc +ogre -opengl plugins samples static-libs test tools l10n_ru
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=media-libs/freetype:2 ogre? ( dev-games/ogre:=[freeimage,opengl] samples? ( dev-games/ois ) ) opengl? ( virtual/opengl media-libs/glew ) tools? ( dev-games/ois )
-REQUIRED_USE=ogre? ( !opengl ) opengl? ( !ogre )
-SLOT=0
-SRC_URI=https://github.com/MyGUI/mygui/archive/MyGUI3.2.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_=a8a564247c03a4cdec49b19b0b877538
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
new file mode 100644
index 000000000000..cc0f097e2858
--- /dev/null
+++ b/dev-games/mygui/Manifest
@@ -0,0 +1,6 @@
+AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d95837795820baf5e0e6a11a03448f57cf761f240d3fa62e2f1ef121ac2e9b48b802edf74905fdf68f6744773f612cbe9 SHA512 21aba7d654a7197423bdeaa06fa79219d850c76248546227ece1f4916072289f0ebf68a9ad9a4569a1d5dfc15cf86762db3c0d4d58f4c233c1b4293ffb35e50e
+AUX mygui-3.2.2-build.patch 2801 BLAKE2B c414f7249f63c5addd0c616df3a0ac0979fc7c8565b9c12c8f81007f152c129d868ec9359641ce59abca4b9958bc3fa39bb906b221d66fef4e9df53135bf18da SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d
+AUX mygui-3.2.2-underlinking.patch 398 BLAKE2B 0e4ebdf58228ac6b6368202c40137feadf5f3adeb4f2e20020d2ed8db6db17a1ca0715e1018a5e851cc8a38163e4607e9f705f20f3190fa09de9de0eb7ab3099 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9
+DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
+EBUILD mygui-3.2.2.ebuild 3709 BLAKE2B 7052d559043cf9d8804c2ed98fd11fbfb810ad9e6c59a21e238ed60055efee58d57f3925814639f799a47efcc4e79102653f0174275f0b96987bfb2ccdee6ccd SHA512 78127dd2d71ca2a84428264a70be3101e4684f50b1319bbb0a3d14abe1536262e247677dcbe9bce1a96357e8d8e3bb1afc72d7b20831460ab54203738d7c32a9
+MISC metadata.xml 2039 BLAKE2B d2e8e5e47ddac57da0258a24d00660328998fb34b806d07d1ae7119027fd850c275511ada20943eb27cb8eef22a225781e3e88d5be8ff98684372889ad1d4518 SHA512 35efd58650be9ea1108ae98b5e67d5740d26d831475faca21a3587607396cb9466b93047ebe129d0b3bbf77f3e23d52064d6a1a65b344943fba54f940326af22
diff --git a/dev-games/mygui/files/mygui-3.2.2-FHS.patch b/dev-games/mygui/files/mygui-3.2.2-FHS.patch
new file mode 100644
index 000000000000..14d21626ff7b
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.2.2-FHS.patch
@@ -0,0 +1,44 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Oct 27 22:39:31 UTC 2012
+Subject: FHS
+
+paths hardcoded until upstream fixed the logic
+
+--- mygui-MyGUI3.2.2.orig/CMake/InstallResources.cmake
++++ mygui-MyGUI3.2.2/CMake/InstallResources.cmake
+@@ -24,7 +24,7 @@
+ 	else ()
+ 		install(FILES
+ 			${MYGUI_BINARY_DIR}/bin/${FILENAME}
+-			DESTINATION "bin"
++			DESTINATION "/etc/MYGUI"
+ 		)
+ 	endif ()
+ endfunction(install_file)
+@@ -53,7 +53,7 @@
+ 	if (WIN32)
+ 		set(MYGUI_MEDIA_DIR "../../Media")
+ 	elseif (UNIX)
+-		set(MYGUI_MEDIA_DIR "../share/MYGUI/Media")
++		set(MYGUI_MEDIA_DIR "${CMAKE_INSTALL_PREFIX}/share/MYGUI/Media")
+ 	else ()
+ 		set(MYGUI_MEDIA_DIR "../../Media")
+ 	endif ()
+--- mygui-MyGUI3.2.2.orig/Common/Base/Ogre/BaseManager.cpp
++++ mygui-MyGUI3.2.2/Common/Base/Ogre/BaseManager.cpp
+@@ -49,13 +49,13 @@
+ 		mWindow(nullptr),
+ 		mExit(false),
+ 		mPluginCfgName("plugins.cfg"),
+-		mResourceXMLName("resources.xml"),
++		mResourceXMLName("/etc/MYGUI/resources.xml"),
+ 		mResourceFileName("MyGUI_Core.xml")
+ 	{
+ 		#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
+ 			mResourcePath = macBundlePath() + "/Contents/Resources/";
+ 		#else
+-			mResourcePath = "";
++			mResourcePath = "/etc/MYGUI/";
+ 		#endif
+ 	}
+ 
diff --git a/dev-games/mygui/files/mygui-3.2.2-build.patch b/dev-games/mygui/files/mygui-3.2.2-build.patch
new file mode 100644
index 000000000000..a16b27c285b7
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.2.2-build.patch
@@ -0,0 +1,61 @@
+diff -ru mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake
+--- mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake	2015-01-26 10:32:35.000000000 -0500
++++ mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake	2015-03-14 01:09:40.743621643 -0400
+@@ -4,6 +4,8 @@
+ # also prepare package files for pkg-config and CMake.
+ #######################################################################
+ 
++include(GNUInstallDirs)
++
+ # should we build static libs?
+ if (MYGUI_STATIC)
+   set(MYGUI_LIB_TYPE STATIC)
+@@ -47,7 +49,7 @@
+   else ()
+     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
+   endif ()
+-  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
++  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+   # configure additional packages
+   
+diff -ru mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake
+--- mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake	2015-01-26 10:32:35.000000000 -0500
++++ mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake	2015-03-14 01:08:44.905791784 -0400
+@@ -1,6 +1,8 @@
+ # Configure settings and install targets
+ # FIXME: Copypasted from Ogre and need lots of changes
+ 
++include(GNUInstallDirs)
++
+ if (WIN32)
+ 	set(MYGUI_RELEASE_PATH "/Release")
+ 	set(MYGUI_RELWDBG_PATH "/RelWithDebInfo")
+@@ -60,6 +62,12 @@
+ # install targets according to current build type
+ function(mygui_install_target TARGETNAME SUFFIX)
+ 	install(TARGETS ${TARGETNAME}
++		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo ""
++		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo ""
++		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo ""
++		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Gentoo ""
++	)
++	install(TARGETS ${TARGETNAME}
+ 		RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
+ 		LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ 		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+@@ -171,7 +179,13 @@
+ 		endif ()
+ 		add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
+ 	endif ()
+-	set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
++
++	# rename demo target^M
++	if (${SOLUTIONFOLDER} STREQUAL "Demos")
++		set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER} OUTPUT_NAME MYGUI-${PROJECTNAME})
++	else()
++		set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
++	endif()
+ 	
+ 	add_dependencies(${PROJECTNAME} MyGUIEngine Common)
+ 
diff --git a/dev-games/mygui/files/mygui-3.2.2-underlinking.patch b/dev-games/mygui/files/mygui-3.2.2-underlinking.patch
new file mode 100644
index 000000000000..2d1026856f03
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.2.2-underlinking.patch
@@ -0,0 +1,20 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Jun 15 10:42:42 UTC 2012
+Subject: build system
+
+fix underlinking
+
+--- MyGUIEngine/CMakeLists.txt
++++ MyGUIEngine/CMakeLists.txt
+@@ -48,7 +48,10 @@
+ if (MYGUI_USE_FREETYPE)
+ 	target_link_libraries(${PROJECTNAME}
+ 		${FREETYPE_LIBRARIES}
+-	)
++		dl)
++else()
++	target_link_libraries(${PROJECTNAME}
++		dl)
+ endif()
+ 
+ # platform specific dependencies
diff --git a/dev-games/mygui/metadata.xml b/dev-games/mygui/metadata.xml
new file mode 100644
index 000000000000..0b17cdd092c3
--- /dev/null
+++ b/dev-games/mygui/metadata.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata 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>altren@list.ru</email>
+			<name>Evmenov Georgiy</name>
+		</maintainer>
+		<changelog>http://redmine.mygui.info/repositories/entry/mygui/tags/MyGUI3.2/ChangeLog.txt</changelog>
+		<bugs-to>https://sourceforge.net/tracker/?group_id=193706&amp;atid=946487</bugs-to>
+		<remote-id type="github">MyGUI/mygui</remote-id>
+	</upstream>
+	<use>
+		<flag name="l10n_ru">Install some additional russian docs if 'doc' useflag enabled</flag>
+		<flag name="opengl">Use the opengl render subsystem. (cannot combine with ogre)</flag>
+		<flag name="ogre">Use the ogre render subsystem. (cannot combine with opengl)</flag>
+		<flag name="plugins">Build MyGUI plugins</flag>
+		<flag name="samples">Install MyGUI demos (needs ogre USE flag)</flag>
+		<flag name="tools">Build the tools for development</flag>
+	</use>
+	<longdescription lang="en">
+		MyGUI is a library for creating Graphical User Interfaces (GUIs) for
+		games and 3D applications. The main goals of mygui are: speed,
+		flexibility and ease of use.
+
+		Speed
+		We speed up our system by using our own batching subsystem which
+		combines geometry. It is also possible for the more experienced
+		developers to write their own render system or new subsystems
+
+		Flexibility
+		The library supports plugins that allows you to create dynamically
+		loaded custom controls or subsystems. Most subsystems are expandable
+		with plugins without the need to touch the core code. All resources
+		and settings are described in XML files. It is possible to load
+		resources like fonts, cursors, images, skins, etc. Forms (layouts)
+		via dynamically by using XML files.
+
+		Simplicity
+		The user interface is easy to use and uses delegates (Signals and
+		slots) for easy to use event handling.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
new file mode 100644
index 000000000000..fad4ba2881d6
--- /dev/null
+++ b/dev-games/mygui/mygui-3.2.2.ebuild
@@ -0,0 +1,142 @@
+# 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="FindFreetype"
+inherit eutils cmake-utils flag-o-matic multilib
+
+MY_PN=MyGUI
+MY_P=${MY_PN}${PV}
+
+DESCRIPTION="A library for creating GUIs for games"
+HOMEPAGE="http://mygui.info/"
+SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc +ogre -opengl plugins samples static-libs test tools l10n_ru"
+REQUIRED_USE="ogre? ( !opengl )
+	opengl? ( !ogre )"
+
+RDEPEND="
+	media-libs/freetype:2
+	ogre? (
+		dev-games/ogre:=[freeimage,opengl]
+		samples? ( dev-games/ois )
+	)
+	opengl? ( virtual/opengl
+		media-libs/glew )
+	tools? ( dev-games/ois )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/mygui-${MY_P}
+STATIC_BUILD=${WORKDIR}/${P}_build_static
+
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-FHS.patch
+)
+
+pkg_setup() {
+	if use samples && use !ogre ; then
+		ewarn "Samples disabled, because they only work with ogre!"
+		ewarn "Enable ogre USE flag if you want to use samples."
+	fi
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
+
+	local mycmakeargs=()
+
+	# static configuration
+	if use static-libs ; then
+		mycmakeargs=( -DMYGUI_STATIC=ON
+			-DMYGUI_BUILD_DOCS=OFF
+			-DMYGUI_INSTALL_DOCS=OFF
+			-DMYGUI_USE_FREETYPE=ON
+			$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
+			-DMYGUI_BUILD_DEMOS=OFF
+			-DMYGUI_INSTALL_SAMPLES=OFF
+			-DMYGUI_BUILD_TOOLS=OFF
+			-DMYGUI_INSTALL_TOOLS=OFF
+			-DMYGUI_BUILD_WRAPPER=OFF
+			-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
+
+		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_configure
+		unset mycmakeargs
+	fi
+
+	# main configuration
+	mycmakeargs=( -DMYGUI_STATIC=OFF
+		$(cmake-utils_use doc MYGUI_BUILD_DOCS)
+		$(cmake-utils_use doc MYGUI_INSTALL_DOCS)
+		-DMYGUI_USE_FREETYPE=ON
+		$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
+		$(usex ogre "$(cmake-utils_use samples MYGUI_BUILD_DEMOS)" "-DMYGUI_BUILD_DEMOS=OFF")
+		$(usex ogre "$(cmake-utils_use samples MYGUI_INSTALL_SAMPLES)" "-DMYGUI_INSTALL_SAMPLES=OFF")
+		$(cmake-utils_use tools MYGUI_BUILD_TOOLS)
+		$(cmake-utils_use tools MYGUI_INSTALL_TOOLS)
+		$(cmake-utils_use opengl MYGUI_USE_SYSTEM_GLEW)
+		-DMYGUI_BUILD_WRAPPER=OFF
+		-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
+
+	if use tools || (use samples && use ogre) ; then
+		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=ON )
+	else
+		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# build system does not support building static and shared at once,
+	# run a double build
+	if use static-libs ; then
+		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_compile
+	fi
+
+	cmake-utils_src_compile
+
+	use doc && emake -C "${CMAKE_BUILD_DIR}"/Docs api-docs
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use static-libs ; then
+		find "${STATIC_BUILD}" -name "*.a" \! -name "libCommon.a" -exec dolib.a '{}' \;
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins "${STATIC_BUILD}"/pkgconfig/MYGUIStatic.pc
+	fi
+
+	if use doc ; then
+		dohtml -r "${CMAKE_BUILD_DIR}"/Docs/html/*
+
+		if use l10n_ru ; then
+			docompress -x /usr/share/doc/${PF}/Papers
+			dodoc -r Docs/Papers
+		fi
+	fi
+
+	keepdir /etc/MYGUI
+	fperms o+w /etc/MYGUI
+
+	# test media not needed at runtime
+	rm -rf "${ED%/}"/usr/share/MYGUI/Media/UnitTests || die
+	# wrapper not available for linux, remove related media
+	rm -rf "${ED%/}"/usr/share/MYGUI/Media/Wrapper || die
+}
+
+pkg_postinst() {
+	elog
+	elog "ogre.cfg and Ogre.log are created as"
+	elog "${EROOT%/}/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log"
+	elog
+}
diff --git a/dev-games/newton-3.13 b/dev-games/newton-3.13
deleted file mode 100644
index 4603727a16cb..000000000000
--- a/dev-games/newton-3.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=an integrated solution for real time simulation of physics environments
-EAPI=5
-HOMEPAGE=http://newtondynamics.com/forum/newton.php
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=https://github.com/MADEAPPS/newton-dynamics/archive/newton-3.13.zip
-_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_=389851bf0d8777658f82bf57f5226fbe
diff --git a/dev-games/newton/Manifest b/dev-games/newton/Manifest
new file mode 100644
index 000000000000..406e6ff22f80
--- /dev/null
+++ b/dev-games/newton/Manifest
@@ -0,0 +1,3 @@
+DIST newton-3.13.zip 61059070 BLAKE2B d77dddb222084e2b0c56aa5d7c919f8aaeb00825027d5b75cfeaa33f2e893f7b2ac5f0cd5d14ff387edc924f2c22f11a9b5ca0e00976e4572f2821f78cc819e3 SHA512 767078222569fa6f3b0564fc5882eaa439b76b636101128f19db5047547b91e4a8be45ba8fadc426345db7784a17a7d1c22dce7e87533cba36fd70d145881f32
+EBUILD newton-3.13.ebuild 806 BLAKE2B 530935f6435a0cd2d40b74229191b73a7c19dbbf35c085ef571e3a0e2beb647e4055fd9776797a964aafaeb5321017fe9143d6354b6923d7e03e256f3dee86cf SHA512 0959dcb238dc6677dd4a2615193d89b8fd341e818603580ad08af4d67b6a8394edfd210d8af3eecb70ad73dfc701208bf7e1132c8eba2d6392fb04be346b40ed
+MISC metadata.xml 342 BLAKE2B 284d0480027f479c09aee367aaa561797d76f63e1dcc9c693f9cbcfc28a5249a14561f0377c775286dd332c052f5ba66b8a903d7f4ab1e9ecfa62fc6687bb9f6 SHA512 c7cbedbb073be0d661d134a4e09270aa82232273736a9ad94bf107f551d5511bc6e9849155d01f30342515928b7b1209a4e286437d21bf94151721146340d579
diff --git a/dev-games/newton/metadata.xml b/dev-games/newton/metadata.xml
new file mode 100644
index 000000000000..50e390f21491
--- /dev/null
+++ b/dev-games/newton/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MADEAPPS/newton-dynamics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/newton/newton-3.13.ebuild b/dev-games/newton/newton-3.13.ebuild
new file mode 100644
index 000000000000..83b67791e5ce
--- /dev/null
+++ b/dev-games/newton/newton-3.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs cmake-utils
+
+MY_P="${PN}-dynamics-${P}"
+DESCRIPTION="an integrated solution for real time simulation of physics environments"
+HOMEPAGE="http://newtondynamics.com/forum/newton.php"
+SRC_URI="https://github.com/MADEAPPS/newton-dynamics/archive/${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e '/packages/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=/usr/
+		-DNEWTON_DEMOS_SANDBOX=OFF
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_install
+}
diff --git a/dev-games/ode-0.11.1 b/dev-games/ode-0.11.1
deleted file mode 100644
index 62febd429740..000000000000
--- a/dev-games/ode-0.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=examples? ( virtual/opengl ) doc? ( app-doc/doxygen )
-DESCRIPTION=Open Dynamics Engine SDK
-EAPI=5
-HOMEPAGE=http://ode.org/
-IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 BSD )
-RDEPEND=examples? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/opende/ode-0.11.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_=50bf845dba3bba33881369491e2a7f09
diff --git a/dev-games/ode-0.12 b/dev-games/ode-0.12
deleted file mode 100644
index 882250378fdd..000000000000
--- a/dev-games/ode-0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=examples? ( virtual/opengl ) doc? ( app-doc/doxygen )
-DESCRIPTION=Open Dynamics Engine SDK
-EAPI=5
-HOMEPAGE=http://ode.org/
-IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-2.1 BSD )
-RDEPEND=examples? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/opende/ode-0.12.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_=a754312a2363493a85eed5fa7469b864
diff --git a/dev-games/ode-0.14-r1 b/dev-games/ode-0.14-r1
deleted file mode 100644
index ff9c348a911e..000000000000
--- a/dev-games/ode-0.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=examples? ( virtual/glu virtual/opengl ) doc? ( app-doc/doxygen ) >=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 Dynamics Engine SDK
-EAPI=5
-HOMEPAGE=http://ode.org/
-IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-2.1+ BSD )
-RDEPEND=examples? ( virtual/glu virtual/opengl )
-SLOT=0/6
-SRC_URI=https://bitbucket.org/odedevs/ode/downloads/ode-0.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_=ba35d7ff90397244b77d6eca37c57a92
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
new file mode 100644
index 000000000000..c4a89745ae5e
--- /dev/null
+++ b/dev-games/ode/Manifest
@@ -0,0 +1,8 @@
+AUX ode-0.14-gcc7.patch 2580 BLAKE2B 2f39faf4ad093cb8ec4ad17dc3a72212081f48386566d652bbdc9c2056605ac943144122ad56d5a2c3b797b5275a628e2160a5a02b1ddf7f248053518a73e536 SHA512 d758281bb2f390aab6b793871f8f7e3224e486e6e4d4bc7e9bd0e9e9a9d97ca6f0f7775c3c86478256870e6b76383a6792787f9135e2b7f61e8cea95e6141f8d
+DIST ode-0.11.1.tar.bz2 1720088 BLAKE2B 0908356d45e9b17af80cc2afefd3a09735c4955d0a03b502a60f0bd01023796c3b00b1caf379eac354d7754035db11bcdf802c1ecc72abd28a9fce7e1dd7eef1 SHA512 1e015231f4d01c68e7539144d197031cca23d4b58ea53733184a826ce23388956c428a53385254e7eed2c5d3fc28224a688eb13be7ea648bd78e186c8f203d37
+DIST ode-0.12.tar.bz2 1816246 BLAKE2B 7ac4b9158f6672775e0374a619f71a178cb8a3a1cf8c957d67c2547081a9dd660a091923fec364133dfbe4cd6b82cfe14961bda8994bb6241aa9e1af61ef22ef SHA512 303ffda8afcb89a87d09c44393f590f5646f10e8959ca06746121859ad2407709cd711ab185fed4817a9f74c9ca4ee13d1698a28577211bf65dbaad1141f6fc0
+DIST ode-0.14.tar.gz 4018146 BLAKE2B 7dbb3d4cd673dabce176cf92d9d0b5fdd21dea25b751b8b43fd99a71e7806170fb97459dc2ecc7a9cbd14bf54bd32b4a3e631b78a1c3420ebc11c2d518f0eb45 SHA512 1f74c3c4687ee9665fa70e65a79100747fba577729830a90806e374115f1c161a2f4545cf591b0979054aa3e2f9a3673635668cb7362ab5c213ada0d39b1a03d
+EBUILD ode-0.11.1.ebuild 1517 BLAKE2B 7f332ab19e33a54572c42b1dfb61080bc48183f601c0ea088f0ee9d97d1b6d538b3d3f6f388508259599a820b494c726190792a6ebc7a3b43be55ba5363f745e SHA512 189b0f19879bba9a2fee332a3b83b9a770c83b8edaf469e550880f345e0ff19535a224267b1bc6333a2159ac4c96a5fe1cab16d3279a9795e763db9a3ea09b1b
+EBUILD ode-0.12.ebuild 1541 BLAKE2B 8b0717a7e32e29c86937ce238a969b597adb30b8cc462fef263cf66236c0feed32c6ee946b3434d8de6beaa3e69b508a59dff33d3a4b344313872b62ef5509d3 SHA512 29045dcd28e541e3d2ffeb64d9a3fe9beaf86c5dcad9f8d703d7c3cd6d0074275fe9eec77a91af5627a94b602d0a0178a189e46fc40d875b9357b4dece1fc9ac
+EBUILD ode-0.14-r1.ebuild 1681 BLAKE2B db82254762cd04afbf8a069a2c19f280854bebec9717cb47ab799689616d9d6bc2ba8149f11c4c01960ba5c0211ddf4b4dfceb46140363895f344b899ceeb404 SHA512 8ccde6b1250bbb3dc28903f13a75de68c729003515bab0f504e2d7a3afbde070c65baa8a5d851abca95dfa5630ba39d91c3cf9bb7f680e3bc2435e7903768647
+MISC metadata.xml 917 BLAKE2B 09ae21e95ce0c14de1507aaeec9e40e0c231708dcc55d741a12cae6d55d1a29235c385432e2bb5cbf8a6928e22ff56382be73bce0f84c024e32643697ccd9240 SHA512 46b02d068b5ae22dd6a7cf7e56f4525c377e5c6f35476842f76523c0f0c8582342f46e0972a99195469d59d9f0136b255c35159f91dbe98004cb9c00ea24ca8e
diff --git a/dev-games/ode/files/ode-0.14-gcc7.patch b/dev-games/ode/files/ode-0.14-gcc7.patch
new file mode 100644
index 000000000000..aad0117f3bec
--- /dev/null
+++ b/dev-games/ode/files/ode-0.14-gcc7.patch
@@ -0,0 +1,52 @@
+Bug: https://bugs.gentoo.org/646538
+Upstream commit: https://bitbucket.org/odedevs/ode/commits/6f44023660dc830147a56314ea0627a23f11ad86
+
+# HG changeset patch
+# User oleh_derevenko <>
+# Date 1521993135 -10800
+# Node ID 6f44023660dc830147a56314ea0627a23f11ad86
+# Parent  6a68227619feebf85513331d7320b5a89eadf44f
+Fixed: Command line parameter validation errors have been fixed in some demos (reported by Peter Levine)
+
+diff --git a/ode/demo/demo_jointPR.cpp b/ode/demo/demo_jointPR.cpp
+--- a/ode/demo/demo_jointPR.cpp
++++ b/ode/demo/demo_jointPR.cpp
+@@ -328,8 +328,8 @@
+             if (0 == strcmp("-t", argv[i]) || 0 == strcmp("--texture-path", argv[i]))
+             {
+                 int j = i+1;
+-                if ( j+1 > argc      ||  // Check if we have enough arguments
+-                        argv[j] == '\0' ||  // We should have a path here
++                if ( j >= argc      ||  // Check if we have enough arguments
++                        argv[j][0] == '\0' ||  // We should have a path here
+                         argv[j][0] == '-' ) // We should have a path not a command line
+                     Help(argv);
+                 else
+diff --git a/ode/demo/demo_jointPU.cpp b/ode/demo/demo_jointPU.cpp
+--- a/ode/demo/demo_jointPU.cpp
++++ b/ode/demo/demo_jointPU.cpp
+@@ -575,8 +575,8 @@
+ 
+       if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) {
+         int j = i+1;
+-        if ( j+1 > argc      ||  // Check if we have enough arguments
+-             argv[j] == '\0' ||  // We should have a path here
++        if ( j >= argc      ||  // Check if we have enough arguments
++             argv[j][0] == '\0' ||  // We should have a path here
+              argv[j][0] == '-' ) // We should have a path not a command line
+           Help (argv);
+         else
+diff --git a/ode/demo/demo_piston.cpp b/ode/demo/demo_piston.cpp
+--- a/ode/demo/demo_piston.cpp
++++ b/ode/demo/demo_piston.cpp
+@@ -658,8 +658,8 @@
+                 if ( 0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) )
+                 {
+                     int j = i+1;
+-                    if ( j+1 > argc      ||  // Check if we have enough arguments
+-                            argv[j] == '\0' ||  // We should have a path here
++                    if ( j >= argc      ||  // Check if we have enough arguments
++                            argv[j][0] == '\0' ||  // We should have a path here
+                             argv[j][0] == '-' ) // We should have a path not a command line
+                         Help (argv);
+                     else
diff --git a/dev-games/ode/metadata.xml b/dev-games/ode/metadata.xml
new file mode 100644
index 000000000000..bc254df5ec9a
--- /dev/null
+++ b/dev-games/ode/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE 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>
+ODE is a free, industrial quality library for simulating articulated rigid body
+dynamics - for example ground vehicles, legged creatures, and moving objects in
+VR environments. It is fast, flexible, robust and platform independent, with
+advanced joints, contact with friction, and built-in collision detection.
+	</longdescription>
+	<use>
+		<flag name="double-precision">more precise calculations at the expense of speed</flag>
+		<flag name="gyroscopic">enable gyroscopic term (may cause instability)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">opende</remote-id>
+		<remote-id type="bitbucket">odedevs/ode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/ode/ode-0.11.1.ebuild b/dev-games/ode/ode-0.11.1.ebuild
new file mode 100644
index 000000000000..b0af397fe523
--- /dev/null
+++ b/dev-games/ode/ode-0.11.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Open Dynamics Engine SDK"
+HOMEPAGE="http://ode.org/"
+SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-2.1 BSD )"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="debug doc double-precision examples gyroscopic static-libs"
+
+RDEPEND="examples? (
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	sed -i \
+		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
+		drawstuff/src/Makefile.in \
+		ode/demo/Makefile.in || die
+}
+
+src_configure() {
+	# use bash (bug #335760)
+	CONFIG_SHELL=/bin/bash \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug asserts) \
+		$(use_enable double-precision) \
+		$(use_enable examples demos) \
+		$(use_enable gyroscopic) \
+		$(use_with examples drawstuff X11)
+}
+
+src_compile() {
+	emake
+	if use doc ; then
+		cd ode/doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	DOCS="CHANGELOG.txt README.txt" \
+		default
+	prune_libtool_files
+	if use doc ; then
+		dohtml docs/*
+	fi
+	if use examples; then
+		cd ode/demo
+		exeinto /usr/share/doc/${PF}/examples
+		local f
+		for f in *.c* ; do
+			doexe .libs/${f%.*}
+		done
+		cd ../..
+		doexe drawstuff/dstest/dstest
+		insinto /usr/share/doc/${PF}/examples
+		doins ode/demo/*.{c,cpp,h} \
+			drawstuff/textures/*.ppm \
+			drawstuff/dstest/dstest.cpp \
+			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
+	fi
+}
diff --git a/dev-games/ode/ode-0.12.ebuild b/dev-games/ode/ode-0.12.ebuild
new file mode 100644
index 000000000000..2a92674fd717
--- /dev/null
+++ b/dev-games/ode/ode-0.12.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Open Dynamics Engine SDK"
+HOMEPAGE="http://ode.org/"
+SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-2.1 BSD )"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug doc double-precision examples gyroscopic static-libs"
+
+RDEPEND="examples? (
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	sed -i \
+		-e "s:\$.*/drawstuff/textures:/usr/share/doc/${PF}/examples:" \
+		drawstuff/src/Makefile.in \
+		ode/demo/Makefile.in || die
+}
+
+src_configure() {
+	# use bash (bug #335760)
+	CONFIG_SHELL=/bin/bash \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug asserts) \
+		$(use_enable double-precision) \
+		$(use_enable examples demos) \
+		$(use_enable gyroscopic) \
+		$(use_with examples drawstuff X11)
+}
+
+src_compile() {
+	emake
+	if use doc ; then
+		cd ode/doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	DOCS="CHANGELOG.txt README.txt" \
+		default
+	prune_libtool_files
+	if use doc ; then
+		dohtml docs/*
+	fi
+	if use examples; then
+		cd ode/demo
+		exeinto /usr/share/doc/${PF}/examples
+		local f
+		for f in *.c* ; do
+			doexe .libs/${f%.*}
+		done
+		cd ../..
+		doexe drawstuff/dstest/dstest
+		insinto /usr/share/doc/${PF}/examples
+		doins ode/demo/*.{c,cpp,h} \
+			drawstuff/textures/*.ppm \
+			drawstuff/dstest/dstest.cpp \
+			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
+	fi
+}
diff --git a/dev-games/ode/ode-0.14-r1.ebuild b/dev-games/ode/ode-0.14-r1.ebuild
new file mode 100644
index 000000000000..3f54e7ff25fc
--- /dev/null
+++ b/dev-games/ode/ode-0.14-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Open Dynamics Engine SDK"
+HOMEPAGE="http://ode.org/"
+SRC_URI="https://bitbucket.org/odedevs/ode/downloads/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1+ BSD )"
+SLOT="0/6"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug doc double-precision examples gyroscopic static-libs"
+
+RDEPEND="examples? (
+	virtual/glu
+	virtual/opengl )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+MY_EXAMPLES_DIR=/usr/share/doc/${PF}/examples
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.14-gcc7.patch
+
+	sed -i \
+		-e "s:\$.*/drawstuff/textures:${MY_EXAMPLES_DIR}:" \
+		drawstuff/src/Makefile.am \
+		ode/demo/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# use bash (bug #335760)
+	CONFIG_SHELL=/bin/bash \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug asserts) \
+		$(use_enable double-precision) \
+		$(use_enable examples demos) \
+		$(use_enable gyroscopic) \
+		$(use_with examples drawstuff X11)
+}
+
+src_compile() {
+	emake
+	if use doc ; then
+		cd ode/doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	DOCS="CHANGELOG.txt README.md" \
+		default
+	prune_libtool_files
+	if use doc ; then
+		dohtml docs/*
+	fi
+	if use examples; then
+		docompress -x "${MY_EXAMPLES_DIR}"
+		insinto "${MY_EXAMPLES_DIR}"
+		exeinto "${MY_EXAMPLES_DIR}"
+		doexe drawstuff/dstest/dstest
+		doins ode/demo/*.{c,cpp,h} \
+			drawstuff/textures/*.ppm \
+			drawstuff/dstest/dstest.cpp \
+			drawstuff/src/{drawstuff.cpp,internal.h,x11.cpp}
+		cd ode/demo
+		local f
+		for f in *.c* ; do
+			doexe .libs/${f%.*}
+		done
+	fi
+}
diff --git a/dev-games/ogre-1.10.11 b/dev-games/ogre-1.10.11
deleted file mode 100644
index 992a39693b07..000000000000
--- a/dev-games/ogre-1.10.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost dev-libs/zziplib media-libs/freetype:2 virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gl3plus? ( >=media-libs/mesa-9.2.5 ) gles2? ( >=media-libs/mesa-9.0.0[gles2] ) gles3? ( >=media-libs/mesa-10.0.0[gles2] ) ois? ( dev-games/ois ) tools? ( dev-libs/tinyxml[stl] ) virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Object-oriented Graphics Rendering Engine
-EAPI=6
-HOMEPAGE=https://www.ogre3d.org/
-IUSE=cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl profile tools
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT public-domain
-RDEPEND=dev-libs/boost dev-libs/zziplib media-libs/freetype:2 virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gl3plus? ( >=media-libs/mesa-9.2.5 ) gles2? ( >=media-libs/mesa-9.0.0[gles2] ) gles3? ( >=media-libs/mesa-10.0.0[gles2] ) ois? ( dev-games/ois ) tools? ( dev-libs/tinyxml[stl] )
-REQUIRED_USE=examples? ( ois ) gles3? ( gles2 ) gl3plus? ( opengl )
-RESTRICT=test
-SLOT=0/1.10.0
-SRC_URI=https://github.com/OGRECave/ogre/archive/v1.10.11.zip -> ogre-1.10.11.zip
-_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_=33ed28dfc7e192003ab78bf200b8b4cb
diff --git a/dev-games/ogre-1.9.0-r1 b/dev-games/ogre-1.9.0-r1
deleted file mode 100644
index 7c7f57cc0e48..000000000000
--- a/dev-games/ogre-1.9.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost:= ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( >=media-libs/mesa-9.0.0[gles2] ) gles3? ( >=media-libs/mesa-10.0.0[gles2] ) gl3plus? ( >=media-libs/mesa-9.2.5 ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib ) virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Object-oriented Graphics Rendering Engine
-EAPI=5
-HOMEPAGE=https://www.ogre3d.org/
-IUSE=+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT public-domain
-RDEPEND=media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost:= ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( >=media-libs/mesa-9.0.0[gles2] ) gles3? ( >=media-libs/mesa-10.0.0[gles2] ) gl3plus? ( >=media-libs/mesa-9.2.5 ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib )
-REQUIRED_USE=threads? ( ^^ ( boost poco tbb ) ) examples? ( ois ) poco? ( threads ) tbb? ( threads ) gl3plus? ( !gles2 !gles3 ) gles3? ( gles2 ) gl3plus? ( opengl )
-RESTRICT=test
-SLOT=0/1.9.0
-SRC_URI=https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.bz2 -> ogre-1.9.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	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce5941c889704814e723755d5e0eba21
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
new file mode 100644
index 000000000000..98a96b37a7da
--- /dev/null
+++ b/dev-games/ogre/Manifest
@@ -0,0 +1,13 @@
+AUX ogre-1.10.11-fix_double_precision-88f0d5b.patch 1525 BLAKE2B fbb01668cc0d67f8417a1c244b9cab2ee839e97b89a479c93ae01d61befac735c6a57ae62eeac47b7647d01f2db99ff1527ad5bcb0b92288f7f8f9f0bd253ee9 SHA512 f9b6daa26032f77bd93a76734282b74883870ebc79b3bcbe5f6e8ae65f5e938ff473d9c7152488ee36bced43fd0d7245e39e660e835c214602d1f722e39ea302
+AUX ogre-1.10.11-media_path.patch 922 BLAKE2B c39dfa7eec840d5952dfb0b854396268e418d79fcb2de71886e276cc6984c2fd30180bc3b003bac47aa41b02dc0b3125f130325f1d0143ddfd29f5b42814a5e6 SHA512 5d9e8cc0dbd263a6e8044ea908399e5538aad1002af8a61e4c056fcd3ab5f5573caf5082dc428f4be91d6379298c42ee5b478aab5eac4ae1c2261504627368e3
+AUX ogre-1.10.11-resource_path.patch 782 BLAKE2B 9f4647d38880ac9cf29513159113cf2dc4b173846737ae5e0be74e71be0a02c42790260c86b5ed0382e04e43a75ed931702232421e589dc4011f69584ee949d5 SHA512 61e6f341377f0025ba1bcc4a3edcd6600e811e5bef83dad0f7bcbb8ec1f5d8bbcc2c238eee4cc556523eb4f36be833b6ab3d910da9a4d35186377a75fb6bcf89
+AUX ogre-1.10.11-samples.patch 225 BLAKE2B 52965ede36ed80a72f4cee7fb9800146ab95787e8f3bacf5d69d6fe35a29349f674cc5819b576def33bd0f8e4ead8160cb50822100fbd6bb39aaf9f39f53caa4 SHA512 08d94b7b381debcb2f40b7f4bebad76ea4ed8823fc5809a2a01ada75e36ad870c290aada1495f766c7c9cc446b24fcfdaddf7f518411da90edea827c76814528
+AUX ogre-1.9.0-gcc52.patch 2392 BLAKE2B 3d41e4a6726dabd2f4861774c962a0b5e38cdc5403f3bd457b2ec4b003de6d3c59511a6b9590baee376b543520a00acd3df0839e5d045966d6aac8ba49c6a3dc SHA512 ade6885334698ea2df8a678b3b9058f2cd06aa6c32dd57645e5b28e3f22cbaacc4821bbd661e97ecc426f216114dd9595d9b98c9368061561afea82779a942c7
+AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 BLAKE2B 162ca81d22dfa100f624f3c62095bb3cd8bfff884e0754991904fbbe37ab60177d920872ea4955d4c8e3fd95a81f6488ed6ba6894dd1b0c7fe0b376ac62d9105 SHA512 7248e6dba4837765ebf0bc1cd06c07891ea785a415ecbd279f1d6adc88b4a8aae0a12993635d9139697771e8b94739e709e2410754e0e004571d1a48a1bf614d
+AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 BLAKE2B ef6aedfe4ee2bc1e17106164fec1d82a7fe927d5240e90c1db8a579dbf4fedc11e6b3cacb5138172fa198bf5681df09309412b6a48079353bd14568b667d5db4 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9
+AUX ogre-1.9.0-samples.patch 226 BLAKE2B d6bf78992d23d50d5f913238eeefed1e4e301eee3989dd759d2709db6c43e16826906f2f7492a29f3d4f15d14bcef35a1771b3edada39b5070691c42a2f6c951 SHA512 7e4a90954940ab87b338c680d22666d5c9a70425e02ab314ca925346862385a1e9ace75b4099b1223da5a658b5311f4557a3f846e2d404764153cdfafb7e5b3a
+DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54
+DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
+EBUILD ogre-1.10.11.ebuild 3168 BLAKE2B ee7bf2ae427c66f32d19c8d7924e7f45d75e265fa582ea57a7ca281f884957c0b24354840463d612a533a8663ddb0b2abac8f50f076e2b649ee599ff2a623045 SHA512 924da46b4bd78df10edfc2f8b7f40f556f93f38562e9f68c87eba79ffa7283290fd9cd961e6c2cbb56e1c28288d028eb72e10ef68a23501803cc2380d6cabe76
+EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23
+MISC metadata.xml 5223 BLAKE2B 20cd8b976d6a46dd1bc9cc9a8a075c5638e45cdc5d4ae043837e21baf9a7191f2b60230c426e7ee4e66e7a153af44ccf9b323c2422462aa1cf78d486f29a4a63 SHA512 0dc362c5fda467f45c1910baaa4bf51dc48dc01bcb7ae9230008d868d5556227b77c030a0d2110646bcbff8318d4c0c1c2a3a7b112b3f63c0132bcb1adaa61fe
diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
new file mode 100644
index 000000000000..53d7a0925d51
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User niparx <koliap@gmail.com>
+# Date 1515160111 -7200
+# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159
+# Parent  bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c
+[OGRE-592] RTShaderSystem compile error when using double precision (#622)
+
+RTShaderSystem: compile error when using double precision
+
+https://ogre3d.atlassian.net/browse/OGRE-592
+
+diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
+--- a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
++++ b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp
+@@ -654,8 +654,12 @@
+             curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN);
+         }
+         else
+-        {               
+-            curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN);
++        {
++            curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r,
++                                                                                      (Real)colourValue.g,
++                                                                                      (Real)colourValue.b,
++                                                                                      (Real)colourValue.a)),
++                                           Operand::OPS_IN);
+         }
+         
+         curFuncInvocation->pushOperand(arg, Operand::OPS_OUT);
diff --git a/dev-games/ogre/files/ogre-1.10.11-media_path.patch b/dev-games/ogre/files/ogre-1.10.11-media_path.patch
new file mode 100644
index 000000000000..4d2547ab75a4
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-media_path.patch
@@ -0,0 +1,18 @@
+--- a/CMake/InstallResources.cmake	2014-10-29 12:43:49.000000000 +0100
++++ b/CMake/InstallResources.cmake	2014-10-29 12:46:10.017611431 +0100
+@@ -165,10 +165,11 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+-  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
+-  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
++# No, they were fine already
++#  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
++#  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
++#  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
++#  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
+ else ()
+   # iOS needs to use relative paths in the config files
+   set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.10.11-resource_path.patch b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch
new file mode 100644
index 000000000000..9c39dfc0762a
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch
@@ -0,0 +1,18 @@
+--- a/CMake/InstallResources.cmake	2013-12-01 18:28:12.000000000 +0100
++++ b/CMake/InstallResources.cmake	2014-10-29 12:38:29.963602465 +0100
+@@ -189,10 +189,11 @@
+   set(OGRE_SAMPLES_DIR_REL "")
+   set(OGRE_SAMPLES_DIR_DBG "")
+ elseif (UNIX)
+-  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
++# No, this was already configured above, the BINARY paths are wrong!
++#  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
++#  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
++#  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
++#  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+ endif ()
+ 
+ if (MSVC AND NOT NMAKE)
diff --git a/dev-games/ogre/files/ogre-1.10.11-samples.patch b/dev-games/ogre/files/ogre-1.10.11-samples.patch
new file mode 100644
index 000000000000..80b989e980c4
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-samples.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -536,7 +536,9 @@
+ endif ()
+ 
+ # Setup samples
+-add_subdirectory(Samples)
++if (OGRE_BUILD_SAMPLES)
++    add_subdirectory(Samples)
++endif ()
+ 
+ #Add android JNI binding
+ if(ANDROID)
diff --git a/dev-games/ogre/files/ogre-1.9.0-gcc52.patch b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
new file mode 100644
index 000000000000..030368de29e3
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
@@ -0,0 +1,63 @@
+--- a/OgreMain/include/OgreProgressiveMeshGenerator.h
++++ b/OgreMain/include/OgreProgressiveMeshGenerator.h
+@@ -215,7 +215,40 @@
+ 	void tuneContainerSize();
+ 	void addVertexData(VertexData* vertexData, bool useSharedVertexLookup);
+ 	template<typename IndexType>
+-	void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, VertexLookupList& lookup, unsigned short submeshID);
++	void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, VertexLookupList& lookup, unsigned short submeshID)
++	{
++
++		// Loop through all triangles and connect them to the vertices.
++		for (; iPos < iEnd; iPos += 3) {
++			// It should never reallocate or every pointer will be invalid.
++			OgreAssert(mTriangleList.capacity() > mTriangleList.size(), "");
++			mTriangleList.push_back(PMTriangle());
++			PMTriangle* tri = &mTriangleList.back();
++			tri->isRemoved = false;
++			tri->submeshID = submeshID;
++			for (int i = 0; i < 3; i++) {
++				// Invalid index: Index is bigger then vertex buffer size.
++				OgreAssert(iPos[i] < lookup.size(), "");
++				tri->vertexID[i] = iPos[i];
++				tri->vertex[i] = lookup[iPos[i]];
++			}
++			if (tri->isMalformed()) {
++#if OGRE_DEBUG_MODE
++				stringstream str;
++				str << "In " << mMeshName << " malformed triangle found with ID: " << getTriangleID(tri) << ". " <<
++				std::endl;
++				printTriangle(tri, str);
++				str << "It will be excluded from LOD level calculations.";
++				LogManager::getSingleton().stream() << str.str();
++#endif
++				tri->isRemoved = true;
++				mIndexBufferInfoList[tri->submeshID].indexCount -= 3;
++				continue;
++			}
++			tri->computeNormal();
++			addTriangleToEdges(tri);
++		}
++	}
+ 	void addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID);
+ 
+ 	void computeCosts();
+--- a/OgreMain/src/OgreProgressiveMeshGenerator.cpp
++++ b/OgreMain/src/OgreProgressiveMeshGenerator.cpp
+@@ -219,6 +219,8 @@
+ 	}
+ 	vbuf->unlock();
+ }
++/// Called from OgreQueuedProgressiveMeshGenerator.cpp, so it can not be defined in here.
++#if 0
+ template<typename IndexType>
+ void ProgressiveMeshGenerator::addIndexDataImpl(IndexType* iPos, const IndexType* iEnd,
+                                                 VertexLookupList& lookup,
+@@ -256,6 +258,7 @@
+ 		addTriangleToEdges(tri);
+ 	}
+ }
++#endif // 0
+ 
+ void ProgressiveMeshGenerator::addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID)
+ {
diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
new file mode 100644
index 000000000000..bb2ca551dbe4
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
@@ -0,0 +1,13 @@
+--- a/CMake/InstallResources.cmake
++++ b/CMake/InstallResources.cmake
+@@ -178,10 +178,6 @@
+ 
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+-  set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
+-  set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
+-  set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
+ else ()
+   # iOS needs to use relative paths in the config files
+   set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
new file mode 100644
index 000000000000..a26aa3f447bd
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
@@ -0,0 +1,14 @@
+--- a/CMake/InstallResources.cmake
++++ b/CMake/InstallResources.cmake
+@@ -201,11 +201,6 @@
+   set(OGRE_PLUGIN_DIR_DBG "")
+   set(OGRE_SAMPLES_DIR_REL "")
+   set(OGRE_SAMPLES_DIR_DBG "")
+-elseif (UNIX)
+-  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
+-  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+ endif ()
+ 
+ if (MSVC AND NOT NMAKE)
diff --git a/dev-games/ogre/files/ogre-1.9.0-samples.patch b/dev-games/ogre/files/ogre-1.9.0-samples.patch
new file mode 100644
index 000000000000..d7573d7662b0
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -519,7 +519,9 @@
+ endif ()
+ 
+ # Setup samples
+-add_subdirectory(Samples)
++if (OGRE_BUILD_SAMPLES)
++    add_subdirectory(Samples)
++endif ()
+ 
+ #Add android JNI binding
+ if(ANDROID)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
new file mode 100644
index 000000000000..42d8eb1e79bb
--- /dev/null
+++ b/dev-games/ogre/metadata.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE 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>
+OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible 3D 
+engine written in C++ designed to make it easier and more intuitive for developers 
+to produce games and demos utilising 3D hardware. The class library abstracts all 
+the details of using the underlying system libraries like Direct3D and OpenGL and 
+provides an interface based on world objects and other intuitive classes.
+
+Productivity features
+
+    * Simple, easy to use OO interface designed to minimise the effort required to render 3D scenes, and to be independent of 3D implementation e.g. Direct3D/OpenGL/Glide etc.
+    * Extensible example framework makes getting your application running is quick and simple
+    * Common requirements like render state management, hierarchical culling, dealing with transparency are done for you automatically saving you valuable time
+    * Clean, uncluttered design and full documentation of all engine classes
+
+Platform and 3D API support
+
+    * Direct3D and OpenGL support
+    * Windows (all major versions), Linux and Mac OSX support
+    * Builds on Visual C++ 6 (with STLport), Visual C++.Net (with STLport), Visual C++.Net 2003
+    * Builds on gcc 3+ on Linux / Mac OSX
+
+Material / Shader support
+
+    * Load textures from PNG, JPEG or TGA files, MipMaps generated automatically, resizes maps to align with hardware requirements
+    * Procedural texture coordinate generation (e.g. environment mapping) and modification (scrolls, warps, rotations)
+    * Unbounded number of texture layers with many texture blending effects, animated textures
+    * Multitexturing hardware used to best effect automatically, combined with automatic fallback to mulitpass rendering
+    * Object transparency and other scene-level blending effects
+    * All defineable through text scripts to allow you to set up and tweak advanced materials without recompiling
+
+Meshes
+
+    * Flexible mesh data formats accepted
+    * Export from Milkshape3D direct to OGRE .mesh and .skeleton format
+    * Skeletal animation (including blending of multiple animations)
+    * Biquadric Bezier patches for curved surfaces
+    * Progressive meshes 
+
+Scene Features
+
+    * Highly customisable, flexible scene management, not tied to any single scene type. Use predefined classes for scene organisation if they suit or plug in your own subclass to gain full control over the scene organisation
+    * Generic SceneManager hierarchically culls by bounding volumes
+    * Example plugin (BspSceneManager) specialises to allow fast indoor renders, loading Quake3 levels inc. shader script parsing support
+    * Hierarchical scene graph; nodes allow objects to be attached to each other and follow each others movements, articulated structures etc
+    * Scene querying features 
+
+Special Effects
+
+    * Particle Systems, including easily extensible emitters and affectors (customisable through plugins). Systems can be defined in text scripts for easy tweaking. Automatic use of particle pooling for maximum performance
+    * Support for skyboxes, skyplanes and skydomes, very easy to use
+    * Billboarding for sprite graphics
+    * Transparent objects automatically managed (rendering order and depth buffer settings all set up for you)
+
+Misc features
+
+    * Common resource infrastructure for memory management and loading from archives (ZIP, PK3)
+    * Flexible plugin architecture allows engine to be extended without recompilation
+    * 'Controllers' allow you to easily organise derived values between objects e.g. changing the colour of a ship based on shields left
+    * Debugging memory manager for identifying memory leaks
+    * ReferenceAppLayer provides an example of how to combine OGRE with other libraries, for example ODE for collision and physics
+    * XMLConverter to convert efficient runtime binary formats to/from XML for interchange or editing
+
+Exporters
+
+    * 3D Studio Max (meshes and animation)
+    * Milkshape 3D (meshes and animation)
+    * Blender3D (meshes)
+    * Wings3D (meshes)
+    * VRML97 (meshes)
+    * Maya (meshes)
+  </longdescription>
+  <use>
+    <flag name="boost">enable boost support</flag>
+    <flag name="cg">NVIDIA toolkit plugin</flag>
+    <flag name="double-precision">more precise calculations at the expense of speed</flag>
+    <flag name="freeimage">support images via freeimage</flag>
+    <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
+    <flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
+    <flag name="gles3">Enable OpenGL ES 3.x Features</flag>
+    <flag name="ois">pull in Object-oriented Input System library for samples</flag>
+    <flag name="poco">when USE=threads, use poco for threading</flag>
+    <flag name="tbb">when USE=threads, use tbb for threading</flag>
+    <flag name="tools">build+install helper tools</flag>
+    <flag name="zip">support zip archives</flag>
+  </use>
+  <upstream>
+    <remote-id type="bitbucket">sinbad/ogre</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild
new file mode 100644
index 000000000000..3094851d1f67
--- /dev/null
+++ b/dev-games/ogre/ogre-1.10.11.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="MIT public-domain"
+SLOT="0/1.10.0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl profile tools"
+
+REQUIRED_USE="examples? ( ois )
+	gles3? ( gles2 )
+	gl3plus? ( opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/zziplib
+	media-libs/freetype:2
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	freeimage? ( media-libs/freeimage )
+	gl3plus? ( >=media-libs/mesa-9.2.5 )
+	gles2? ( >=media-libs/mesa-9.0.0[gles2] )
+	gles3? ( >=media-libs/mesa-10.0.0[gles2] )
+	ois? ( dev-games/ois )
+	tools? ( dev-libs/tinyxml[stl] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-samples.patch"
+	"${FILESDIR}/${P}-resource_path.patch"
+	"${FILESDIR}/${P}-media_path.patch"
+	"${FILESDIR}/${P}-fix_double_precision-88f0d5b.patch"
+)
+
+src_prepare() {
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# Stupid build system hardcodes release names
+	sed -i \
+		-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
+		CMake/Utils/OgreConfigTargets.cmake || die
+
+	# make sure we're not using the included tinyxml
+	# Update for 1.10.11: Unfortunately the build system does not
+	#   search for a system wide tinyxml at this moment. However,
+	#   TinyXML is meant to be built into and not linked to a using
+	#   project anyway.
+	# rm -f Tools/XMLConverter/{include,src}/tiny*.*
+
+	# Fix some path issues
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_BUILD_COMPONENT_JAVA=NO
+		-DOGRE_BUILD_COMPONENT_PYTHON=NO
+		-DOGRE_BUILD_DEPENDENCIES=NO
+		-DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+		-DOGRE_BUILD_SAMPLES=$(usex examples)
+		-DOGRE_BUILD_TESTS=FALSE
+		-DOGRE_BUILD_TOOLS=$(usex tools)
+		-DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+		-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
+		-DOGRE_CONFIG_THREADS=3
+		-DOGRE_CONFIG_THREAD_PROVIDER=std
+		-DOGRE_FULL_RPATH=NO
+		-DOGRE_INSTALL_DOCS=$(usex doc)
+		-DOGRE_INSTALL_SAMPLES=$(usex examples)
+		-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+		-DOGRE_NODE_STORAGE_LEGACY=NO
+		-DOGRE_PROFILING=$(usex profile)
+		-DOGRE_RESOURCEMANAGER_STRICT=strict
+		-DOGRE_USE_STD11=YES
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	CONFIGDIR=/etc/OGRE
+	SHAREDIR=/usr/share/OGRE
+
+	# plugins and resources are the main configuration
+	insinto "${CONFIGDIR}"
+	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+	# These are only for the sample browser
+	insinto "${SHAREDIR}"
+	doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+}
diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..dd3d2ee065a3
--- /dev/null
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@@ -0,0 +1,133 @@
+# 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="FindFreetype FindDoxygen FindZLIB"
+
+inherit eutils cmake-utils vcs-snapshot
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT public-domain"
+SLOT="0/1.9.0"
+KEYWORDS="amd64 ~arm x86"
+
+# gles1 currently broken wrt bug #418201
+# gles1 does not even build wrt bug #506058
+IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip"
+
+REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) )
+	examples? ( ois )
+	poco? ( threads )
+	tbb? ( threads )
+	gl3plus? ( !gles2 !gles3 )
+	gles3? ( gles2 )
+	gl3plus? ( opengl )"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+	media-libs/freetype:2
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	boost? ( dev-libs/boost:= )
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	freeimage? ( media-libs/freeimage )
+	gles2? ( >=media-libs/mesa-9.0.0[gles2] )
+	gles3? ( >=media-libs/mesa-10.0.0[gles2] )
+	gl3plus? ( >=media-libs/mesa-9.2.5 )
+	ois? ( dev-games/ois )
+	threads? (
+		poco? ( dev-libs/poco )
+		tbb? ( dev-cpp/tbb )
+	)
+	tools? ( dev-libs/tinyxml[stl] )
+	zip? ( sys-libs/zlib dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove_resource_path_to_bindir.patch"
+	"${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
+	"${FILESDIR}/${P}-gcc52.patch"
+	"${FILESDIR}/${P}-samples.patch"
+)
+
+src_prepare() {
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# Stupid build system hardcodes release names
+	sed -i \
+		-e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \
+		CMake/Utils/OgreConfigTargets.cmake || die
+
+	# make sure we're not using the included tinyxml
+	rm -f Tools/XMLConverter/{include,src}/tiny*.*
+
+	# Fix some path issues
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_FULL_RPATH=NO
+		$(cmake-utils_use boost OGRE_USE_BOOST)
+		$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
+		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
+		$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
+		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
+		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
+		$(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE
+		$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
+		$(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT)
+		$(cmake-utils_use profile OGRE_PROFILING)
+		$(cmake-utils_use examples OGRE_BUILD_SAMPLES)
+		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
+		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE)
+		-DOGRE_BUILD_TESTS=FALSE
+		-DOGRE_CONFIG_THREADS=$(usex threads 2 0)
+		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
+		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
+	)
+
+	if use threads ; then
+		local f
+		for f in boost poco tbb ; do
+			use ${f} || continue
+			mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
+			break
+		done
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	CONFIGDIR=/etc/OGRE
+	SHAREDIR=/usr/share/OGRE
+
+	# plugins and resources are the main configuration
+	insinto "${CONFIGDIR}"
+	doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+	dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+	dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+	# These are only for the sample browser
+	insinto "${SHAREDIR}"
+	doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
+	doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+}
diff --git a/dev-games/ois-1.3 b/dev-games/ois-1.3
deleted file mode 100644
index ba1100f340ad..000000000000
--- a/dev-games/ois-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libXaw x11-libs/libX11 >=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=Object-oriented Input System - A cross-platform C++ input handling library
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/wgois/
-IUSE=static-libs
-KEYWORDS=amd64 ~arm x86
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=mirror://sourceforge/wgois/ois_v1-3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cec0d40b91c984ed609002cf37c6cd16
diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
new file mode 100644
index 000000000000..d78f0fcda848
--- /dev/null
+++ b/dev-games/ois/Manifest
@@ -0,0 +1,5 @@
+AUX ois-1.3-automake-1.13.patch 242 BLAKE2B 63aa87256fb3c79d466edca5d88495f6c698ed9dabfa2e6bca3860521eed1ecab19ef1437a98f2db197e1db8162fc3dccf7e08743814de0517cd5e0abd7b4848 SHA512 c3f386d1a6d62df22408bd7c3ed639b87e91ec4fd6a663fafda9f9e399e1c08e38018967301afb432362d6944cbae4828adf22ee6649343be0848449aed6e029
+AUX ois-1.3-gcc47.patch 1209 BLAKE2B 462cad1fc694d85a118c4b9dce5e75c3199bd991a3b41a2f131ca87e129d564e310ec49086d8a8e61cddae27f9e708fbf518ab41aedf2f594336438b033d898c SHA512 499b960c29eb6be7adce5fe475af61f1a4cc6a3cdf8939eb4a690265f9c83923f3d365b8cd312e224b9f1c22606d607a45ecf05efd85edf87be3e89ede93c6d3
+DIST ois_v1-3.tar.gz 136739 BLAKE2B 88dd3af2c8b253d9cacc5c65510c150ba50c6a47c1c2cd241bf366f38fba0560a7cef08392e338984e8b172020c4a4c37e5eab024fabc695b2f06f93393850ed SHA512 48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3
+EBUILD ois-1.3.ebuild 617 BLAKE2B 5a9485c2223610823117c57f6660e7007971aba7832e6eb0342720e8155813de9219a8fd1369e8f6c8f1f6601d7e873c8fb315b80fb08523de99337e391c025d SHA512 a0ae76bb48b80baa47e7a9a6e3e566fb1b86f01ea9783f80bbbc4c4c3aee9709d2f938f411dd2c5dad64319d34c4a515334e7cac3a7a4b0dff8f51bf07e74b33
+MISC metadata.xml 328 BLAKE2B b575ed476350e61e180f865c8f9711fd873b4a6e8e3ece407fe248fd33dc37edc7fe1e84262b0e364e5b313fc2e9b41a11d6dd860e9e816bbd5a4787326fad91 SHA512 3ff57cfd54985a9b278904738d8911322385025eb0e4e3f44742a19f5781761fef047e695927b2890e1311f567130cb2efdbae26b3afd69764bb70d48690d70c
diff --git a/dev-games/ois/files/ois-1.3-automake-1.13.patch b/dev-games/ois/files/ois-1.3-automake-1.13.patch
new file mode 100644
index 000000000000..fb103e40335a
--- /dev/null
+++ b/dev-games/ois/files/ois-1.3-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- ois-v1-3/configure.ac
++++ ois-v1-3/configure.ac
+@@ -5,7 +5,7 @@
+ 
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE( [OIS], 1.3.0 )
+-AM_CONFIG_HEADER([includes/config.h])
++AC_CONFIG_HEADERS([includes/config.h])
+ 
+ dnl Check for programs
+ AC_PROG_CC
diff --git a/dev-games/ois/files/ois-1.3-gcc47.patch b/dev-games/ois/files/ois-1.3-gcc47.patch
new file mode 100644
index 000000000000..d002ec3cffb5
--- /dev/null
+++ b/dev-games/ois/files/ois-1.3-gcc47.patch
@@ -0,0 +1,40 @@
+--- demos/FFConsoleDemo.cpp.old	2012-07-17 08:41:33.667876985 +0200
++++ demos/FFConsoleDemo.cpp	2012-07-17 08:42:01.415928693 +0200
+@@ -7,6 +7,7 @@
+ #include <ios>
+ #include <sstream>
+ #include <vector>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
+--- demos/OISConsole.cpp.old	2012-07-17 08:43:44.637681119 +0200
++++ demos/OISConsole.cpp	2012-07-17 08:44:06.653135337 +0200
+@@ -12,6 +12,7 @@
+ #include <iostream>
+ #include <vector>
+ #include <sstream>
++#include <unistd.h>
+ 
+ ////////////////////////////////////Needed Windows Headers////////////
+ #if defined OIS_WIN32_PLATFORM
+--- src/linux/LinuxJoyStickEvents.cpp.old	2012-07-17 08:37:56.065155660 +0200
++++ src/linux/LinuxJoyStickEvents.cpp	2012-07-17 08:38:33.236545721 +0200
+@@ -33,6 +33,7 @@
+ #include <fcntl.h>        //Needed to Open a file descriptor
+ #include <cassert>	
+ #include <linux/input.h>
++#include <unistd.h>
+ 
+ 
+ #include <sstream>
+--- src/linux/LinuxForceFeedback.cpp.old	2012-07-17 08:40:02.633268854 +0200
++++ src/linux/LinuxForceFeedback.cpp	2012-07-17 08:40:28.642442655 +0200
+@@ -26,6 +26,7 @@
+ #include <cstdlib>
+ #include <errno.h>
+ #include <memory.h>
++#include <unistd.h>
+ 
+ using namespace OIS;
+ 
diff --git a/dev-games/ois/metadata.xml b/dev-games/ois/metadata.xml
new file mode 100644
index 000000000000..5d67c2e9bc85
--- /dev/null
+++ b/dev-games/ois/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wgois</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/ois/ois-1.3.ebuild b/dev-games/ois/ois-1.3.ebuild
new file mode 100644
index 000000000000..a7572e973690
--- /dev/null
+++ b/dev-games/ois/ois-1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools autotools-utils
+
+MY_P=${PN}-v${PV/./-}
+DESCRIPTION="Object-oriented Input System - A cross-platform C++ input handling library"
+HOMEPAGE="https://sourceforge.net/projects/wgois/"
+SRC_URI="mirror://sourceforge/wgois/${MY_P/-/_}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="static-libs"
+
+DEPEND="x11-libs/libXaw
+	x11-libs/libX11"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-automake-1.13.patch
+	eautoreconf
+}
diff --git a/dev-games/openscenegraph-3.5.5 b/dev-games/openscenegraph-3.5.5
deleted file mode 100644
index 5b441cf2cea0..000000000000
--- a/dev-games/openscenegraph-3.5.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Open source high performance 3D graphics toolkit
-EAPI=6
-HOMEPAGE=http://www.openscenegraph.org/
-IUSE=asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib
-KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=sdl2? ( sdl )
-SLOT=0/145
-SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.5.5.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	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7f952b6920913aa5a6f2598813664dc
diff --git a/dev-games/openscenegraph-qt-3.5.5 b/dev-games/openscenegraph-qt-3.5.5
deleted file mode 100644
index 7fe2edb77138..000000000000
--- a/dev-games/openscenegraph-qt-3.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-games/openscenegraph:0/145 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwebkit:5 examples? ( dev-qt/qtwidgets:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt support for OpenSceneGraph
-EAPI=6
-HOMEPAGE=http://www.openscenegraph.org/
-IUSE=debug examples
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=dev-games/openscenegraph:0/145 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwebkit:5 examples? ( dev-qt/qtwidgets:5 )
-SLOT=0/145
-SRC_URI=https://github.com/openscenegraph/osgQt/archive/3.5.5.tar.gz -> osgQt-3.5.5.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_=0963ff735325676af6600d4d5cdb7f64
diff --git a/dev-games/openscenegraph-qt/Manifest b/dev-games/openscenegraph-qt/Manifest
new file mode 100644
index 000000000000..5f34457c3a3f
--- /dev/null
+++ b/dev-games/openscenegraph-qt/Manifest
@@ -0,0 +1,5 @@
+AUX openscenegraph-qt-3.5.5-cmake.patch 3190 BLAKE2B c8a52a2d0b626e7a12b3f683380d6d3f20973330220f53be288413616d0ccf063cd40b864b1fb77ff2762313d24624533380d20a37538b92664647fc2f42c7c0 SHA512 b5350082a9755f73274103b1bc6d5b08954cd6b23e22d15e26e617bd55016ab3df29c0712af775e4e357213456fd8daa4d443f28b06979e76e32ce0df60393a1
+AUX openscenegraph-qt-3.5.5-qt-5.11b3.patch 1115 BLAKE2B 0a90b65caf3209d51ec699490dd6b1863fc965c54cb5fac5dcfa2efc4997225563d44842c9fffa07b6b2c75d62fe9577f56fcb067966bbf1cd9031c8677f41be SHA512 9223a53ae700fc25aaa02a0feef5f69313c94d05415c0372d55f56a9996ab3edb6712ea19b07bc507d7b1c8db21e4c9dda177eeaad094d94fc04133cdeb7ac10
+DIST osgQt-3.5.5.tar.gz 1003973 BLAKE2B 4646fc0d01a5fc3023acb4be9d8b9e9982faf3849b9c7dbe775ff06642b9540559ef67189f31ebcf6a2fe49d24066d744ce9cfd409e76c9143ac16867648a620 SHA512 50faee9a1539c1e29bb1c244fa32194b22cbe43f43980b7c270aa45cd225ac5e3fe9445d63b1efb767c8a2ce8e5ffa417783d1a446ed965b23a06100a241d498
+EBUILD openscenegraph-qt-3.5.5.ebuild 970 BLAKE2B ad265f5b646fd029a3a40038fdf39262a93a3e7da58b44a09bc2a183327cd2f4e71e2c201dcb12891c141b25197616a4ff6b1f870acdc0673b76e144123ace04 SHA512 88d9a8a78277e6335dc8a064fb6f05e7f63c687cd1436c68bba56c03e9005bd42cfecdb418d87d9c82b35440d4cfcaec84c67178c02afeb8ce29b5937c3d411a
+MISC metadata.xml 997 BLAKE2B fbb3c9765491c15ebd269fde3aa01ef177d038f1a0f1d1f189adfb457aab8dfd69774c074235a7f95d6d02c53dfa6ba5872d50cdcbafc03141a8b5ba44d823dd SHA512 3b5f9b2f408f6f68a28f3427d463d0036d1b6286df549d189ed4d88ebe0a607a3d570f98fa11035f440e684f55f6d7d3f1383b281c37a1be3f611cfb8d530169
diff --git a/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-cmake.patch b/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-cmake.patch
new file mode 100644
index 000000000000..e5cac15373d8
--- /dev/null
+++ b/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-cmake.patch
@@ -0,0 +1,53 @@
+diff -ruN osgQt-3.5.5/CMakeLists.txt my/CMakeLists.txt
+--- osgQt-3.5.5/CMakeLists.txt	2016-09-20 07:11:32.000000000 +0200
++++ my/CMakeLists.txt	2017-05-18 04:11:06.929237731 +0200
+@@ -543,15 +543,7 @@
+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ ENDIF()
+ 
+-IF(UNIX AND NOT WIN32 AND NOT APPLE)
+-  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
+-      MARK_AS_ADVANCED(LIB_POSTFIX)
+-  ENDIF()
+-ENDIF()
+-IF(NOT DEFINED LIB_POSTFIX)
+-    SET(LIB_POSTFIX "")
+-ENDIF()
++SET(LIB_POSTFIX ${LIB_SUFFIX})
+ 
+ # Here we apparantly do some funky stuff with making the bin/ and lib/
+ # folders which is probably needed to work around a very old CMake bug?
+@@ -877,7 +869,7 @@
+         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
+ 
+     # now set up openthreads documentation generation
+     IF(BUILD_REF_DOCS_TAGFILE)
+@@ -893,7 +885,7 @@
+         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
+ 
+     # Process our other doxyfiles but don't create targets for these
+     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+diff -ruN osgQt-3.5.5/CMakeModules/OsgMacroUtils.cmake my/CMakeModules/OsgMacroUtils.cmake
+--- osgQt-3.5.5/CMakeModules/OsgMacroUtils.cmake	2016-09-20 07:11:32.000000000 +0200
++++ my/CMakeModules/OsgMacroUtils.cmake	2017-05-18 04:30:26.646257926 +0200
+@@ -462,9 +462,9 @@
+         IF(APPLE)
+             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
+         ELSE(APPLE)
+-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+             IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
+-                INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples)
++                INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph-examples)
+             ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
+         ENDIF(APPLE)
+ 
diff --git a/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch b/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch
new file mode 100644
index 000000000000..9618fde498e9
--- /dev/null
+++ b/dev-games/openscenegraph-qt/files/openscenegraph-qt-3.5.5-qt-5.11b3.patch
@@ -0,0 +1,36 @@
+From 91ba61ff69dc02a412eebae6222793e803b13ec2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 13:47:27 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ CMakeLists.txt           | 1 +
+ src/osgQt/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aaea748..4345ea2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -487,6 +487,7 @@ ENDIF()
+ 
+ #If we have found Qt5, let's try to top off by getting the webkit as well
+ IF ( Qt5Widgets_FOUND )
++    FIND_PACKAGE(Qt5OpenGL REQUIRED)
+     FIND_PACKAGE(Qt5WebKitWidgets QUIET)
+ 
+     IF(COMMAND cmake_policy)
+diff --git a/src/osgQt/CMakeLists.txt b/src/osgQt/CMakeLists.txt
+index 60f3250..e4523e0 100644
+--- a/src/osgQt/CMakeLists.txt
++++ b/src/osgQt/CMakeLists.txt
+@@ -85,5 +85,5 @@ ENDIF( QT4_FOUND )
+ SETUP_LIBRARY(${LIB_NAME})
+ 
+ IF ( Qt5Widgets_FOUND )
+-    qt5_use_modules( ${LIB_NAME} Widgets OpenGL )
++    TARGET_LINK_LIBRARIES( ${LIB_NAME} Qt5::Widgets Qt5::OpenGL )
+ ENDIF ( Qt5Widgets_FOUND )
+-- 
+2.17.0
+
diff --git a/dev-games/openscenegraph-qt/metadata.xml b/dev-games/openscenegraph-qt/metadata.xml
new file mode 100644
index 000000000000..53e9ef1d7edc
--- /dev/null
+++ b/dev-games/openscenegraph-qt/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries. This package is a module for Qt support.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild
new file mode 100644
index 000000000000..2685d3688f4b
--- /dev/null
+++ b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="osgQt"
+MY_P=${MY_PN}-${PV}
+
+inherit cmake-utils
+DESCRIPTION="Qt support for OpenSceneGraph"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="https://github.com/openscenegraph/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE="debug examples"
+
+RDEPEND="
+	dev-games/openscenegraph:${SLOT}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwebkit:5
+	examples? ( dev-qt/qtwidgets:5 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.5-cmake.patch
+	"${FILESDIR}"/${PN}-3.5.5-qt-5.11b3.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DDESIRED_QT_VERSION=5
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
new file mode 100644
index 000000000000..fbaeb4061691
--- /dev/null
+++ b/dev-games/openscenegraph/Manifest
@@ -0,0 +1,5 @@
+AUX openscenegraph-3.5.1-jpeg-9.patch 1211 BLAKE2B 7fedf10332a13270a489c5d2e662947ca84659ad5abc43190d0415212b083b72933b01f84caed161d457490587c8236e38e070e734c649c44b0d67fdc7399a2d SHA512 404439415f8ff6881a90be44281e4a811f018c3e82c2981d076a106e63a3c44fd769867496b8f8a7d53669ba660ab9076a6ccab31e921e9abab65d2ba652b5cc
+AUX openscenegraph-3.5.5-cmake.patch 11029 BLAKE2B 924c464b46b58e97efc3d477742c58c1762ccd4ad9cbc4ecb45232a1d4b8a476540d38031a6886c46a792c2a30da381a75c11a3a8303da56620c28e423043876 SHA512 f5cf409acd5d4e11b7f90fca8775e50cf57ae020fdae74e26d05a984726cb614d33f317c5ec985a198865cd445b3a1e8e2f5843af8ba10c890eb332ed9498504
+DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
+EBUILD openscenegraph-3.5.5.ebuild 3789 BLAKE2B a83f1017bd1add8f5b15cddb48dfa22818ad4ab4a109a9755af76b50625623cfca83d0cb4eb3a74b2f22701b1e6126195313671c333bb237b482bb5525dbfb6f SHA512 1587e604a77f4d6ed367eca0aa83a492523a5b1689f766798c8f57109ae4d88fd77f46e02e8a324907e303b31ba1fd9c65e2464a5ea15b67dbfd5d38b4c1a110
+MISC metadata.xml 1616 BLAKE2B 1c92db1270e1785f2dc412a043102d47fb9635b1063bb2055b2c807912039c074da0b9347e4301ebed8b76823ed6c46f31bd6a27852f408402c867d9fd46128b SHA512 b2fb8a0c8df980ab7d31b04b4f0f9d7a31f5689cd3a08fac6aaa8376116c0b361994779ba04808aeba2e07f76dcfcbf41bd99068ae5f9038421c7d9d67da0c73
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch
new file mode 100644
index 000000000000..f6e85e8e352d
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.5.1-jpeg-9.patch
@@ -0,0 +1,34 @@
+From 34b4e7001522c1b47b4211dac34d2d6a6b994a6f Mon Sep 17 00:00:00 2001
+From: Robert Osfield <robert@openscenegraph.com>
+Date: Thu, 17 Aug 2017 10:52:59 +0100
+Subject: [PATCH] Added version check for boolean, TRUE and FALSE settings
+
+---
+ src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+index 9f7f4c38937..115203322a5 100644
+--- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
++++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+@@ -70,12 +70,14 @@ namespace osgDBJPEG
+ 
+ static int jpegerror = ERR_NO_ERROR;
+ 
+-/* Some versions of jmorecfg.h define boolean, some don't...
+-   Those that do also define HAVE_BOOLEAN, so we can guard using that. */
+-#ifndef HAVE_BOOLEAN
+-  typedef int boolean;
+-  #define FALSE 0
+-  #define TRUE 1
++#if JPEG_LIB_VERSION < 90
++    /* Some versions of jmorecfg.h define boolean, some don't...
++    Those that do also define HAVE_BOOLEAN, so we can guard using that. */
++    #ifndef HAVE_BOOLEAN
++    typedef int boolean;
++    #define FALSE 0
++    #define TRUE 1
++    #endif
+ #endif
+ 
+ /* CODE FOR READING/WRITING JPEG FROM STREAMS
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch
new file mode 100644
index 000000000000..6b8ea7abe60e
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.5.5-cmake.patch
@@ -0,0 +1,281 @@
+--- OpenSceneGraph-3.4.0/CMakeLists.txt
++++ OpenSceneGraph-3.4.0/CMakeLists.txt
+@@ -607,6 +607,7 @@
+ 
+ # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
+ 
++INCLUDE(MacroOptionalFindPackage)
+ 
+ ################################################################################
+ # Set Version header file
+@@ -716,42 +716,42 @@
+     ANDROID_3RD_PARTY()
+ ELSE()
+ # Common to all platforms except android:
+-    FIND_PACKAGE(Freetype)
+-    FIND_PACKAGE(Inventor)
+-    FIND_PACKAGE(Jasper)
+-    FIND_PACKAGE(OpenEXR)
+-    FIND_PACKAGE(COLLADA)
+-    FIND_PACKAGE(FBX)
+-    FIND_PACKAGE(ZLIB)
+-    FIND_PACKAGE(Xine)
+-    FIND_PACKAGE(OpenVRML)
+-    FIND_PACKAGE(GDAL)
+-    FIND_PACKAGE(GTA)
+-    FIND_PACKAGE(CURL)
+-    FIND_PACKAGE(LibVNCServer)
+-    FIND_PACKAGE(OurDCMTK)
+-    FIND_PACKAGE(FFmpeg)
+-    FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
+-    FIND_PACKAGE(GLIB COMPONENTS gobject)
++    MACRO_OPTIONAL_FIND_PACKAGE(Freetype)
++    MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
++    MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
++    MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
++    MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
++    MACRO_OPTIONAL_FIND_PACKAGE(FBX)
++    MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
++    MACRO_OPTIONAL_FIND_PACKAGE(Xine)
++    MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
++    MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
++    MACRO_OPTIONAL_FIND_PACKAGE(GTA)
++    MACRO_OPTIONAL_FIND_PACKAGE(CURL)
++    MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
++    MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
++    MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
++    MACRO_OPTIONAL_FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
++    MACRO_OPTIONAL_FIND_PACKAGE(GLIB COMPONENTS gobject)
+     FIND_PACKAGE(DirectShow)
+-    FIND_PACKAGE(SDL2)
+-    FIND_PACKAGE(SDL)
+-    FIND_PACKAGE(Poppler-glib)
+-    FIND_PACKAGE(RSVG)
+-    FIND_PACKAGE(GtkGl)
++    MACRO_OPTIONAL_FIND_PACKAGE(SDL2)
++    MACRO_OPTIONAL_FIND_PACKAGE(SDL)
++    MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
++    MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
++    MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
+     FIND_PACKAGE(DirectInput)
+-    FIND_PACKAGE(NVTT)
++    MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
+     IF (NOT WIN32)
+-        FIND_PACKAGE(Asio)
++        MACRO_OPTIONAL_FIND_PACKAGE(Asio)
+     ENDIF()
+     FIND_PACKAGE(ZeroConf)
+ 
+-    FIND_PACKAGE(LIBLAS)
++    MACRO_OPTIONAL_FIND_PACKAGE(LIBLAS)
+ 
+     IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
+-        FIND_PACKAGE(Lua52)
++        MACRO_OPTIONAL_FIND_PACKAGE(Lua52)
+         IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR))
+-            FIND_PACKAGE(Lua51)
++            MACRO_OPTIONAL_FIND_PACKAGE(Lua51)
+         ENDIF()
+     ENDIF()
+ 
+@@ -768,11 +768,11 @@
+ IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ 
+ 
+-    FIND_PACKAGE(FLTK)
+-    FIND_PACKAGE(FOX)
++    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
++    MACRO_OPTIONAL_FIND_PACKAGE(FOX)
+ 
+     SET(wxWidgets_USE_LIBS base core gl net)
+-    FIND_PACKAGE(wxWidgets)
++    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
+ 
+ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ 
+@@ -789,10 +790,10 @@
+ # can use Quicktime.
+ IF(NOT ANDROID)
+     IF(NOT APPLE)
+-        FIND_PACKAGE(GIFLIB)
+-        FIND_PACKAGE(JPEG)
+-        FIND_PACKAGE(PNG)
+-        FIND_PACKAGE(TIFF)
++        MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
++        MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
++        MACRO_OPTIONAL_FIND_PACKAGE(PNG)
++        MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
+         # QuickTime is required for OS X, but optional for Windows.
+         IF(WIN32)
+             FIND_PACKAGE(QuickTime)
+@@ -848,15 +849,7 @@
+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ ENDIF()
+ 
+-IF(UNIX AND NOT WIN32 AND NOT APPLE)
+-  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
+-      MARK_AS_ADVANCED(LIB_POSTFIX)
+-  ENDIF()
+-ENDIF()
+-IF(NOT DEFINED LIB_POSTFIX)
+-    SET(LIB_POSTFIX "")
+-ENDIF()
++SET(LIB_POSTFIX ${LIB_SUFFIX})
+ 
+ # Here we apparantly do some funky stuff with making the bin/ and lib/
+ # folders which is probably needed to work around a very old CMake bug?
+@@ -1191,7 +1184,7 @@
+         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
+ 
+     # now set up openthreads documentation generation
+     IF(BUILD_REF_DOCS_TAGFILE)
+@@ -1207,7 +1200,7 @@
+         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+     )
+     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
+ 
+     # Process our other doxyfiles but don't create targets for these
+     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+--- OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS
++++ OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS
+@@ -0,0 +1,22 @@
++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 copyright
++   notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the copyright
++   notice, this list of conditions and the following disclaimer in the
++   documentation and/or other materials provided with the distribution.
++3. The name of the author may not be used to endorse or promote products
++   derived from this software without specific prior written permission.
++
++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.
+--- OpenSceneGraph-3.4.0/CMakeModules/FindFLTK.cmake.rej
++++ OpenSceneGraph-3.4.0/CMakeModules/FindFLTK.cmake.rej
+@@ -0,0 +1,55 @@
++--- CMakeModules/FindFLTK.cmake	2010-11-11 17:51:46.000000000 +0100
+++++ CMakeModules/FindFLTK.cmake	2014-08-20 00:29:31.229439251 +0200
++@@ -1,52 +0,0 @@
++-# Locate FLTK
++-# This module defines
++-# FLTK_LIBRARY
++-# FLTK_FOUND, if false, do not try to link to gdal 
++-# FLTK_INCLUDE_DIR, where to find the headers
++-#
++-# $FLTK_DIR is an environment variable that would
++-# correspond to the ./configure --prefix=$FLTK_DIR
++-#
++-# Created by Robert Osfield. 
++-
++-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
++-    $ENV{FLTK_DIR}/include
++-    $ENV{FLTK_DIR}
++-    ~/Library/Frameworks
++-    /Library/Frameworks
++-    /usr/local/include
++-    /usr/include
++-    /sw/include # Fink
++-    /opt/local/include # DarwinPorts
++-    /opt/csw/include # Blastwave
++-    /opt/include
++-    /usr/freeware/include
++-)
++-
++-MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
++-
++-    FIND_LIBRARY(${MYLIBRARY}
++-        NAMES ${MYLIBRARYNAME}
++-        PATHS
++-        $ENV{FLTK_DIR}/lib
++-        $ENV{FLTK_DIR}
++-        ~/Library/Frameworks
++-        /Library/Frameworks
++-        /usr/local/lib
++-        /usr/lib
++-        /sw/lib
++-        /opt/local/lib
++-        /opt/csw/lib
++-        /opt/lib
++-        /usr/freeware/lib64
++-    )
++-
++-ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
++-
++-FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
++-FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
++-
++-SET(FLTK_FOUND "NO")
++-IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
++-    SET(FLTK_FOUND "YES")
++-ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
+--- OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake
++++ OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,28 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_<name>, which can be disabled via the cmake GUI.
++# or via -DWITH_<name>=OFF
++# The standard <name>_FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++   option(WITH_${_name} "Search for ${_name} package" ON)
++   if (WITH_${_name})
++      find_package(${_name} ${ARGN})
++   else (WITH_${_name})
++      set(${_name}_FOUND)
++      set(${_name}_INCLUDE_DIR)
++      set(${_name}_INCLUDES)
++      set(${_name}_LIBRARY)
++      set(${_name}_LIBRARIES)
++   endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
++
+--- OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake
++++ OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake
+@@ -463,7 +463,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+         IF(APPLE)
+             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
+         ELSE(APPLE)
+-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+             IF(MSVC)
+                 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo)
+                 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug)
+
+--- OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt
++++ OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ SET(TARGET_SRC osgviewerFLTK.cpp )
+ 
+-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
++SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
+ 
+ INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
+ 
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
new file mode 100644
index 000000000000..fe61db28d513
--- /dev/null
+++ b/dev-games/openscenegraph/metadata.xml
@@ -0,0 +1,25 @@
+<?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>
+	<longdescription lang="en">
+		The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application developers in fields such as visual simulation, games, virtual reality, scientific visualization and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well established as the world leading scene graph technology, used widely in the vis-sim, space, scientific, oil-gas, games and virtual reality industries.
+	</longdescription>
+	<use>
+		<flag name="asio">Enable support for <pkg>dev-cpp/asio</pkg> library</flag>
+		<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
+		<flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
+		<flag name="las">Enable support for geospatial data LAS LiDAR format using <pkg>sci-geosciences/liblas</pkg></flag>
+		<flag name="openinventor">Build OpenInventor plugin</flag>
+		<flag name="osgapps">Build osg applications</flag>
+		<flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> additionally to <pkg>media-libs/libsdl</pkg></flag>
+		<flag name="xrandr">Enable support for the X xrandr extension</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
new file mode 100644
index 000000000000..7b066c0abf2c
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
@@ -0,0 +1,147 @@
+# 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 flag-o-matic wxwidgets vcs-snapshot
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86"
+IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
+jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
+truetype vnc wxwidgets xine xrandr zlib"
+
+REQUIRED_USE="sdl2? ( sdl )"
+
+# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK
+RDEPEND="
+	x11-libs/libSM
+	x11-libs/libXext
+	virtual/glu
+	virtual/opengl
+	asio? ( dev-cpp/asio )
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		gtk? ( x11-libs/gtkglext )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gdal? ( sci-libs/gdal )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper:= )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( >=dev-lang/lua-5.1.5:* )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xine? ( media-libs/xine-lib )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.5-cmake.patch
+	"${FILESDIR}"/${PN}-3.5.1-jpeg-9.patch
+)
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		need-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		-DOSG_PROVIDE_READFILE=ON
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+		-DWITH_Lua51=OFF # We use CMake-version FindLua.cmake instead
+		-DWITH_Asio=$(usex asio)
+		-DWITH_CURL=$(usex curl)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		-DWITH_FFmpeg=$(usex ffmpeg)
+		-DWITH_GDAL=$(usex gdal)
+		-DWITH_GIFLIB=$(usex gif)
+		-DWITH_GStreamer=$(usex gstreamer)
+		-DWITH_GLIB=$(usex gstreamer)
+		-DWITH_GtkGl=$(usex gtk)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_Jasper=$(usex jpeg2k)
+		-DWITH_LIBLAS=$(usex las)
+		-DWITH_Lua=$(usex lua)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Inventor=$(usex openinventor)
+		-DWITH_Poppler-glib=$(usex pdf)
+		-DWITH_PNG=$(usex png)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_SDL2=$(usex sdl2)
+		-DWITH_RSVG=$(usex svg rsvg)
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_Freetype=$(usex truetype)
+		-DWITH_LibVNCServer=$(usex vnc)
+		-DWITH_Xine=$(usex xine)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+	if use examples; then
+		mycmakeargs+=(
+			-DWITH_FLTK=$(usex fltk)
+			-DWITH_FOX=$(usex fox)
+			-DWITH_GLUT=$(usex glut)
+			-DWITH_wxWidgets=$(usex wxwidgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/paklib-0.3 b/dev-games/paklib-0.3
deleted file mode 100644
index ac1a465484cd..000000000000
--- a/dev-games/paklib-0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=library for accessing Quake pak files
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/paklib/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/paklib/pak-0.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fadc7b48585906e1d55f5cdc90f72437
diff --git a/dev-games/paklib/Manifest b/dev-games/paklib/Manifest
new file mode 100644
index 000000000000..c7041723434a
--- /dev/null
+++ b/dev-games/paklib/Manifest
@@ -0,0 +1,3 @@
+DIST pak-0.3.tar.gz 12885 BLAKE2B d2d5815fcb358e6848b4739b0a949e99bbf9ddc2e61fd33aa76527c192eab822ea6c83a79969269fff2e5d6a6b83776d2e757691cc7fbbf244bf840b9297e5df SHA512 05eb8402fc1b1b0ab381dbf815c59fa1fde1e1aa081c124d0f2f3b257fdefd23e9c7995c055b368f53dabab60722b6505976bc601d991265581ee36cb96b7750
+EBUILD paklib-0.3.ebuild 683 BLAKE2B 5fb6cd1463e1f0644d5e3247e1fe8243b84565876840b7139247879566c975742fe1f798998289ed05033435767fb0507ec9202290cf307eb50162ed6b9339fc SHA512 dfbb47532a6107e6093cf19c317669eebfc7a749f8a9e056fdfb146c0f327a60ff18bbf195979f4d9b561666d717f7ce9f6e1bde7289ef099f914c5afa118b84
+MISC metadata.xml 329 BLAKE2B 0b663ce7d95e0454d7e928ee3de952071fa19ae50d29f9a2dd163e02577ba5f034ce665ab545e19b425ba45264c8730d9051590ef124645cf3b0edc27aa11269 SHA512 949275b2029d9a51b2c076b5706a2b58c6e9a41ca0a5d126871ca9580d861f8a8882d257fb0a07c150f86d21a6084429e4f55a990a884a861d31e54e6d888cca
diff --git a/dev-games/paklib/metadata.xml b/dev-games/paklib/metadata.xml
new file mode 100644
index 000000000000..18cdb530e7b8
--- /dev/null
+++ b/dev-games/paklib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">paklib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/paklib/paklib-0.3.ebuild b/dev-games/paklib/paklib-0.3.ebuild
new file mode 100644
index 000000000000..b046ce39026f
--- /dev/null
+++ b/dev-games/paklib/paklib-0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="library for accessing Quake pak files"
+HOMEPAGE="https://sourceforge.net/projects/paklib/"
+SRC_URI="mirror://sourceforge/paklib/pak-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/pak
+
+src_compile() {
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} -fPIC -shared pak.c -o libpak.so || die "pak.so failed"
+	$(tc-getCC) ${CFLAGS} -c pak.c -o libpak.a || die "pak.a failed"
+}
+
+src_install() {
+	dolib.so libpak.so
+	dolib.a libpak.a
+	insinto /usr/include
+	doins pak.h
+	dodoc AUTHORS NEWS README TODO pak.c pak.h
+}
diff --git a/dev-games/physfs-2.0.3-r2 b/dev-games/physfs-2.0.3-r2
deleted file mode 100644
index 82781c6bdbb7..000000000000
--- a/dev-games/physfs-2.0.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Abstraction layer for filesystem and archive access
-EAPI=6
-HOMEPAGE=http://icculus.org/physfs/
-IUSE=doc grp hog mvl qpak static-libs wad +zip 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 ppc64 x86 ~x86-fbsd
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0f92cbb7d89ab2f3cd651c30359c469a
diff --git a/dev-games/physfs-3.0.1 b/dev-games/physfs-3.0.1
deleted file mode 100644
index 15ddc5ad8c82..000000000000
--- a/dev-games/physfs-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Abstraction layer for filesystem and archive access
-EAPI=6
-HOMEPAGE=http://icculus.org/physfs/
-IUSE=grp hog mvl qpak static-libs wad +zip 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 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=http://icculus.org/physfs/downloads/physfs-3.0.1.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c508d3e0ccaa1a793f42fdc4febcdd24
diff --git a/dev-games/physfs-3.0.1-r1 b/dev-games/physfs-3.0.1-r1
deleted file mode 100644
index 7a4e26beebdb..000000000000
--- a/dev-games/physfs-3.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Abstraction layer for filesystem and archive access
-EAPI=6
-HOMEPAGE=http://icculus.org/physfs/
-IUSE=7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip 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 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=http://icculus.org/physfs/downloads/physfs-3.0.1.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa9169b947530461f7b87150c851f405
diff --git a/dev-games/physfs-9999 b/dev-games/physfs-9999
deleted file mode 100644
index 4d1b6139acbc..000000000000
--- a/dev-games/physfs-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 dev-vcs/mercurial
-DESCRIPTION=Abstraction layer for filesystem and archive access
-EAPI=6
-HOMEPAGE=http://icculus.org/physfs/
-IUSE=7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip 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
-LICENSE=ZLIB
-SLOT=0
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	mercurial	9813bb616cb1bd0c943177ab52204409	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f69c386eb258a184729f4d6f202b16b2
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
new file mode 100644
index 000000000000..a0985e090d54
--- /dev/null
+++ b/dev-games/physfs/Manifest
@@ -0,0 +1,8 @@
+AUX physfs-2.0.3-zip_seek.diff 535 BLAKE2B cfb10e446d6370c0365071d38c2d9ebedf2387959568ac5a80ea10a449f90763ae290be09631fb71bf46afefa2d245a286eb6ba255a7f0e69a4534ea8fccbecc SHA512 016f5cafecdfc7f4d2d9dcb517f0ebe7b7765912361399e2c7e239c936c287ca15c0124fd9378c23d6d0d3669c45c4d4dc498098eb052901d349459c94a29ef2
+DIST physfs-2.0.3.tar.bz2 560628 BLAKE2B 8e3e8497463886678aaa671269133513f08aab1e49a6397f61cd44a5139030326ae0889e795401a967b0641f680f353dfaa39d7102502c2b8e0680c0a5d158b5 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80
+DIST physfs-3.0.1.tar.bz2 194638 BLAKE2B a95e599ad5c8c5aafcd9b6569c8b7762bdd0fcdbf9502f8fda61f5068b25c8cf651ce6127a1f139b20baa93bd9ab001d2527aedc0180c3b60246410ab0d35acb SHA512 ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879
+EBUILD physfs-2.0.3-r2.ebuild 1434 BLAKE2B e90dfa9de136d2d0c6df7247b7681cfae7dec40f5c9cce97b089c4edbdd6a82cd220e75726b63c6c1d473f1203812e14ca587cf04131a6cbb61d963159d665b8 SHA512 543e02d9f4c5653c385295beb92c3e002cfb153fa968dfeb386fba205523197f35d0dbb9e57e82960583ae5ded4232001a91a39628ceaf2a195c3215ac6ce6de
+EBUILD physfs-3.0.1-r1.ebuild 1357 BLAKE2B ccc70d74bc537f05b2ebe2cd64e0b6376e3791380d5d00a367f30d1f6169c0281addfa0e26b713c6ed74ff2882193f0dc84edd1d17b16582834f52a4dc898895 SHA512 f7a3c0d29d45754ceca70388d1fc93ae218bcce727006951089df7744038f88823cce3767e079ce41d6cb2bf7837731cd9f04e3e4417f0df2b64e254f72f2cfd
+EBUILD physfs-3.0.1.ebuild 1149 BLAKE2B 4d1741230adecf1df5380d3a15cc00d1fa1a2d21b5b5b5efa31e2dd11b7fdb44ebaf062bd4c8124bdfeed05f330edabd401e62720a432d4ff895dd7be635edfb SHA512 34a700288cb901ba432c748e47203e8234e0f1ba68af56edf490ea798c2afabf6f905cc8d95f602fe8fa66518e2e82d051b95ec7004a913e394bb525478f6dff
+EBUILD physfs-9999.ebuild 1458 BLAKE2B 903117df8a7c78a3e08aadaba7d418666ab387dd14172a48e5a63bf4a277c73fc96f2f49a3f81faad62a4aeed47304b64e72ad55253d238ed480568b785c04a8 SHA512 fd7fa508248f2e917cc11cf165da5c6b6fdde20d3d0340410de44ecc175dcfce8a9035b20a971998eb4733125860ad52aed9f6e34b0401266fff02dc7f15d84b
+MISC metadata.xml 2053 BLAKE2B 72bacd7ea9c8484446c109a062ca9f68eaa4e7d481d6b0d1e32eb3c7c1afc093c0550a20cb4280a7d3ce60929b204cde0499e20262fe591ca97c0c697e8e9bce SHA512 178d6468849870d0e557c04f899edf8513c3e695df0ce1b543de90ca57f87629a2a6c2ebdefeaf00ffe7891dcc9e340200136f94de0579e2e7f43897b138f3a2
diff --git a/dev-games/physfs/files/physfs-2.0.3-zip_seek.diff b/dev-games/physfs/files/physfs-2.0.3-zip_seek.diff
new file mode 100644
index 000000000000..eaab07e16034
--- /dev/null
+++ b/dev-games/physfs/files/physfs-2.0.3-zip_seek.diff
@@ -0,0 +1,15 @@
+http://icculus.org/pipermail/physfs/2017-January/001217.html
+
+diff -r 34ebe997c5c0 archivers/zip.c
+--- a/archivers/zip.c	Fri Jan 01 12:53:41 2016 -0500
++++ b/archivers/zip.c	Wed Jan 25 20:56:26 2017 +0300
+@@ -327,7 +327,8 @@
+                 return(0);
+ 
+             inflateEnd(&finfo->stream);
+-            memcpy(&finfo->stream, &str, sizeof (z_stream));
++            inflateCopy(&finfo->stream, &str);
++            inflateEnd(&str);
+             finfo->uncompressed_position = finfo->compressed_position = 0;
+         } /* if */
+ 
diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml
new file mode 100644
index 000000000000..62272a610b69
--- /dev/null
+++ b/dev-games/physfs/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE 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>
+PhysicsFS is a library to provide abstract access to various archives. It is 
+intended for use in video games, and the design was somewhat inspired by Quake 3's 
+file subsystem. The programmer defines a "write directory" on the physical 
+filesystem. No file writing done through the PhysicsFS API can leave that write 
+directory, for security. For example, an embedded scripting language cannot write 
+outside of this path if it uses PhysFS for all of its I/O, which means that 
+untrusted scripts can run more safely. Symbolic links can be disabled as well, for 
+added safety. For file reading, the programmer lists directories and archives that 
+form a "search path". Once the search path is defined, it becomes a single, 
+transparent hierarchical filesystem. This makes for easy access to ZIP files in the 
+same way as you access a file directly on the disk, and it makes it easy to ship a 
+new archive that will override a previous archive on a per-file basis. Finally, 
+PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are available, 
+the user's home directory, where in the real filesystem your program is running, 
+etc.
+</longdescription>
+<use>
+<flag name="7zip">Enable 7zip/lzma archive support</flag>
+<flag name="grp">Enable Build Engine GRP archive support</flag>
+<flag name="hog">Enable Descent I/II HOG archive support</flag>
+<flag name="iso">Enable ISO9660 file support</flag>
+<flag name="mvl">Enable Descent I/II MVL archive support</flag>
+<flag name="slb">Enable Independence War SLB archive support</flag>
+<flag name="vdf">Enable Gothic/Gothic II VDF archive support</flag>
+<flag name="wad">Enable Doom WAD archive support</flag>
+<flag name="qpak">Enable Quake I/II QPAK archive support</flag>
+<flag name="zip">Enable ZIP archive support</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-games/physfs/physfs-2.0.3-r2.ebuild b/dev-games/physfs/physfs-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..eec6c0e35460
--- /dev/null
+++ b/dev-games/physfs/physfs-2.0.3-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="Abstraction layer for filesystem and archive access"
+HOMEPAGE="http://icculus.org/physfs/"
+SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc64 x86 ~x86-fbsd"
+IUSE="doc grp hog mvl qpak static-libs wad +zip"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-zip_seek.diff"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	# make sure these libs aren't used
+	rm -rf lzma zlib*
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPHYSFS_ARCHIVE_7Z=OFF
+		-DPHYSFS_BUILD_SHARED=ON
+		-DPHYSFS_BUILD_TEST=OFF
+		-DPHYSFS_BUILD_WX_TEST=OFF
+		-DPHYSFS_INTERNAL_ZLIB=OFF
+		-DPHYSFS_BUILD_STATIC="$(usex static-libs)"
+		-DPHYSFS_ARCHIVE_GRP="$(usex grp)"
+		-DPHYSFS_ARCHIVE_HOG="$(usex hog)"
+		-DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
+		-DPHYSFS_ARCHIVE_WAD="$(usex wad)"
+		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
+		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if multilib_is_native_abi && use doc ; then
+		doxygen || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.txt CREDITS.txt TODO.txt )
+	local HTML_DOCS=$(usex doc 'docs/html/*' '')
+
+	cmake-multilib_src_install
+}
diff --git a/dev-games/physfs/physfs-3.0.1-r1.ebuild b/dev-games/physfs/physfs-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..237ccc126998
--- /dev/null
+++ b/dev-games/physfs/physfs-3.0.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="Abstraction layer for filesystem and archive access"
+HOMEPAGE="http://icculus.org/physfs/"
+SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DPHYSFS_BUILD_SHARED=ON
+		-DPHYSFS_BUILD_TEST=OFF
+		-DPHYSFS_BUILD_STATIC="$(usex static-libs)"
+		-DPHYSFS_ARCHIVE_7Z="$(usex 7zip)"
+		-DPHYSFS_ARCHIVE_GRP="$(usex grp)"
+		-DPHYSFS_ARCHIVE_HOG="$(usex hog)"
+		-DPHYSFS_ARCHIVE_ISO9660="$(usex iso)"
+		-DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
+		-DPHYSFS_ARCHIVE_SLB="$(usex slb)"
+		-DPHYSFS_ARCHIVE_VDF="$(usex vdf)"
+		-DPHYSFS_ARCHIVE_WAD="$(usex wad)"
+		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
+		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use doc ; then
+		docinto html
+		dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
+	fi
+}
diff --git a/dev-games/physfs/physfs-3.0.1.ebuild b/dev-games/physfs/physfs-3.0.1.ebuild
new file mode 100644
index 000000000000..4b0afd2bd59b
--- /dev/null
+++ b/dev-games/physfs/physfs-3.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="Abstraction layer for filesystem and archive access"
+HOMEPAGE="http://icculus.org/physfs/"
+SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
+IUSE="grp hog mvl qpak static-libs wad +zip"
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	# make sure these libs aren't used
+	rm -rf lzma zlib*
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPHYSFS_ARCHIVE_7Z=OFF
+		-DPHYSFS_BUILD_SHARED=ON
+		-DPHYSFS_BUILD_TEST=OFF
+		-DPHYSFS_BUILD_WX_TEST=OFF
+		-DPHYSFS_INTERNAL_ZLIB=OFF
+		-DPHYSFS_BUILD_STATIC="$(usex static-libs)"
+		-DPHYSFS_ARCHIVE_GRP="$(usex grp)"
+		-DPHYSFS_ARCHIVE_HOG="$(usex hog)"
+		-DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
+		-DPHYSFS_ARCHIVE_WAD="$(usex wad)"
+		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
+		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/dev-games/physfs/physfs-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild
new file mode 100644
index 000000000000..d001542c16ed
--- /dev/null
+++ b/dev-games/physfs/physfs-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="Abstraction layer for filesystem and archive access"
+HOMEPAGE="http://icculus.org/physfs/"
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="https://hg.icculus.org/icculus/physfs"
+	inherit mercurial
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
+	SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip"
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DPHYSFS_BUILD_SHARED=ON
+		-DPHYSFS_BUILD_TEST=OFF
+		-DPHYSFS_BUILD_STATIC="$(usex static-libs)"
+		-DPHYSFS_ARCHIVE_7Z="$(usex 7zip)"
+		-DPHYSFS_ARCHIVE_GRP="$(usex grp)"
+		-DPHYSFS_ARCHIVE_HOG="$(usex hog)"
+		-DPHYSFS_ARCHIVE_ISO9660="$(usex iso)"
+		-DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
+		-DPHYSFS_ARCHIVE_SLB="$(usex slb)"
+		-DPHYSFS_ARCHIVE_VDF="$(usex vdf)"
+		-DPHYSFS_ARCHIVE_WAD="$(usex wad)"
+		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
+		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use doc ; then
+		docinto html
+		dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
+	fi
+}
diff --git a/dev-games/poker-eval-138.0 b/dev-games/poker-eval-138.0
deleted file mode 100644
index 9d657870c20d..000000000000
--- a/dev-games/poker-eval-138.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A fast C library for evaluating poker hands
-EAPI=5
-HOMEPAGE=http://gna.org/projects/pokersource/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://download.gna.org/pokersource/sources/poker-eval-138.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_=8fcdfcf88bfeb1c80716b6758cf9a291
diff --git a/dev-games/poker-eval/Manifest b/dev-games/poker-eval/Manifest
new file mode 100644
index 000000000000..002010ea6d36
--- /dev/null
+++ b/dev-games/poker-eval/Manifest
@@ -0,0 +1,3 @@
+DIST poker-eval-138.0.tar.gz 470224 BLAKE2B b0d585367730cf3f2ac7382c8290d8009f5967ca8a3b8fecf0db207888149004aaf2d9a774fb8130074ac271a771a45272c89c7d1326f66c07b864802f201412 SHA512 693dfac358beb63b3cbfb2d29bdea65904b894dd9872757db4e203849a0ca7c6951333dd181268c33cb54dd1bd37f57ed963d5c7ab5f9c34e67fdb211fac2fa6
+EBUILD poker-eval-138.0.ebuild 561 BLAKE2B 66f2ca5a93d25a55a3b2e65f810bc11355c8d86a3bb27e4b553a26b4f99ef863d9924ce115c8ab06c8ae85a416021b29e9306fa311fb8b5f6511dece452b5ee5 SHA512 87194af9d1dc5dc35400c5c658c480e58e4eb7006983d6af0882aba2ce888f9d2f57cb6d8544e575e6b0fb754c1dc1f069d181d0be26763d07f334befa44d41e
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/poker-eval/metadata.xml b/dev-games/poker-eval/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/dev-games/poker-eval/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-games/poker-eval/poker-eval-138.0.ebuild b/dev-games/poker-eval/poker-eval-138.0.ebuild
new file mode 100644
index 000000000000..d03db8045a83
--- /dev/null
+++ b/dev-games/poker-eval/poker-eval-138.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A fast C library for evaluating poker hands"
+HOMEPAGE="http://gna.org/projects/pokersource/"
+SRC_URI="http://download.gna.org/pokersource/sources/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+src_configure() {
+	econf \
+		--without-ccache \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO WHATS-HERE" \
+		default
+	prune_libtool_files
+}
diff --git a/dev-games/ps2-packer-0.4.4 b/dev-games/ps2-packer-0.4.4
deleted file mode 100644
index 0b38a0beaf15..000000000000
--- a/dev-games/ps2-packer-0.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=another ELF packer for the PS2
-EAPI=5
-HOMEPAGE=https://github.com/ps2dev/ps2-packer
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/glibc games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/ps2-packer-0.4.4-linux.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_=33d793e60b653a02f3fa70658078b572
diff --git a/dev-games/ps2-packer/Manifest b/dev-games/ps2-packer/Manifest
new file mode 100644
index 000000000000..cfb263552160
--- /dev/null
+++ b/dev-games/ps2-packer/Manifest
@@ -0,0 +1,3 @@
+DIST ps2-packer-0.4.4-linux.tar.gz 56579 BLAKE2B 42134434bc21f5a9b26dd6f47c5bdd6c824a603366d216541e5b3129648d39133ca49c396cbcdbd78495208da963dfe5425a501342698a763a99b2fddafca41d SHA512 491f662af5364fe0177a9a6676a80ae218a941f68c00bb7bc375f2002e61ea98afa58d6dd0c1f7e225e5659bd28e82c25128058edebb9dfb1794d297f090a28d
+EBUILD ps2-packer-0.4.4.ebuild 1532 BLAKE2B 742f1da11547caa8114ea48c2c6ffb2ceaa8cca4bfb20c2c0a22b85d89a5827b9f577c3b0452710c579c644f137d0777d48a18d0e246eb3aa1255c94b21a29b7 SHA512 2433468255c7278638482d0c6ace2f046c6aae974b4f8579bdb8208a597a39eb5d57d9654b30f0442d57a4bb593832af3fed0e179352db0bc96cc2015499d796
+MISC metadata.xml 345 BLAKE2B 36f1bf9af65d709f504951c0bdaf56eefe28a73785ffc8f6d80eb92fb8f2edea38e17f403a42be3b8e31c75f27da63df8e1d891599e1379f10b12000d5e39c0f SHA512 8eb0407ee72d763fe913a0a68915e9d2bd79daab7e16e96833d4318280d0a93dec7d1caada674815f16d6b62d6fd2ab1a1be63935977e1486d486eaca33f4ad7
diff --git a/dev-games/ps2-packer/metadata.xml b/dev-games/ps2-packer/metadata.xml
new file mode 100644
index 000000000000..e259e7a8037c
--- /dev/null
+++ b/dev-games/ps2-packer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ps2dev/ps2-packer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-games/ps2-packer/ps2-packer-0.4.4.ebuild b/dev-games/ps2-packer/ps2-packer-0.4.4.ebuild
new file mode 100644
index 000000000000..3354575677ff
--- /dev/null
+++ b/dev-games/ps2-packer/ps2-packer-0.4.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit games
+
+DESCRIPTION="another ELF packer for the PS2"
+HOMEPAGE="https://github.com/ps2dev/ps2-packer"
+SRC_URI="mirror://gentoo/${P}-linux.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip"
+
+QA_TEXTRELS="
+	${GAMES_PREFIX_OPT:1}/ps2-packer/n2e-packer.so
+	${GAMES_PREFIX_OPT:1}/ps2-packer/n2d-packer.so
+	${GAMES_PREFIX_OPT:1}/ps2-packer/n2b-packer.so"
+
+QA_WX_LOAD="
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2e-0088-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/lzo-0088-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2e-asm-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/null-0088-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2e-asm-one-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2e-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/zlib-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2b-0088-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2d-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/null-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2b-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/zlib-0088-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/lzo-1d00-stub
+	${GAMES_PREFIX_OPT:1}/ps2-packer/stub/n2d-0088-stub"
+
+RDEPEND="sys-libs/glibc"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "${GAMES_PREFIX_OPT}"/${PN}
+	doins -r README.txt stub
+	exeinto "${GAMES_PREFIX_OPT}"/${PN}
+	doexe *.so ps2-packer
+	games_make_wrapper ${PN} "${GAMES_PREFIX_OPT}"/${PN}/${PN}
+	prepgamesdirs
+}
diff --git a/dev-games/quake4-sdk-1.4.2 b/dev-games/quake4-sdk-1.4.2
deleted file mode 100644
index b2a559914496..000000000000
--- a/dev-games/quake4-sdk-1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Quake4 SDK
-EAPI=5
-HOMEPAGE=https://www.iddevnet.com/quake4/
-KEYWORDS=-* amd64 x86
-LICENSE=QUAKE4
-RDEPEND=games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.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_=2244062a7c45a840ca63fe930c1b292f
diff --git a/dev-games/quake4-sdk-1.4.2-r1 b/dev-games/quake4-sdk-1.4.2-r1
deleted file mode 100644
index 5c0aa280b675..000000000000
--- a/dev-games/quake4-sdk-1.4.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Quake4 SDK
-EAPI=6
-HOMEPAGE=https://www.iddevnet.com/quake4/
-KEYWORDS=-* amd64 x86
-LICENSE=QUAKE4
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=f7079bc3d63e41fb824d24bced588b39
diff --git a/dev-games/quake4-sdk/Manifest b/dev-games/quake4-sdk/Manifest
new file mode 100644
index 000000000000..7a5273315b1c
--- /dev/null
+++ b/dev-games/quake4-sdk/Manifest
@@ -0,0 +1,4 @@
+DIST quake4-linux-1.4.2-sdk.x86.run 65799543 BLAKE2B c4911b63842d4c5226f41bc6bc1137a993ace9644600dad68b328c2c1c4c69c1cc93cbe65f677ea4f092a82e6c5bc41fec49287f25007a34c7d951e421d99624 SHA512 21f09f71f040e22d9d4cfa09aa3d5d276d71716ed4eab5098682f8060eb0159d460f6f02b35d110689570f8c251141bf5d0eb1e4af8f68fcaa66b9e7bcb3855f
+EBUILD quake4-sdk-1.4.2-r1.ebuild 494 BLAKE2B b16bc771b83b2c7a8f9a6250ba0b9606c570469faba476bb8b314e8b6bae69d1eb34d2bcaeb46f2f97b295b109ef756e4ddf99d1dd3622f4674de24dc01d989d SHA512 d7dcfe6f79c8c05973a970cc41e8666094b0dd57c34df757bc0041b5a2f44604e66a58d62faf7982e8c18aa987fe34e49f3ce02d39847cd3063585deeff8a1d0
+EBUILD quake4-sdk-1.4.2.ebuild 528 BLAKE2B 559b32c073130322e2e7df8056dfe6d7a8c1f0f80882a8e575166f08483ce7c46c901771100b2be3db409984e38f5bfc3b89aea554aea0e310ca2967fd501ddc SHA512 98beacbc4d3315b2a23683f10f5f4a72698e5ba5c67c0e2633b0819361c756325b45048edc49ce51ce16e461f6774f7082cead595d9c3b56f91dc3597889daa8
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-games/quake4-sdk/metadata.xml b/dev-games/quake4-sdk/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/dev-games/quake4-sdk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..5b5976f8d6c0
--- /dev/null
+++ b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit unpacker
+
+DESCRIPTION="Quake4 SDK"
+HOMEPAGE="https://www.iddevnet.com/quake4/"
+SRC_URI="mirror://idsoftware/quake4/source/linux/quake4-linux-${PV}-sdk.x86.run"
+
+LICENSE="QUAKE4"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_makeself
+	rm -rf setup.{sh,data} || die
+}
+
+src_install() {
+	insinto "/opt/${PN}"
+	doins -r *
+}
diff --git a/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild b/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild
new file mode 100644
index 000000000000..4d98a6595544
--- /dev/null
+++ b/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker games
+
+DESCRIPTION="Quake4 SDK"
+HOMEPAGE="https://www.iddevnet.com/quake4/"
+SRC_URI="mirror://idsoftware/quake4/source/linux/quake4-linux-${PV}-sdk.x86.run"
+
+LICENSE="QUAKE4"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="strip"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_makeself
+	rm -rf setup.{sh,data} || die
+}
+
+src_install() {
+	insinto "${GAMES_PREFIX_OPT}/${PN}"
+	doins -r *
+	prepgamesdirs
+}
diff --git a/dev-games/simgear-2018.1.1 b/dev-games/simgear-2018.1.1
deleted file mode 100644
index b63ab3a90fd5..000000000000
--- a/dev-games/simgear-2018.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Development library for simulation games
-EAPI=6
-HOMEPAGE=http://www.simgear.org/
-IUSE=+dns debug gdal openmp subversion test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
-SLOT=0
-SRC_URI=mirror://sourceforge/flightgear/simgear-2018.1.1.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_=76358d990f3cf51027a07e897b8491a4
diff --git a/dev-games/simgear-2018.2.1 b/dev-games/simgear-2018.2.1
deleted file mode 100644
index 7dceb8e2ceb5..000000000000
--- a/dev-games/simgear-2018.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Development library for simulation games
-EAPI=6
-HOMEPAGE=http://www.simgear.org/
-IUSE=+dns debug gdal openmp subversion test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
-SLOT=0
-SRC_URI=mirror://sourceforge/flightgear/simgear-2018.2.1.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_=60f6accf74526053724ca4cabce2ba61
diff --git a/dev-games/simgear-9999 b/dev-games/simgear-9999
deleted file mode 100644
index 0a802d999093..000000000000
--- a/dev-games/simgear-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Development library for simulation games
-EAPI=6
-HOMEPAGE=http://www.simgear.org/
-IUSE=+dns debug gdal openmp subversion test
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
-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_=2b78b1ebb3e127ad8c96bdbfe2d1f4b7
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
new file mode 100644
index 000000000000..b45a1f7614c7
--- /dev/null
+++ b/dev-games/simgear/Manifest
@@ -0,0 +1,6 @@
+DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3 SHA512 3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
+DIST simgear-2018.2.1.tar.bz2 1314943 BLAKE2B 60e44896d466085014020874a1be6ab3f6f87e472f985237404dffb5dfbd5c25f0d330701276e0b8d075830695872eb7521bb4eb5b0107edac5977c3aab85bf7 SHA512 6756994e0688a1f3699c33548ea90b19e99a439ea2f2002cf524629370cd1161a1556ee966fc3a781141fc7a08e7574adc0ecbe6dec67e72d631c6c4d744e4dd
+EBUILD simgear-2018.1.1.ebuild 1289 BLAKE2B 6b645fd5621acc09b4a0a9862e5e5238334c8d5b6cc1a9f6b8c7d1c08154e84b04a9be2e827cf12383a805027858d7ef9bc2ca9841251b01ab28da4ad39ede61 SHA512 4deaa97b485983475f5c9a72dbe7e3b1ac4c5a0166d3c5a541ac38cc0504211289dbfa8721139fbc8da01cd6171ed99414aec13d924a5ff0c37f379c6a1cf7ed
+EBUILD simgear-2018.2.1.ebuild 1289 BLAKE2B 7765dabb2e05d3c4f948ddb60b877c3bfee627c7c72f59df5c5020a5eb4b3022b53cf098d4a57b197b4e1a5384954fc734859c2b9998ed2c81d47dc1f45be57c SHA512 d6ba94beeea257a0e19435c1d9fdc0aaa31ee4e1d7dd14c0f40e61ce07fd16ff7b37d9e957478afb1b5c88df176b437cd407a272ed69626add981924d0b85432
+EBUILD simgear-9999.ebuild 1351 BLAKE2B 69fd6d6034053e9d026e9f91376bbb716be4c687007a031ca580f844a7ae0c3d035abbfb01d3e39eb3ed5fbc9502d0f3ef123e7c7f4566a52eb88eb23077bce4 SHA512 3735c556acf625e06391dd2c51b329cc8367449ed67d72dd0e4345a102b98b334595634ac1de1e61c05094075616a48887785f3b3f368d06181413add49a2f91
+MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/metadata.xml b/dev-games/simgear/metadata.xml
new file mode 100644
index 000000000000..aa189d18155e
--- /dev/null
+++ b/dev-games/simgear/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+SimGear is a set of open-source libraries designed to be used as building blocks for 
+quickly assembling 3d simulations, games, and visualization applications.
+	</longdescription>
+	<use>
+		<flag name="dns">Enable DNS resolver via <pkg>net-libs/udns</pkg></flag>
+		<flag name="gdal">Enable alternative terrain engine based on pagedLOD via <pkg>sci-libs/gdal</pkg></flag>
+		<flag name="subversion">Enable terrasync scenery downloader</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">flightgear</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/simgear/simgear-2018.1.1.ebuild b/dev-games/simgear/simgear-2018.1.1.ebuild
new file mode 100644
index 000000000000..cca44548c832
--- /dev/null
+++ b/dev-games/simgear/simgear-2018.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	dns? ( net-libs/udns )
+	gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=ON
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+		-DSYSTEM_UDNS=ON
+		-DUSE_AEONWAVE=OFF
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-games/simgear/simgear-2018.2.1.ebuild b/dev-games/simgear/simgear-2018.2.1.ebuild
new file mode 100644
index 000000000000..c8c3453c3016
--- /dev/null
+++ b/dev-games/simgear/simgear-2018.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	dns? ( net-libs/udns )
+	gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=ON
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+		-DSYSTEM_UDNS=ON
+		-DUSE_AEONWAVE=OFF
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
new file mode 100644
index 000000000000..6ee236bee6f8
--- /dev/null
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils toolchain-funcs git-r3
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/${PN}
+	git://mapserver.flightgear.org/${PN}"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	dns? ( net-libs/udns )
+	gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=ON
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+		-DSYSTEM_UDNS=ON
+		-DUSE_AEONWAVE=OFF
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-games/t4k-common-0.1.1 b/dev-games/t4k-common-0.1.1
deleted file mode 100644
index e7b2c25ffaf3..000000000000
--- a/dev-games/t4k-common-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libxml2:2 media-libs/libsdl media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf media-libs/sdl-pango svg? ( gnome-base/librsvg:2 media-libs/libpng:0 x11-libs/cairo ) virtual/pkgconfig
-DESCRIPTION=A library of code shared between tuxmath and tuxtype
-EAPI=5
-HOMEPAGE=http://tux4kids.alioth.debian.org/tuxmath/download.php
-IUSE=static-libs svg
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2:2 media-libs/libsdl media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf media-libs/sdl-pango svg? ( gnome-base/librsvg:2 media-libs/libpng:0 x11-libs/cairo )
-SLOT=0
-SRC_URI=http://alioth.debian.org/frs/download.php/3540/t4k_common-0.1.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_=1adb8347974fc1d5fe69b561ce0eaa7c
diff --git a/dev-games/t4k-common/Manifest b/dev-games/t4k-common/Manifest
new file mode 100644
index 000000000000..d65982721b85
--- /dev/null
+++ b/dev-games/t4k-common/Manifest
@@ -0,0 +1,4 @@
+AUX t4k-common-0.1.1-libpng.patch 799 BLAKE2B 3248451847f0b06a2926287b6af09eb2d86aa234cff7a640f499a849955f3faa1646264cbdcace7a30024124fbc647fe5283b96339cc8e55850cec616cce5ac4 SHA512 e9d8c4a2487d972231ef631feac67cea679ec585faf0453cf513290f318778070222b6e9a54725f18f5ea874c009a370ec55245a05151e9ecf19403b876be6ac
+DIST t4k_common-0.1.1.tar.gz 629215 BLAKE2B e85619ae0526aa51dc2075e5b845eaf778772cc7b354cb2a8d6737602695dbeea798de980ddefce1ec951b3700059a936bef291f140acf6424001e6647fe8643 SHA512 ddf9c0ccf1b6a4ab9f009794262fef86587e31e5110e5a8041214d7c94c607b9f4ca5ec21f04254bfc00a625ab75a04a69b3dcaff9ec13dbb92d5d82b6e375cf
+EBUILD t4k-common-0.1.1.ebuild 947 BLAKE2B 1bfcbfcd154eac5bec5910858977634c890331596140c6a34644bf8478c3b981ed1ee8f6c7daba232fd9bb893e1afe6c7d016587b325daf8ab1dc5feadbd1e96 SHA512 80e8688b02901af87c5c38c518f382fb0147bdb26aafc2aaa15e5749116a7b1ea6c4140f2cf223e1f34bf4dd01a96a238d4b345873d54375921c3f0e792a792a
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
new file mode 100644
index 000000000000..29991544ddbf
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
@@ -0,0 +1,18 @@
+--- src/t4k_common-0.1.1/src/t4k_loaders.c	2011-04-08 05:46:07.000000000 +0300
++++ src.new/t4k_common-0.1.1/src/t4k_loaders.c	2012-05-02 10:35:41.836670434 +0300
+@@ -1028,12 +1028,9 @@
+       {
+         png_init_io(png_ptr, fi);
+ 
+-        info_ptr->width = surf->w;
+-        info_ptr->height = surf->h;
+-        info_ptr->bit_depth = 8;
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-        info_ptr->interlace_type = 1;
+-        info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
++        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8,
++            PNG_COLOR_TYPE_RGB_ALPHA, 1,
++            PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+         png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+                        PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/dev-games/t4k-common/metadata.xml b/dev-games/t4k-common/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/dev-games/t4k-common/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-games/t4k-common/t4k-common-0.1.1.ebuild b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
new file mode 100644
index 000000000000..ed40644465c3
--- /dev/null
+++ b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library of code shared between tuxmath and tuxtype"
+HOMEPAGE="http://tux4kids.alioth.debian.org/tuxmath/download.php"
+SRC_URI="http://alioth.debian.org/frs/download.php/3540/t4k_common-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs svg"
+
+RDEPEND="dev-libs/libxml2:2
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	media-libs/sdl-pango
+	svg? (
+		gnome-base/librsvg:2
+		media-libs/libpng:0
+		x11-libs/cairo
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/t4k_common-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng.patch
+}
+
+src_configure() {
+	econf \
+		$(usex svg "" "--without-rsvg") \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files --all
+}
diff --git a/dev-games/tiled-1.0.3 b/dev-games/tiled-1.0.3
deleted file mode 100644
index a4a9a8bc2818..000000000000
--- a/dev-games/tiled-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A general purpose tile map editor
-EAPI=6
-HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python python_targets_python2_7
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 GPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bjorn/tiled/archive/v1.0.3/tiled-1.0.3.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=771d473f25e4908d3ebdb7661950d584
diff --git a/dev-games/tiled-1.1.4 b/dev-games/tiled-1.1.4
deleted file mode 100644
index 566dc8ab2c14..000000000000
--- a/dev-games/tiled-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A general purpose tile map editor
-EAPI=6
-HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=BSD BSD-2 GPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.4/tiled-1.1.4.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d3d90a26dacd05eb55c418fd1009cc8
diff --git a/dev-games/tiled-1.1.5 b/dev-games/tiled-1.1.5
deleted file mode 100644
index 2113ff9ec16b..000000000000
--- a/dev-games/tiled-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A general purpose tile map editor
-EAPI=6
-HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=BSD BSD-2 GPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.5/tiled-1.1.5.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	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d3d90a26dacd05eb55c418fd1009cc8
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
new file mode 100644
index 000000000000..65047ad0d13c
--- /dev/null
+++ b/dev-games/tiled/Manifest
@@ -0,0 +1,7 @@
+DIST tiled-1.0.3.tar.gz 6601791 BLAKE2B 86bca36994b8596931b68dace6db61443bfa488444d06d7bae616a1c095da2d8fd476fd7a466d6b7e95b2291a977e4893125fd09091e96733973bfbc5f66a651 SHA512 4f3c97a91794f86f04965a2332e04f51bc588f7bcfef402edb1092c4e58bb6ace9c90ea522a5fa15a46ca39c8249f62818b80be6d65c11a8d41092ead31cd4f7
+DIST tiled-1.1.4.tar.gz 16029257 BLAKE2B 622afd39623af2b713accca5d6ae989224547833e566d1506c90ea846159481f438a484f4a923e9040949bac2d3903e97e23e57f311eb235c68cdad3ee2335f0 SHA512 861f4916968d88bfbf0359db3972994d98608fe9aa4e405a2e89f1c7a11e2521c8c5e18796809db5597b123706dcad0d120221f1e3143dd6e310111487d1aec3
+DIST tiled-1.1.5.tar.gz 16034738 BLAKE2B 7486d6267780ad0ab4bc0e7bb6da9e1e48b9e35e0a22a1c6a534cb21227554cba7ce40c5013db88fe9f3547bdfe9723a14c500f2e55164f684d8a5426e632018 SHA512 4c1d03825c76ba14b0469af564fe5eb78fa51790b41ddc51f3f72a8247b0aba1118142144453f4cbdaeedb54ac23812086eeac91bf61457887f1d9635508dbe7
+EBUILD tiled-1.0.3.ebuild 1276 BLAKE2B 31c9ef74b458163b5ecbed4c307b1a32ebec6d5d635d4cb8373add7b3e3749057a307550fe68b35d0694fbf566cabc04d5c3abf1cb4ac2e7d9449c91f61c61ff SHA512 cbc32e28411d3cbcd7973e6072d1f9874997b467fc3760fa2ca54e8595e7bcd5599fe5b85db3cf6b1b78da1a393d48843f749713a647a2c8d6df63aacfb2a9df
+EBUILD tiled-1.1.4.ebuild 1277 BLAKE2B 485c63e57a90369e1779850554604554ba769794d3226b661c4d78abb8af3db09cdac455b517e5795e5293e404fd6318351b666768284563e235311ed3d405b6 SHA512 fb47bf46726da4dbd04fc51c78b376f181bf2b2d38e356a86093a51cfa3600430f363db7cebd94ef720ba50f187ae042fe596d0c3fa671f58f37d415e0ad4051
+EBUILD tiled-1.1.5.ebuild 1277 BLAKE2B 485c63e57a90369e1779850554604554ba769794d3226b661c4d78abb8af3db09cdac455b517e5795e5293e404fd6318351b666768284563e235311ed3d405b6 SHA512 fb47bf46726da4dbd04fc51c78b376f181bf2b2d38e356a86093a51cfa3600430f363db7cebd94ef720ba50f187ae042fe596d0c3fa671f58f37d415e0ad4051
+MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/metadata.xml b/dev-games/tiled/metadata.xml
new file mode 100644
index 000000000000..efca90beb5b3
--- /dev/null
+++ b/dev-games/tiled/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bjorn/tiled</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/tiled/tiled-1.0.3.ebuild b/dev-games/tiled/tiled-1.0.3.ebuild
new file mode 100644
index 000000000000..a0ce9f7613a8
--- /dev/null
+++ b/dev-games/tiled/tiled-1.0.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.7:5
+	>=dev-qt/qtgui-5.7:5
+	>=dev-qt/qtnetwork-5.7:5
+	>=dev-qt/qtwidgets-5.7:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+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/dev-games/tiled/tiled-1.1.4.ebuild b/dev-games/tiled/tiled-1.1.4.ebuild
new file mode 100644
index 000000000000..a78bd8eb9206
--- /dev/null
+++ b/dev-games/tiled/tiled-1.1.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.7:5
+	>=dev-qt/qtgui-5.7:5
+	>=dev-qt/qtnetwork-5.7:5
+	>=dev-qt/qtwidgets-5.7:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+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/dev-games/tiled/tiled-1.1.5.ebuild b/dev-games/tiled/tiled-1.1.5.ebuild
new file mode 100644
index 000000000000..a78bd8eb9206
--- /dev/null
+++ b/dev-games/tiled/tiled-1.1.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.7:5
+	>=dev-qt/qtgui-5.7:5
+	>=dev-qt/qtnetwork-5.7:5
+	>=dev-qt/qtwidgets-5.7:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+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/dev-games/vamos-0.7.1 b/dev-games/vamos-0.7.1
deleted file mode 100644
index 257555cc355c..000000000000
--- a/dev-games/vamos-0.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/opengl virtual/glu media-libs/freeglut media-libs/libpng:0 media-libs/libsdl[joystick,video] media-libs/openal dev-libs/boost media-libs/freealut virtual/pkgconfig
-DESCRIPTION=an automotive simulation framework
-EAPI=5
-HOMEPAGE=http://vamos.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/freeglut media-libs/libpng:0 media-libs/libsdl[joystick,video] media-libs/openal dev-libs/boost media-libs/freealut
-SLOT=0
-SRC_URI=mirror://sourceforge/vamos/vamos-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_=d587a1f18bd3b3bce92edaa4e9fa7065
diff --git a/dev-games/vamos-0.8.2 b/dev-games/vamos-0.8.2
deleted file mode 100644
index 703424d7ad1a..000000000000
--- a/dev-games/vamos-0.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install 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/boost:=[python,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(+)?] media-libs/freealut media-libs/freeglut media-libs/libpng:0= media-libs/libsdl[joystick,video] media-libs/openal virtual/glu virtual/opengl >=sys-devel/autoconf-archive-2016.09.16 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=An automotive simulation framework
-EAPI=6
-HOMEPAGE=http://vamos.sourceforge.net/
-IUSE=test 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=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/boost:=[python,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(+)?] media-libs/freealut media-libs/freeglut media-libs/libpng:0= media-libs/libsdl[joystick,video] media-libs/openal virtual/glu virtual/opengl
-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=mirror://sourceforge/vamos/vamos-0.8.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=10cd7ee24ee77e03553c60374ea10263
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest
new file mode 100644
index 000000000000..6e5cf2e92edb
--- /dev/null
+++ b/dev-games/vamos/Manifest
@@ -0,0 +1,9 @@
+AUX vamos-0.7.1-as-needed.patch 468 BLAKE2B bdb8cbb21fe89114e45cbdacab2283d97998b8ac476745eb458a72cf5d8bcd9386c94cf4e4c58aaf74146341ed29e6d0e11a1aa84afda003bfca30508579acff SHA512 e06aca9c628b6fd58b63c1808c52d2222b4f99ccde17c07ffb5c6ef0895a940de37ffc36d4d8fe1c382a71b2d3b4ce49007a301903ff6713ebbc34f5871bc164
+AUX vamos-0.7.1-gcc46.patch 246 BLAKE2B 8db281bd4df2a8ace91b844935128ed02f4702892251bb80d8baeaff5588bc9dda616de451d3f73517490e6153d4aed1f27aef731090dbee1f7cf68c84aaf0f1 SHA512 0ae32707a87d94ba5f1bf3dc085e8109fc1b0f8bc4cf7bdf3997d7b47e65ebc10cbdee667d076cff41f65c461a16519f8615b5b704be66d6863aadd5a971e11b
+AUX vamos-0.8.2-fix-buildsystem.patch 9650 BLAKE2B 3ece75ea7415c77aff65edf63ce1be39ddce908826b5bcea0e4eb02a8f92277ade29c076976944a14c494478683de3da8887640cf513a0421f0631f505078f42 SHA512 147cc9f7ecf918dd92da85903a4ec6055ae97b45a9850c3c190e72f7f2d3eaaf43c45b155d2e2629d4e4e08cb08463073f27b2d3fa6f0e741055479d64307ba4
+AUX vamos-0.8.2-fix-c++14.patch 554 BLAKE2B 4b45082dee29de037d9e6bfffb025b0f3cc9e914445e4c3e08f5a5c50a891ed179f2c9428a6cc7477664d468958f8933a0b8a78867e3da33b8e756b41b109b43 SHA512 b5fb978bfa0a1d3d7986800e3a9d83bd7eb92b2f6b0060f171d4f388acac3714e397cc966641fbe70297534849010081a8d58b7d3eea6549625f952d3fe81179
+DIST vamos-0.7.1.tar.gz 1681074 BLAKE2B 6d7c132fc65d1ba59c12d98699e82bd4d6029c0f6bb88e2c661d14ab602dc3aa0fe15b30cb8cc70d5b4c7e81f9d5a27c96b53f450098fb164806618d0ed7d35b SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2
+DIST vamos-0.8.2.tar.gz 2148278 BLAKE2B a8afa661295bd646c0ee1d826dcee452f9788ecea7364116b0026f4950286280ef57d1b0179cb51b5f54c2788ca66f16b97bbc07142e0c92468638ebfbd81975 SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880
+EBUILD vamos-0.7.1.ebuild 887 BLAKE2B 36d4484d093b3b7dc8c378d3282ff5d47f2067fcf891a4db51a07c4aa5de8509f6243295374c0aa9ff85ab0938d1db5217754750dac335f4fadb4a9bb4de0249 SHA512 785311b6f0e3fecfbca8b0151fbb8ca2981c880d8eb2776deea9114faa4dda9acffe21eb87ab9225296c9c82ab3359e732a4f9e44e09c4c6efb42dbab8328fda
+EBUILD vamos-0.8.2.ebuild 1201 BLAKE2B e7243562ff19b9ef98838af1833b6b0f20078d41579ee0f5d869bdbdd29551cc78d40bc62b534cb125a51c31d760707c7f2b2f7ce09c0c36eac2bfaf0e403574 SHA512 d1e997a6d90e25aee6e70309a1e1936df96581d72c3c38f45d6a6ac0e197be489ab3d8956e3a581f17a53fe4a64bd386c92f555789d46c733df9f41bc16faf25
+MISC metadata.xml 328 BLAKE2B 2c3269c4159fb3bb89b8e5c119844f960236e72bbd22915a44b901293d040f8c3e65d28e0a84e0075ed870bfb7c52d919c9aebd3456e93c7ed9ed2e2f91d01f6 SHA512 698c72452fe860f88cff1cb1de6a46902e02fe685081693c2dacbd5c9843fe717128cb9a706849adf19359bba1f809863fe62d569e776649bf5f8b5190663cb4
diff --git a/dev-games/vamos/files/vamos-0.7.1-as-needed.patch b/dev-games/vamos/files/vamos-0.7.1-as-needed.patch
new file mode 100644
index 000000000000..868e9318cae8
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.7.1-as-needed.patch
@@ -0,0 +1,11 @@
+--- vamos-0.7.0.orig/media/Makefile.in
++++ vamos-0.7.0/media/Makefile.in
+@@ -71,7 +71,7 @@
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libvamos_media_la_LIBADD =
++libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la
+ am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo \
+ 	XML_Parser.lo
+ libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS)
diff --git a/dev-games/vamos/files/vamos-0.7.1-gcc46.patch b/dev-games/vamos/files/vamos-0.7.1-gcc46.patch
new file mode 100644
index 000000000000..bf2ec3c6f6aa
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.7.1-gcc46.patch
@@ -0,0 +1,10 @@
+--- vamos-0.7.1.orig/geometry/Parameter.h
++++ vamos-0.7.1/geometry/Parameter.h
+@@ -21,6 +21,7 @@
+ #define PARAMETER_H
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ /// A container for numbers passed from the command line.
+ namespace Vamos_Geometry
diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch b/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch
new file mode 100644
index 000000000000..f78ac1c4f055
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch
@@ -0,0 +1,378 @@
+Fix buildsystem:
+* Prevent pollution of python site-packages root dir
+* Fix underlinking in modules
+* Remove broken AX_* macros
+* Add workaround for parallel install issue with automake
+
+--- a/body/Makefile.am
++++ b/body/Makefile.am
+@@ -21,6 +21,10 @@
+ 	Tire.cc \
+ 	Transmission.cc \
+ 	Wheel.cc
++libvamos_body_la_LIBADD = \
++	-l$(BOOST_PYTHON_LIB) \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la
+ 
+ pkginclude_HEADERS = \
+ 	Aerodynamic_Device.h \
+@@ -46,24 +50,23 @@
+ 
+ EXTRA_DIST = $(pkginclude_HEADERS)
+ 
+-AM_CXXFLAGS = -fPIC -Wall -pedantic
++AM_CXXFLAGS = -Wall -pedantic
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
+ 
+ # Python Module
+ if HAVE_PYTHON
+-pyexec_LTLIBRARIES = body.la
++pkgpyexec_LTLIBRARIES = body.la
+ else
+-pyexec_LTLIBRARIES =
++pkgpyexec_LTLIBRARIES =
+ endif
+ 
+ body_la_SOURCES = bp-body.cc
+-body_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ body_la_LDFLAGS = -avoid-version -module
+ body_la_LIBADD = \
+-	$(top_srcdir)/body/libvamos-body.la \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
+-	-l$(PYTHON_LIB) \
+-	-l$(BOOST_PYTHON_LIB)
++	libvamos-body.la \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la \
++	$(PYTHON_LIBS)
+ 
+ if DO_UNIT_TESTS
+ UNIT_TESTS = \
+@@ -81,7 +84,7 @@
+ test_Aerodynamic_Device_SOURCES = test_Aerodynamic_Device.cc
+ test_Aerodynamic_Device_CXXFLAGS = -DBOOST_TEST_DYN_LINK
+ test_Aerodynamic_Device_LDADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
++	../geometry/libvamos-geometry.la \
+ 	Frame.lo \
+ 	Particle.lo \
+ 	Aerodynamic_Device.lo \
+@@ -89,35 +92,35 @@
+ test_Car_SOURCES = test_Car.cc
+ test_Car_CXXFLAGS = -DBOOST_TEST_DYN_LINK
+ test_Car_LDADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
+-	$(top_srcdir)/body/libvamos-body.la \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la \
++	../body/libvamos-body.la \
+ 	-lboost_unit_test_framework
+ test_Frame_SOURCES = test_Frame.cc
+ test_Frame_CXXFLAGS = -DBOOST_TEST_DYN_LINK
+ test_Frame_LDADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
++	../geometry/libvamos-geometry.la \
+ 	Frame.lo \
+ 	-lboost_unit_test_framework
+ test_Particle_SOURCES = test_Particle.cc
+ test_Particle_CXXFLAGS = -DBOOST_TEST_DYN_LINK
+ test_Particle_LDADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
++	../geometry/libvamos-geometry.la \
+ 	Frame.lo \
+ 	Particle.lo \
+ 	-lboost_unit_test_framework
+ test_Rigid_Body_SOURCES = test_Rigid_Body.cc
+ test_Rigid_Body_CXXFLAGS = -DBOOST_TEST_DYN_LINK
+ test_Rigid_Body_LDADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
+-	$(top_srcdir)/body/libvamos-body.la \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la \
++	../body/libvamos-body.la \
+ 	-lboost_unit_test_framework
+ 
+ if DO_UNIT_TESTS
+ check-local: $(UNIT_TESTS)
+ 	for test in $(UNIT_TESTS); do \
+ 		echo $$test; \
+-		$(top_srcdir)/body/$$test; \
++		../body/$$test; \
+ 	done
+ endif
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ AC_PATH_X
+ 
+@@ -28,9 +28,6 @@
+ 
+ AC_CONFIG_FILES([vamos/vamos], [chmod +x vamos/vamos])
+ 
+-dnl Python
+-AX_PYTHON
+-
+ dnl Boost
+ AX_BOOST_BASE([1.46.0],, AC_MSG_ERROR([Boost >= v1.46.0 is required.]))
+ AX_BOOST_PYTHON([1.46.0])
+--- a/geometry/Makefile.am
++++ b/geometry/Makefile.am
+@@ -15,6 +15,7 @@
+ 	Three_Vector.cc \
+ 	Two_Vector.cc \
+ 	Parameter.cc
++libvamos_geometry_la_LIBADD = -l$(BOOST_PYTHON_LIB)
+ 
+ pkginclude_HEADERS = \
+ 	Calculations.h \
+@@ -39,22 +40,21 @@
+ 
+ EXTRA_DIST = $(pkginclude_HEADERS)
+ 
+-AM_CXXFLAGS = -fPIC -Wall -pedantic
++AM_CXXFLAGS = -Wall -pedantic
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
+ 
+ # Python Module
+ if HAVE_PYTHON
+-pyexec_LTLIBRARIES = geometry.la
++pkgpyexec_LTLIBRARIES = geometry.la
+ else
+-pyexec_LTLIBRARIES =
++pkgpyexec_LTLIBRARIES =
+ endif
+ 
+ geometry_la_SOURCES = bp-geometry.cc
+-geometry_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ geometry_la_LDFLAGS = -avoid-version -module
+ geometry_la_LIBADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	-l$(PYTHON_LIB) \
+-	-l$(BOOST_PYTHON_LIB)
++	libvamos-geometry.la \
++	$(PYTHON_LIBS)
+ 
+ # Unit Tests
+ if DO_UNIT_TESTS
+@@ -110,6 +110,6 @@
+ check-local: $(UNIT_TESTS)
+ 	for test in $(UNIT_TESTS); do \
+ 		echo $$test; \
+-		$(top_srcdir)/geometry/$$test; \
++		../geometry/$$test; \
+ 	done
+ endif
+--- a/media/Makefile.am
++++ b/media/Makefile.am
+@@ -7,6 +7,7 @@
+ 	Texture_Image.cc \
+ 	Two_D.cc \
+ 	XML_Parser.cc
++libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la
+ 
+ pkginclude_HEADERS = \
+ 	Ac3d.h \
+@@ -19,23 +20,27 @@
+ 
+ EXTRA_DIST = $(pkginclude_HEADERS)
+ 
+-AM_CXXFLAGS = -fPIC -Wall -pedantic
++AM_CXXFLAGS = -Wall -pedantic
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
+ 
+ # Python Module
+ if HAVE_PYTHON
+-pyexec_LTLIBRARIES = media.la
++pkgpyexec_LTLIBRARIES = media.la
+ else
+-pyexec_LTLIBRARIES =
++pkgpyexec_LTLIBRARIES =
+ endif
+ 
+ media_la_SOURCES = bp-media.cc
+-media_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ media_la_LDFLAGS = -avoid-version -module
+ media_la_LIBADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
+-	-l$(PYTHON_LIB) \
+-	-l$(BOOST_PYTHON_LIB)
++	../geometry/libvamos-geometry.la \
++	libvamos-media.la \
++	$(PYTHON_LIBS)
++
++# workaround for broken parallel install support in automake with LTLIBRARIES
++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
++install_pkgpyexecLTLIBRARIES = install-pkgpyexecLTLIBRARIES
++$(install_pkgpyexecLTLIBRARIES): install-libLTLIBRARIES
+ 
+ # Unit Tests
+ if DO_UNIT_TESTS
+@@ -54,6 +59,6 @@
+ check-local: $(UNIT_TESTS)
+ 	for test in $(UNIT_TESTS); do \
+ 		echo $$test; \
+-		$(top_srcdir)/media/$$test; \
++		../media/$$test; \
+ 	done
+ endif
+--- a/track/Makefile.am
++++ b/track/Makefile.am
+@@ -6,6 +6,9 @@
+ 	Road_Segment.cc \
+ 	Strip_Track.cc \
+ 	Strip_Track_Reader.cc
++libvamos_track_la_LIBADD = \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la
+ 
+ pkginclude_HEADERS = \
+ 	Gl_Road_Segment.h \
+@@ -17,24 +20,23 @@
+ 
+ EXTRA_DIST = $(pkginclude_HEADERS)
+ 
+-AM_CXXFLAGS = -fPIC -Wall -pedantic
++AM_CXXFLAGS = -Wall -pedantic
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
+ 
+ # Python Module
+ if HAVE_PYTHON
+-pyexec_LTLIBRARIES = track.la
++pkgpyexec_LTLIBRARIES = track.la
+ else
+-pyexec_LTLIBRARIES =
++pkgpyexec_LTLIBRARIES =
+ endif
+ 
+ track_la_SOURCES = bp-track.cc
+-track_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ track_la_LDFLAGS = -avoid-version -module
+ track_la_LIBADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
+-	$(top_srcdir)/track/libvamos-track.la \
+-	-l$(PYTHON_LIB) \
+-	-l$(BOOST_PYTHON_LIB)
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la \
++	libvamos-track.la \
++	$(PYTHON_LIBS)
+ 
+ # Unit Tests
+ if DO_UNIT_TESTS
+@@ -50,14 +52,14 @@
+ test_Road_Segment_SOURCES = test_Road_Segment.cc
+ test_Road_Segment_CXXFLAGS = -DBOOST_TEST_DYN_LINK
+ test_Road_Segment_LDADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
++	../geometry/libvamos-geometry.la \
+ 	Road_Segment.lo \
+ 	-lboost_unit_test_framework
+ test_Strip_Track_SOURCES = test_Strip_Track.cc
+ test_Strip_Track_CXXFLAGS = -DBOOST_TEST_DYN_LINK
+ test_Strip_Track_LDADD = \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la \
+ 	Road_Segment.lo \
+ 	Gl_Road_Segment.lo \
+ 	Strip_Track.lo \
+@@ -68,6 +70,6 @@
+ check-local: $(UNIT_TESTS)
+ 	for test in $(UNIT_TESTS); do \
+ 		echo $$test; \
+-		$(top_srcdir)/track/$$test; \
++		../track/$$test; \
+ 	done
+ endif
+--- a/vamos/Makefile.am
++++ b/vamos/Makefile.am
+@@ -9,12 +9,12 @@
+ EXTRA_DIST = Options.h
+ 
+ cvamos_LDADD = \
+-	$(top_srcdir)/world/libvamos-world.la \
+-	$(top_srcdir)/body/libvamos-body.la \
+-	$(top_srcdir)/track/libvamos-track.la \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
++	../world/libvamos-world.la \
++	../body/libvamos-body.la \
++	../track/libvamos-track.la \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la \
+ 	-lboost_system \
+ 	-lboost_filesystem
+ 
+-AM_CXXFLAGS = -fPIC -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\"
++AM_CXXFLAGS = -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\"
+--- a/world/Makefile.am
++++ b/world/Makefile.am
+@@ -10,6 +10,10 @@
+ 	Sounds.cc \
+ 	Timing_Info.cc \
+ 	World.cc
++libvamos_world_la_LIBADD = \
++	../geometry/libvamos-geometry.la \
++	../track/libvamos-track.la \
++	../body/libvamos-body.la
+ 
+ pkginclude_HEADERS = \
+ 	Atmosphere.h \
+@@ -26,26 +30,25 @@
+ 
+ EXTRA_DIST = $(pkginclude_HEADERS)
+ 
+-AM_CXXFLAGS = -fPIC -Wall -pedantic
++AM_CXXFLAGS = -Wall -pedantic
++AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
+ 
+ # Python Module
+ if HAVE_PYTHON
+-pyexec_LTLIBRARIES = world.la
++pkgpyexec_LTLIBRARIES = world.la
+ else
+-pyexec_LTLIBRARIES =
++pkgpyexec_LTLIBRARIES =
+ endif
+ 
+ world_la_SOURCES = bp-world.cc
+-world_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
+ world_la_LDFLAGS = -avoid-version -module
+ world_la_LIBADD = \
+-	$(top_srcdir)/body/libvamos-body.la \
+-	$(top_srcdir)/geometry/libvamos-geometry.la \
+-	$(top_srcdir)/media/libvamos-media.la \
+-	$(top_srcdir)/track/libvamos-track.la \
+-	$(top_srcdir)/world/libvamos-world.la \
+-	-l$(PYTHON_LIB) \
+-	-l$(BOOST_PYTHON_LIB)
++	../body/libvamos-body.la \
++	../geometry/libvamos-geometry.la \
++	../media/libvamos-media.la \
++	../track/libvamos-track.la \
++	libvamos-world.la \
++	$(PYTHON_LIBS)
+ 
+ # Unit Tests
+ if DO_UNIT_TESTS
+@@ -67,6 +70,6 @@
+ check-local: $(UNIT_TESTS)
+ 	for test in $(UNIT_TESTS); do \
+ 		echo $$test; \
+-		$(top_srcdir)/world/$$test; \
++		../world/$$test; \
+ 	done
+ endif
diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch b/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch
new file mode 100644
index 000000000000..95c90995f194
--- /dev/null
+++ b/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch
@@ -0,0 +1,25 @@
+Fix building in C++14 mode.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600774
+
+--- a/media/Ac3d.cc
++++ b/media/Ac3d.cc
+@@ -892,7 +892,7 @@
+ 	m_rotation (rotation)
+   {
+ 	std::ifstream is (m_file.c_str ());
+-	if (is == 0)
++	if (!is)
+ 	  {
+ 		throw No_File (m_file);
+ 	  }
+--- a/media/XML_Parser.cc
++++ b/media/XML_Parser.cc
+@@ -391,7 +391,7 @@
+ {
+   m_file = file;
+   mp_stream = new std::ifstream (file.c_str ());
+-  if ((mp_stream == 0) || (*mp_stream == 0))
++  if ((mp_stream == NULL) || (!(*mp_stream)))
+ 	{
+ 	  throw No_XML_File (m_file);
+ 	}
diff --git a/dev-games/vamos/metadata.xml b/dev-games/vamos/metadata.xml
new file mode 100644
index 000000000000..56d1bba2cf08
--- /dev/null
+++ b/dev-games/vamos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vamos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/vamos/vamos-0.7.1.ebuild b/dev-games/vamos/vamos-0.7.1.ebuild
new file mode 100644
index 000000000000..c057f2d8e74e
--- /dev/null
+++ b/dev-games/vamos/vamos-0.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="an automotive simulation framework"
+HOMEPAGE="http://vamos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/freeglut
+	media-libs/libpng:0
+	media-libs/libsdl[joystick,video]
+	media-libs/openal
+	dev-libs/boost
+	media-libs/freealut"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
+}
+
+src_configure() {
+	econf \
+		--disable-unit-tests \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dobin caelum/.libs/caelum
+	newdoc caelum/README README.caelum
+	dodoc AUTHORS ChangeLog README TODO
+	prune_libtool_files
+}
diff --git a/dev-games/vamos/vamos-0.8.2.ebuild b/dev-games/vamos/vamos-0.8.2.ebuild
new file mode 100644
index 000000000000..51a6149d8609
--- /dev/null
+++ b/dev-games/vamos/vamos-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# 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 python-single-r1
+
+DESCRIPTION="An automotive simulation framework"
+HOMEPAGE="http://vamos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	media-libs/freealut
+	media-libs/freeglut
+	media-libs/libpng:0=
+	media-libs/libsdl[joystick,video]
+	media-libs/openal
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2016.09.16
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.2-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-0.8.2-fix-c++14.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-x \
+		--disable-static \
+		--with-boost-python="${EPYTHON#python}" \
+		$(use_enable test unit-tests) \
+		PYTHON="${EPYTHON}"
+}
+
+src_install() {
+	MAKEOPTS="${MAKEOPTS} -j1" default #646014
+
+	dobin caelum/.libs/caelum
+	newdoc caelum/README README.caelum
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-games/wfmath-1.0.2 b/dev-games/wfmath-1.0.2
deleted file mode 100644
index e7c91b83b02b..000000000000
--- a/dev-games/wfmath-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig
-DESCRIPTION=Worldforge math library
-EAPI=5
-HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/wfmath
-IUSE=doc static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/worldforge/wfmath-1.0.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_=19d5aac55feff83f39178e7650d4268c
diff --git a/dev-games/wfmath/Manifest b/dev-games/wfmath/Manifest
new file mode 100644
index 000000000000..d1a2b75298a7
--- /dev/null
+++ b/dev-games/wfmath/Manifest
@@ -0,0 +1,3 @@
+DIST wfmath-1.0.2.tar.bz2 399987 BLAKE2B d299a6d90a37a90daa6a86e0ddad15201c1a5ee247159633ba68fcb6d0df1205bd60869e73d4849b923f3dd8142a167348bdac6764dda7a3b9857d9b9eae5701 SHA512 3506dbaed5db914b0be5483d5b589d95ed495b6375384e4b045844f8d76240f97b5c322ac432faf177f16da0fedd0b0e6006877a9b40e7f5d31d3324efa6de57
+EBUILD wfmath-1.0.2.ebuild 619 BLAKE2B 3624bdc9bd0cf236c26065946165edd45e58e1f725d3a5c75960a6f3327995625d7f6a76c7960af485c677fc317fca1b4ce2623d014b616627dd869be7b69cbe SHA512 e62f658eb953f0ceaae142780b5cac6500b00ba60b7778b21ceff9743b08b073f0fc4889b721d6bd99b576bab59eaaf3550e1f1a3c7098072a1697abde2dcdaa
+MISC metadata.xml 834 BLAKE2B b2d412774009fe2c79f1491f1a32b58d8666e7a1bfcfb75f3a9322618094a05d86104976693d386389718d8a07be41125e867ea9915714bfc182dc507f03179b SHA512 c99727d8b00129b35865cf778eb9d6c438e53189982b54a87a2463e3664d98572f24d4fe3b7d814c2d19bfe52bafc4df4be155d68f2cc177523ede9ac104deac
diff --git a/dev-games/wfmath/metadata.xml b/dev-games/wfmath/metadata.xml
new file mode 100644
index 000000000000..a41dc201202f
--- /dev/null
+++ b/dev-games/wfmath/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription lang="en">
+The primary focus of WFMath is geometric objects. Thus, it includes several
+shapes (boxes, balls, lines), in addition to the basic math objects that are
+used to build these shapes (points, vectors, matricies).
+Most of the library classes can be divided into two sorts. The first kind are
+basic mathematical objects, whose members are all fundamental types. The second
+kind are shapes, which implement the shape class interface described in
+doc/shape.h.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">worldforge</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/wfmath/wfmath-1.0.2.ebuild b/dev-games/wfmath/wfmath-1.0.2.ebuild
new file mode 100644
index 000000000000..096663843a6f
--- /dev/null
+++ b/dev-games/wfmath/wfmath-1.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Worldforge math library"
+HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/wfmath"
+SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc docs
+}
+
+src_install() {
+	default
+	use doc && dohtml doc/html/*
+	prune_libtool_files
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-games
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)