reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-games
192 files changed, 9162 insertions, 0 deletions
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..9f7142cb95de
--- /dev/null
+++ b/dev-games/KXL/Manifest
@@ -0,0 +1,9 @@
+AUX KXL-1.1.7-amd64.patch 3207 SHA256 8d46212b7702d819b6b82884ebd3136fae37415c16c4b82275672634c7c6e85e SHA512 756cd90aca9c6ac1c9ac2c9229b8ae2904315fe29e59b842d963b72b2004c088f5b526ac00b97ed61763001a5e79f0e435c043ae54f4022ea392367a8f0c8142 WHIRLPOOL 1afb57a52b4cc3d3c6b2b0710d1e94b0b047efd2216e81c61200b05d432c8608d8df289ee7c7998b63cd20b5552bd336045c0b0c95fe51d2ee500f0b53a2f9f0
+AUX KXL-1.1.7-as-needed.patch 308 SHA256 eceb52dbbff50278285982b9806189c4ba565b01703a633a126c228ad196f6d0 SHA512 8494ce4f631b82e798a0e4364252d35645544ed417bec11c5c7b6dcb179b5182187166f37562d6b40e393081112bb4d0787f8140464763b1482464c04fb9fd44 WHIRLPOOL e969bfc4069c45887c178644ce6a6c12777f3c8a5d2d79bcfd515747059c4638f886ed6d61c8656727de456efdbcd52c29037ae41c19224006ec685a9a948b03
+AUX KXL-1.1.7-ldflags.patch 234 SHA256 1d1994d258c607b8ff7d4282244f19bc4e7d7533c9d90799a7ea9ab57eada89d SHA512 b051fff9db4b353ad29479b3a08d2aadb49230800589337f13f34e4490330d1b683a42c2bdbac02dcbe0016e9755939e5f4a538167284011ad97502977d397a3 WHIRLPOOL 3c56c62459e98298b44a493363092aad2ea15f95d5d9c04c1b9078306668dc998b65072d1c025924296dd9380ca2445ea4bd3022cf49ba9bcaf05155f582c27e
+AUX KXL-1.1.7-m4.patch 221 SHA256 5a43a85856deb82cd1a890905e37cbe4c8315069d6b8fac96a5f95688dc47ede SHA512 b9a0b71474c43cec838ab6fdadd183a80d409d935bc7b65a61cf87d2b777ef5b51cf86469aa8a0040d15a64b1a008ebd3eb9b1d0dc9e4e86160bda92612f2b6a WHIRLPOOL ddc77e7e9c3309d4018be337dcd6fbe30c8355ad751b851e925c939833aabea2436c5edb0f5b73825528fb4a9b3ab6bf36517bd2b679825a2f7afa1cb1d6baa6
+DIST KXL-1.1.7.tar.gz 192070 SHA256 118b704befa24992031b51c9da1bc3786da153cfb21a0452bae97b1d479bdd98 SHA512 f3a9051b0e8916745725a2809097df07c59f8811f336574def7e479c992175d0bd49661817f9da35d122d291aff0bde5d4c27e5b17a3f09878e71b2c7a709adb WHIRLPOOL 1aa271911adee47bc9d954f409c5bb0b93bdb51ead0313ee9461889b6591823cd93a4ec8dbd08329498c731840d472ed2cb7048dfa936fa1a0f311f927c833a5
+EBUILD KXL-1.1.7-r2.ebuild 677 SHA256 3a50c383a1200785b5b6ca113a85dd313c7efeacc336baacb000dd398bfc1bd6 SHA512 83084dcf781122e7555195bb0b900c84f5121786214aeb701a1dce493746143813e0ca92a02a8f463b5278f0213fa2ca12830a70774af2568bfe79e27127719e WHIRLPOOL 0c8a8bfe82cf53b922c78459d9449edb71cce14ad3a612278f84bcafe9f6be63bafb4a7f4d389926e184afe591e3561bbcd405fc313f8f0ac777ae328441aa5a
+MISC ChangeLog 2547 SHA256 41434efc1beff7095888f8e8e859feffaa6da240b6b68b87f89f2c04a12c4d24 SHA512 175f81ea3b77cb46df43ef3368c8c81a2ced7526f2b7b969213c87c15af8f8261a18f481f2073644c64c67a719a110098b62fd8fdaf8a2128ad3ef0046cd437b WHIRLPOOL c7716e355bf51aba0d6e8960538c26b717ca978c4e5d8515f8b402c3b646a02a0df0ced58053a66617695e04675a7569c8a3685a47c36ec22fb8fbe0d5dc0b14
+MISC ChangeLog-2015 2429 SHA256 86d2fc152fcbdb3730a7884b477ea5a04e50328411cd7cbadf0c48d43cb42e65 SHA512 dafeada0c6082a0e09e3f91f32ce94f71c35c6a89de491ab37f7aeb15817ee86016870ab022828f9aa7fc56954dc5e990840c73dc18fcc75dea9f958af8c4c3e WHIRLPOOL 2a6a8f0d6ff7a3ad77bdd0918b09285fcc29d2982f4e67d920357a92c01a4f2e9db12967eb25763c58ba2ba55b0fc16f633d671efffff39f6f58343d76e69d45
+MISC metadata.xml 677 SHA256 fd06e26f780dc4003e0765af2f60a5f5474195666f35e5990240649a364b3bd4 SHA512 c0bdd55e9cce88c16b4ac1cc71f30fd89e9341956d87de5e70eae786d9a71b675af94052149ee77e0b18b385a6f96dfa999f821c0177788e94de01f626a5a36f WHIRLPOOL 363c5511b166e1b92efcf7612d7460e461424dcace951653c6d63cac5b1ed6ea3254bea9b8163a4d9fbfb53101feb0ceae25ddfefba674db786852dfbcbe86ed
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/aseprite/Manifest b/dev-games/aseprite/Manifest
new file mode 100644
index 000000000000..d9d8cfe5ac05
--- /dev/null
+++ b/dev-games/aseprite/Manifest
@@ -0,0 +1,8 @@
+AUX aseprite-1.1.7_type-punned_pointer.patch 836 SHA256 b5cc09692578f9b5eca53efedf2a75832d5c076b687d4be71c1f9464f2a65647 SHA512 c01ca8dc6bcee6276f3f4c7f7f141d8528372f0cbbb33c036b89ba64e639966d9b9955a78ec917ef7ebeda2148abc817bc4df7c1fe02818734f51cd7452df9ca WHIRLPOOL 0ccf2f2a3d04b2fc8a558da3e60775c173d2fed04dfd717791d2fdb0755e7de0fd2b261a6b070cc6c5063e8ae598a27e0c9023c11622a519df565f02dc6fd0c9
+DIST Aseprite-v1.1.6-Source.zip 11801981 SHA256 259c6418d5bc48a04f63a27f4a8c5a0aa44ce759403ba976ebbfad293eab08e8 SHA512 d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac WHIRLPOOL 8f9168551be29d8c453fc1db27930a87e8228081b837c8c1a608045acdb7968715a8eb3994e04df83288f1fb12c5744f2bbb6c0733e578dd20bc4c4a2a234801
+DIST Aseprite-v1.1.7-Source.zip 11801711 SHA256 7b5b42d301fc37d3b62a50432a0fbff1483857b8f1829bb6fdac3b1a22d19ade SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6 WHIRLPOOL 09097fe4784395370c7d8e1af7ee921943e0798c8e0853fdc6491f2daa0e80e1cf6e637041972a05abcfe687581ab1d2d72f99696def6ddbd69e2b8c1220db5e
+EBUILD aseprite-1.1.6.ebuild 2137 SHA256 81b10c75a468fbc6e36a40a8f21949f89fb835910d349d4fdee96ed36e3c7859 SHA512 41724723ae7a318ceff10178795709cfc2c9b8bc87836c02404f5af3ff03a5cdbc204ace11ca81f3699b649bdfda7471b4692eb6f1f3a6bf324965fd075a696f WHIRLPOOL 63a1b99f7100f998c20806f426093d282487288566dbdfcfdcad47abab2f5f3cd22d15b2750d10a582f3c7f067fe23768a7ffe2c7a77b6c8d54191e6623fc674
+EBUILD aseprite-1.1.7.ebuild 2525 SHA256 3b9386a6f68c62024878e70218d5136d836b9aafcb3703fc3076e9c605a0ceef SHA512 d1fd7b3edcb428398aaeb794442aad5da944ddc03cc0a31ea5fc74bbe2fb9acce5f58b628b9789cbeb9fed54682336a5e4805d907d99e7ae9658b593d13442c9 WHIRLPOOL 58370b929d2e92648ebdb46589c7cf77634a069e2be1a1953b64cea0d498fccea03c8a1359cd5af0e034cc39b94e824a9ad68d126ced86a86749923a08595976
+MISC ChangeLog 7473 SHA256 8a348e269638e9cfad3bbc73a5b437e49024b60f63ef9323d4e7e9231365d41d SHA512 2123cb25595151d3b276de9138193ef0c61e8b45d904e36a8b0bcbf4c9c01e5e572b0dc02c962cfdb092a2a0436e755ffdab47f333c257910323787523ab09b5 WHIRLPOOL 65e2c5a12d69d95d21a6ce58cf3e78cc322400f7d30cfccbf2cc1d835c7c184ba4416a79f636d27aae094fe65a11a4e6a0e2fe83941bffed53d41ff21d2ba8b7
+MISC ChangeLog-2015 2153 SHA256 584b9accdef10dcd89025aa62391866b9df0b9157312f572ac2c9c14c0411ea3 SHA512 9da3a31f2c3f213f9a76c236fd44606c416cf73ac5906250c754c1dd511ab287e0adc6cbfe1f428a577bb13c5a3bf9224c1c260e29782d7c8e880b5b472bbb56 WHIRLPOOL 1a4e2410a57a658b6fbb3406c3b49bc233ae314e48b4204488c0de4205a9986e2a3025996eebd7df25a655eb731a127c0fc7c0432a5576a2ff44dfe3c1bfa7eb
+MISC metadata.xml 818 SHA256 4218468886c828ada32a4552ae0435fad6d793442a27509aeb2ec89d4f4fd06b SHA512 c15ae47493114fdb9a9daf61b9ad938caf5f753ce5f5a9262a462a900ec2972120c693d39b316a7e85fbebf1bcf31e9f5a4346c0a839fe21bbba7345e2ed0b5b WHIRLPOOL f83283275e57d011b8908121168d2d8d5e0f25cce717a7a98f94f43686ad4ec255ec47f52d30b840b1ad3a212ad94636bd6489f9e3ef5eba2a923fedf5ca1558
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..809c2d3b68a0
--- /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/Manifest b/dev-games/cardpics/Manifest
new file mode 100644
index 000000000000..fdd058ed2815
--- /dev/null
+++ b/dev-games/cardpics/Manifest
@@ -0,0 +1,5 @@
+DIST cardpics-0.4.tar.bz2 151425 SHA256 a6ece72ce0a2f97910b470248b2dd369a1004033315398fa52ca11754294f8a5 SHA512 7451112f5b7954326e381563a3730c677b261481de79ede3def451591ce081e651a86a4c24ff3259ab979ac109446588bb1cacd0beed6892a5a288f190bf6382 WHIRLPOOL 3aa22a01c7b550d60d6762bd9e849eff4e1d8ebdb3b4bb7d49b866f261752bc32f4086483da9ab8f7d87b9fc0601ca3f895cb279d4fdf7801b330241bb392029
+EBUILD cardpics-0.4.ebuild 384 SHA256 49eab7e6f5fa688cc8edc118a4abebad9ba5d608a813f0dc5ad7a6461c063bf6 SHA512 7b9ad606eba08dea69d59c233bedad164a0dc3971ce818a4faae4c0a277ce82f6e0a4a3117cd6de720f3c94907ad4a71eb8b09a8629ca5379ecd5ddaeb0e9726 WHIRLPOOL ab65478ae98c05d1633a73ee1ffae42d51240d9c5a77962bf74627062ac97aaaa6218151632c9dab272b0a75e36361d338a187859e72c75bc9a4a344e3682d80
+MISC ChangeLog 2427 SHA256 99adaf3cc060bed46c90a813bbcf3bd14240b8c9e81605000f1e0fe0c047a8b6 SHA512 d67759240cd93acf0773c0e910cace61b3d239a54b67672d02ce710f3802e57e31f7b4a43c81abe315113410889066bcdbe6d8f4463705ce92ddbd53b76fbd22 WHIRLPOOL c4accf6ed1d6338c90ebec4c8d4679c8dc02245ab4cf77c9cf1068158f41d9b8e59748d53ed38b5ef001105b8b84e73afbbcdd9e7e054553a457f913808894d8
+MISC ChangeLog-2015 807 SHA256 4f4053caf0e70c6c4667a4f27599456898aea1a1d1c125818ff7e152872cea75 SHA512 a9852bf2588dbecb36abf59d2b84725d17f4c7bc983dc3b50817ece8c1d33594ae75ce28a99643ccee20d06e151e84be70be740e0adcd6f3be907151507429a2 WHIRLPOOL 4bce55cc15e4db058aa32a5379f3b51fce153237ea6dac2a975a19dc33d38cb94eacbfdbdb7d99f6d854c29dddbaffdc045012e094872e00702cc10f70e8aa06
+MISC metadata.xml 507 SHA256 92e9f935878a85bf3fd0a999eae6fea550a1c7d1897033b87789d2ac63faa5f9 SHA512 d460c3bb0906231f2dc1bcd65287aea962a9d88aa676ec87e313fa8057334976330b295cc9495cbd346af0b2f78c41454c9ef611be7aa815421ed037677644fc WHIRLPOOL 0d77fd6bd6e7b9e4112476300ceafba1421186ba02df30540bf4c8e7f6342e04b3c158e6954df54bc24c43cf693da5c78ad32ed0cf3a944fd784d0bba3c2e376
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/Manifest b/dev-games/cegui/Manifest
new file mode 100644
index 000000000000..2ee50146284b
--- /dev/null
+++ b/dev-games/cegui/Manifest
@@ -0,0 +1,11 @@
+AUX cegui-0.6.2b-dups.patch 660 SHA256 d3d9a5af79f49df8c5bff41c3d61034640c9e774e4a01bb28a0891684c95eaf0 SHA512 4f73e930c0476a895687845789ccd59f53986242c61662b87d5b165df43f763dafc97c79f5b590fa5f1cc459c571d4f77843fec893efde1237d4f2e50a2a239b WHIRLPOOL a1c2cf35012f2df8b57ecb448405b50f22642604bf3e79d24e2e2b7e9faf13fc3c811475e5c5e2e039909fc1330f8832a8ce3717d4f700a7fff7380c4ceef237
+AUX cegui-0.6.2b-gcc43.patch 241 SHA256 b2a2e715d4a0a6cdb2f0975c9474ce82edd97a34cdb3fe4d5c3ddbde0440db66 SHA512 1f0eed0154d9b4383b3e8e60ba75de6a873ff5aafe320a1cf85efb775997d53416febdd3e15b2626f533fc1d25569f615e32d1b243e539db92ee4e466e4c6ff3 WHIRLPOOL 42f7ae8134f2fe150ab348da0deac887f185f78fa2872f2317a1d243e6a3fbd423f5018b4ca0d27085cf34866ce87c9e1a896493da9836256f2b0bc282591332
+AUX cegui-0.6.2b-gcc46.patch 296 SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11 SHA512 64d0620dca217c3175813e037775c7202a4efcfa15e7190cbef93bdb52380e2ca6cf8e475664c659ac0b44feaa2b3ccade14aafccb870d6a5a51009a518e8b41 WHIRLPOOL f4431f4759dee86112c71cf21b5c161f47855c187735e9ba7943d953a1711ba2ffca3cf78acb32242a7d07e65fc69bd25a04d13cfb9252fcffeb5235c1d7b26d
+DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 SHA256 f1ea46bd583c486a6c588118573ebde55b06e90b190083e95525820e950ce2c8 SHA512 56ded923f21f18d837d71425e06fe8675a2efa979edde461a9e4e558c213cbb79ff8eeb576211da6ade56526ccdd9644a7a45b3619058615388e3882f96b9fb4 WHIRLPOOL f67c9dba4558c43ec9d14c160f228e974de4364bfe36ebfa9f3fe6bfc290fd5c4f024e954525845cd83645a06d53e6d63776137cbe58c459bcdd0e350d12e9c7
+DIST CEGUI-0.6.2b.tar.gz 2628081 SHA256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f SHA512 52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20 WHIRLPOOL 3fde683a82fb0be33565adb28fbcb4b7001be99f1b3bdb2d3af9abecc5dc7681d633f141cc19f9eb1dc264d0fb0b2084ea604202a22a3e2cc415bdb6b9686161
+DIST cegui-0.8.7.tar.bz2 18114465 SHA256 b351e8957716d9c170612c13559e49530ef911ae4bac2feeb2dacd70b430e518 SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56 WHIRLPOOL 55b7dda2ccbb344b504d81681e900979bc31c261875741d2ff483bf3822eea3d484ac6d99526c9e6d718d0376f8a4bd3cd08d7dd38e030880b1d275bb325959b
+EBUILD cegui-0.6.2b.ebuild 2241 SHA256 1f19bacae216a01698777f5aa141fa1c3305e8bb79f726cc9bae0ef8b4d3521f SHA512 b0b9cfafada47cebb000723c6e1d03696157972ee4b0ead98be72e440da643462d88e408209d7ca310c3ef4a84c101bf781667febe0a06ba607f377a6f61f79d WHIRLPOOL cc7ac9c15b2786a4f047f06409bf31dcb79a3954974a0c5e4b8ec2111156f131b1658219c3a28a5825db254c5ebcc942246501b5ee6db049b72e5d04a935b7b4
+EBUILD cegui-0.8.7.ebuild 3177 SHA256 cf5161879f6092fe9f11469a0ee40b0e001a8540b00ebf36ecf3698197fc2b56 SHA512 32b9e5496adfa3b20ebb69e794b98caed0fef3e73aed9b182b8aa2d2ae01e0ddad3d18dc1c9f28abf4f3e02fdde3f40b53c8ee17dff7ee963a98b7184e8963a7 WHIRLPOOL 00b39965825077d64a5e0cfd885d997dc2bec6604232ebacbfb660d0e4ab5329b0e18c34c177f31e5043600a98337f597fc2691c5de4b0668157b8380599bf3f
+MISC ChangeLog 3935 SHA256 b966a960010f42c5897718cbbd54d6b737ca5620b3f03c54b4c2a8a398a6ef3b SHA512 077c35dec05a8c2251538e3bc596a73db85cfa46e61318011e092fd02d0fcfa8d60b7efeb49bc7b814d2b4250ab5578e1acec31c3333bdcb35e9aa3c539b6959 WHIRLPOOL 793e5f6f2e722ddc7836ec3612349a105f78115b71a980a16644050be1ed23571a70cab2cadba8b965446659c823d8f05ed5c137c4d9c83ebf936c785fb18fc5
+MISC ChangeLog-2015 9325 SHA256 c6c132e0b1691ad95c118a02641053d2361b8c949dc07c02f7a608812b04be2b SHA512 197a6e6b90cb8caf7e4dc503558c7709a4f135b98d91020b97675c22041bd75b0667b34f8101d2d38b70a2862fcfc4ecd53a26d70030f792cd011110976cd9cb WHIRLPOOL ab4e5a07eb18e8bf738a4932e4a2dbc7b035d4eac51a94ccdd077865a4347c580b242160a810de53093626dc6fab34701ab706671ef7b397632a96bdf95715b6
+MISC metadata.xml 803 SHA256 11713de9e926385459ad5f1c6f8cd978aee500a257677fef3b64faa2c9e52713 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996 WHIRLPOOL f7fb133dae4a5a1f1290e60bf1f8c16d10bd6570beb624e161f93ab7ac0bfd02c8fdda2f04f1cbb83612c558b12b7ad404cdb952f4496a492cb8063e9769ae60
diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild
new file mode 100644
index 000000000000..0913935294eb
--- /dev/null
+++ b/dev-games/cegui/cegui-0.6.2b.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=CEGUI-${PV%b}
+DESCRIPTION="Crazy Eddie's GUI System"
+HOMEPAGE="http://www.cegui.org.uk/"
+SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}b.tar.gz
+	doc? ( mirror://sourceforge/crayzedsgui/${MY_P}-DOCS.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug devil directfb doc examples expat irrlicht lua opengl xerces-c xml"
+
+RDEPEND="dev-libs/libpcre
+	media-libs/freetype:2
+	devil? ( media-libs/devil )
+	directfb? ( dev-libs/DirectFB )
+	expat? ( dev-libs/expat )
+	irrlicht? ( dev-games/irrlicht )
+	lua? (
+		dev-lang/lua:0
+		dev-lua/toluapp
+	)
+	opengl? (
+		virtual/opengl
+		media-libs/freeglut
+		media-libs/glew:=
+	)
+	xerces-c? ( dev-libs/xerces-c )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-dups.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
+	sed -i \
+		-e 's/ILvoid/void/g' \
+		ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp || die
+	if use examples ; then
+		cp -r Samples Samples.clean || die
+		rm -f $(find Samples.clean -name 'Makefile*') || die
+		rm -rf Samples.clean/bin || die
+	fi
+	eautoreconf #220040
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable devil) \
+		$(use_enable directfb directfb-renderer) \
+		$(use_enable examples samples) \
+		$(use_enable expat) \
+		$(use_enable irrlicht irrlicht-renderer) \
+		$(use_enable lua external-toluapp) \
+		$(use_enable lua lua-module) \
+		$(use_enable lua toluacegui) \
+		$(use_enable opengl external-glew) \
+		$(use_enable opengl opengl-renderer) \
+		$(use_enable xerces-c) \
+		$(use_enable xml libxml) \
+		--enable-static \
+		--enable-tga \
+		--enable-tinyxml \
+		--disable-corona \
+		--disable-dependency-tracking \
+		--disable-external-tinyxml \
+		--disable-freeimage \
+		--disable-samples \
+		--disable-silly \
+		--without-gtk2 \
+		--without-ogre-renderer
+}
+
+src_install() {
+	default
+	if use doc ; then
+		dohtml -r documentation/api_reference
+		dodoc documentation/*.pdf
+	fi
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/Samples
+		doins -r Samples.clean/*
+	fi
+}
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..95a092f74924
--- /dev/null
+++ b/dev-games/cegui/cegui-0.8.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 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 )"
+
+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.6.2b-dups.patch b/dev-games/cegui/files/cegui-0.6.2b-dups.patch
new file mode 100644
index 000000000000..a4d80c4347dc
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.6.2b-dups.patch
@@ -0,0 +1,12 @@
+diff -Naur _orig_CEGUI-0.6.2/include/elements/Makefile.am CEGUI-0.6.2/include/elements/Makefile.am
+--- _orig_CEGUI-0.6.2/include/elements/Makefile.am	2008-01-02 15:26:05.000000000 +0100
++++ CEGUI-0.6.2/include/elements/Makefile.am	2010-07-11 13:12:16.786338068 +0200
+@@ -21,8 +21,6 @@
+                      CEGUIItemListBaseProperties.h \
+                      CEGUIItemListbox.h \
+                      CEGUIItemListboxProperties.h \
+-                     CEGUIListHeader.h \
+-                     CEGUIListHeaderProperties.h \
+                      CEGUIListbox.h \
+                      CEGUIListboxItem.h \
+                      CEGUIListboxProperties.h \
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch
new file mode 100644
index 000000000000..09695626ceff
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch
@@ -0,0 +1,10 @@
+--- RendererModules/directfbRenderer/directfb-renderer.h
++++ RendererModules/directfbRenderer/directfb-renderer.h
+@@ -28,6 +28,7 @@
+ #include "CEGUIBase.h"
+ #include <directfb.h>
+ 
++#include <algorithm>
+ #include <vector>
+ #include <list>
+ 
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
new file mode 100644
index 000000000000..88f8fccfc206
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
@@ -0,0 +1,10 @@
+--- cegui/include/CEGUIString.h.old	2011-04-27 14:33:25.862856070 +0200
++++ cegui/include/CEGUIString.h	2011-04-27 14:33:49.780351908 +0200
+@@ -34,6 +34,7 @@
+ #include <string>
+ #include <string.h>
+ #include <stdexcept>
++#include <cstddef>
+ 
+ // Start of CEGUI namespace section
+ namespace CEGUI
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/Manifest b/dev-games/clanlib/Manifest
new file mode 100644
index 000000000000..a730e7e6fe29
--- /dev/null
+++ b/dev-games/clanlib/Manifest
@@ -0,0 +1,17 @@
+AUX clanlib-0.8.1-gcc43.patch 605 SHA256 97420cdbef4a3f09b61ddf54881a907616b8c73337928fcdc6e11d783f584320 SHA512 c1269c01852fd2912e895af82f2b109e7d81120a18dc3a7e2542a7bdc80e1da151c5e8a82914eb1fece2e51db17b7f1b99198dde6a36fa437dad3e9b4d6a8b83 WHIRLPOOL 8ac30a9eb0fff42711af134ca4f1f6559c902c76cbdc4584723b40bf48da47df40531205556cddc95bcb6efe022311e890c1a15474ee19c371f15a8faea39bff
+AUX clanlib-0.8.1-gcc44.patch 1523 SHA256 e6b8dc302fc3587fae86d1ecf4ac5fbaf2a0563996887b38ea3f55d84b79e979 SHA512 7c3b154affede758a0ac93f5c142144e8a26c65b7c50a443b49633e0c2835fdfab90c6363d4b1997bfb53b0112bc16ca12abc44aacf7af927329e102fc1424b7 WHIRLPOOL 9551cfd00c00711127a51f1680b148b0b93ccd3bfa22d60150a73e1d45d7e7df949c3571f932bbd695e229bccf4a5fc2463d9e5bb4d152838db52553a1b9b26a
+AUX clanlib-0.8.1-gcc47.patch 338 SHA256 fd5a02a670575f6298516d201bdaecabacb13ea01015e8d6abca1ee1fa41b06f SHA512 08f9719c97e0bf5fab83e56a881ac7a3edd162b052b5e8fea5878badedbf266b36788f77afd93032f4129ea8e50a83046f5672675e6616cdb29cb6fc5b6c635a WHIRLPOOL 6231a9b6270ac4da92c1a7d8645bb0dc492454eba89f51b559d103e37a3ce56bd1905726515fea18cff1bce8e1b50b2d8cf69db3a516dbda99174e471b67b2cd
+AUX clanlib-0.8.1-libpng15.patch 377 SHA256 6e6a878d16292255cff4f64605db6478ac855f079505434ca9a2f61aadb88342 SHA512 735fd6cadbd1c76ff38a229361c82c1208ea8ba8db60bd8bff082424244da9e88f1c74d8067991516866887d6240846c551a24a7f392a12ae3a2d6ce50e8644f WHIRLPOOL e35e13c89f90583fd4878b149fd9d6e8ad50131e11f94672171779f397fc020c58e5465a61774dedf467b02916acf113a5af28fddb502ae7f5f815df45474fa4
+AUX clanlib-0.8.1-ndebug.patch 866 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419 WHIRLPOOL 05e452b4d264619eaa8e30e5449389974a6d75e8d064931ad40e308a94203e0858813234be8a1e44b3c6279c25a95d3f6592a4f6b753e3255329d858a2a4e0df
+AUX clanlib-2.3.7-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
+AUX clanlib-2.3.7-doc.patch 506 SHA256 072d83c56768f06af13ff23a3b8eeeee25cd0f05bed3044f049dc0f5fcf5a525 SHA512 df75223e466799bde70b07e8ea6f3724792dcd5fe96e417dad47b27d44a3d87b6b7157035f388a48ecce9985473a9e1d84a24de1c8f58247eb952fce457ceccb WHIRLPOOL 6632f9d2568174ad03865e87afe88d25a7b4f57f1e8eba363da69579f1e974a463a92959ecbd1ed40aeb4af549b8d66cb48e16125314d85e4f36c0608f6634f4
+AUX clanlib-4.0.0-fix-build-system.patch 622 SHA256 cb81f0954ced1d4f320435724f0b236b5173607c8c253d3fce78add16039d702 SHA512 bda813264f552eff8cc7cea45ec4ea29517a8590066c4b435942e97ea7d68e8d2f21bebf83141b04f1fcc84e936bb3a7ad354b644184dd56b746ab3bfeff9e19 WHIRLPOOL ea273b5d57aa93e85aaa948fc41dff280793c568667f0a2390f7b5a391d245422c9a6d1923aaa67ec11d3bd99635b094c51e1a3bcd5f0b5140216fce5c746388
+DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
+DIST ClanLib-2.3.7.tgz 26132425 SHA256 d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2 SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a WHIRLPOOL a6547d0bc8d254e887c427dfff63deb2b69790124da3db49d54cf853f8c834d44172a06e92ef7fc5222c8c81f903ab29f186f85da698dc085f4138d147ddad68
+DIST clanlib-4.0.0.tar.gz 7435551 SHA256 9b35052308a2b933bba76596930ab550fc8cd1f80155fc62aa648a23c3f4406f SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe WHIRLPOOL b541c0dca233570f5c203269684de2a187391f35278722e81ca64b5f9fc3d61cb2f3cb615db6d4d7956369c04fbb9aea165a0ee5df0210b5bd50ab669d4fd691
+EBUILD clanlib-0.8.1.ebuild 2045 SHA256 ada284bfc014683723b20c8be67f4b8c636b7d5fa1e265b53a118c2889b0c14b SHA512 6080681892d8a0e5dad2d8a8e075e83efb9ce65583cb0d711c6fe38828613ed6d6fc754ac5786737946963c456f4e2a554265ebc313a3c54b21e41a3fa9f2350 WHIRLPOOL 5b76357490f2eb34883e49d4429625dec7aabd6927b33e7405cc783f861ab1951d1a0ac058b7c61a9eb5133fd77f20d27c2eae3353919bfbc51d0aaacc3191ce
+EBUILD clanlib-2.3.7.ebuild 2150 SHA256 5d25b701681f474fe338ab61c12601e792c2672dda867db83b0f9ca98cc8be06 SHA512 845fea2f039d35a937f75b88deb866c7db55903254b664ae0fa86520f5d0a7ba111466284f6be99ef6422403b1cdfd45ba6f7ba0ff97d26309ab65ba80eeef57 WHIRLPOOL 495c69a0fbb5c7ccc427621609e8d056d968712642bfb176914759760a7f79203372db6c6d141338bc81b99c767264818e3269e50337eb01c9cbd21a6a7758ed
+EBUILD clanlib-4.0.0.ebuild 1476 SHA256 bce1aaa77aa718a04c3c84442e34b7db8b17806928831cd5594f9e2e42a06f7a SHA512 ea1285fabb1db6cbf41f3f92e948b9627d832e53c7ef3de7dae23c42a790d85b0f06f1860da98b9e7367809148fead5c5a70928ea007451cbcb46ddb461aca12 WHIRLPOOL 6db03aa0e805615169fb4883c4f6f84bde7b955a07eea2d45ae226b5c331b9d1026f1f8ca40640e6e738bc28cfa368e74a5edb198a83139096f03b6d585a8d79
+MISC ChangeLog 3462 SHA256 7f8c3a60ef606da2ff52ae6fb26f65453000880ae7fff2bb80f0d268837b6176 SHA512 da85daa7455b4a25ce5fb470d772bae2276375cb4466ef5e6c3a143dc13e043c24b9904097fd1768fdff680ebdb38993ea0729d2cb0938c8c7f1698fef72c142 WHIRLPOOL 446ed0a8066a39b0faec14072dedebc9b0e032acb512a121e61276c34134ef3ce82076f14e60e5e00595ce145fa144800d301b3cff571d9562110f50f1a00ea4
+MISC ChangeLog-2015 12725 SHA256 5b503f8449045bea5e0a57ddf905430858fa25d130d97ad2f788d98893825f75 SHA512 f9eccb4523ecf97dab909e5df8aa970bf169bb28eb01ae11e9d3c11420721055d18aeb02b7eee4cb17690d1c186d9d710aa0b7c434e5f731356180fd6a2e1a9d WHIRLPOOL a7ad03f57ae19bde1552bd778d48ef279acff8a13b1ec133c4011f7709299f10473b090a371b9f1156bc212615874ec50fbfda8385f2f704f64d738c2ef73e0d
+MISC metadata.xml 3096 SHA256 1302308e4d4980d3de97cb74f0ea55a9be03d1a9eb11d62c115728a885ef7976 SHA512 7973a8121a9ae268d6572c9ae980f2b81650e159cfcbee7895097d906637159e4e3470fb7dadb1f58c4928d377860c73978b38c8bb03c44f8dc73d715d9139bd WHIRLPOOL 22a7788ad33bda246b8a5bdfd43e92f39d0276d8ae8a003e89b95b99e1701ff9bb9e505012c3e9ee4d3c8e65b4c4279983bc2420548ab4176cef02f1bcee925c
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..0e13a37d97d2
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 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-proto/xf86vidmodeproto"
+
+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}-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..310134a70f44
--- /dev/null
+++ b/dev-games/clanlib/clanlib-4.0.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 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
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(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)
+}
+
+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 "${D}" -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-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/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/crystalspace/Manifest b/dev-games/crystalspace/Manifest
new file mode 100644
index 000000000000..4b1d0b784c06
--- /dev/null
+++ b/dev-games/crystalspace/Manifest
@@ -0,0 +1,9 @@
+AUX crystalspace-2.0-gcc47.patch 3489 SHA256 fea558bf8c13cd54339ceb3d870c453989fcb5ea536fbbd9c385b2361bc7a261 SHA512 1a28f708afc7d82747222aac2a835e0de0b9b6895b9f3121498cbed5806afae77c4ed13ffce044092da621481f756a0051091eab2e9f6352f625280142377562 WHIRLPOOL 8202cc23b7ab4d72379a5629d72d28a40df39d23aedbde9a01ad00ee9c73d3cfd948a5181556234980f8ed2a086bdbb72770dcd3e5a1894dbc64ab748d01e126
+AUX crystalspace-2.0-gcc52.patch 1622 SHA256 ad03d8e4842961135c0bb242341d5856cff408ccb15c107780a83b273f59465b SHA512 ed27985a9bd0d5022b9d545ecd74a07021e5ee939c4db3fc4c412055990907bf093fd7de6e2eadd7fc4dd41eafe202a2c4727d8c998b153717c8fbf862224f90 WHIRLPOOL 421dfc88ff2edf052027a912fdaabd424f89c993bbe23e6727cb3827b5315a9c204ea1f928e5743c85d7a20063a52f1554cc59dba93eeeb7f37cc33e17a62739
+AUX crystalspace-2.0-gcc6.patch 9490 SHA256 0abb7975c1812f104858e137a6e6740709dd497acf8f3b54c5749ea724110ddc SHA512 7033d7c9f1e6dfb33cb1834556e572a7e217ecd699bd82ad8bc1640c7c76dd10c0aff1a5c12276ccb2e6b2dffeba67660c0eb7afbd76b87a1aaf3720b3662635 WHIRLPOOL 243ac03bba39202291aa5c00ca85f3302a4ffab08bd2ca16bdd2ae12f78d56580f56bef75e4538cdac989c37b2e7f5156d1653735bfa936db2aa46d938694d85
+AUX crystalspace-2.0-wxgtk.patch 2139 SHA256 0e53fd8abc93576d9e6fb88db79627d30f60f4d62cba47d45625ea04704818e3 SHA512 5dab8c0243262f6c129b76e6ccdc2d388ddb1a9a0fec0ce7824049cf7c5a88caa0405988537e5df33c7e3630d0995215e7295e5fc7c428c387d84a5804c9a4a2 WHIRLPOOL ad332ec91b3ba411c0117de076e7146a9933e61e235d437af8088d333aca590175424675b92cc921977b2c728c339495a59473e38da1afc059ccfff5d7e4c285
+DIST crystalspace-src-2.0.tar.bz2 185925180 SHA256 f1cda74fd998e44088746803209b1ea6625e80e3d4fb72023d8bed6b677b7b6a SHA512 f09d40669268e26542a2854560ac5033e7f89d0bd5def870e5062e08611c36a0875666abe0c705bb5f9f37dafa619f33f900e358d5fe255746a86127a3899f97 WHIRLPOOL a1705cb88b64eb0e8f6a146c2a75baab01aa598d07b8d36ab0671a47d4092b5c9b53c13f46bb1e56663b2b228c4b95cee3a355554c1de92c3d931187e97c4ca1
+EBUILD crystalspace-2.0-r1.ebuild 3398 SHA256 414593d3da4e25b5780ccda4ce61a35811cd52eec34aaed5d1e96e85df377cbe SHA512 fcafffba9377ce1b1cb1d7283cd55bb9985ce46b23f2b955506cdf3675e50a82bdea00e2bd2429de748811c140a83ed508b4c5eacc2a2d132f56cd98156356e1 WHIRLPOOL 0055454032f63044193dcdf8245ed25b3f6b952382c529a47dad022a0be179558c7c0a5e085889438b242da2289343197da0e148d1eaeb011d2fac0052421f10
+MISC ChangeLog 3644 SHA256 ccd774f25556c61405af8040a0cbc100692c0bc9aa23cb2f4a5953e284726a6d SHA512 d1d561cb1f05b5e4d1b9d5f68ca3d3c69eef9075ba57b643c387f0f7ca8416212821fa0b2dcfc059742dac7e76f2eb04231b8f35cf90a5f1be0d39d396a6734a WHIRLPOOL 38cbdd38cfefefef9abecc69fe4f2cc609bbd162b137c14fe58614da51f7ab6249b11d4d7a85ab4e53d6593e228d2debea657e04d9d382a650df0d010124602f
+MISC ChangeLog-2015 9861 SHA256 21653c75fb452f1a3b4deec81f7471d8f341a15793b379ed9fdf3322319b3de9 SHA512 7035aeb40f180dc04550b3e20bf86c90c386cc0e8784e04ccd95b3704b5fd060ed466051fdd6e4e89475aa31f8a4a8036d1a8c42ebeb718b981c1770ffe3a832 WHIRLPOOL 302fef2757acb334a7073a824383231592c033da19342d1aafb883478760ce29311acf0d8ff44f69650dd682ffddc07fdb22a72566dd32fc752ad1bb81683466
+MISC metadata.xml 1464 SHA256 a20b0374aa7ec76970d2b15e841845b9cfb21766c1cee78376a8075152b700cd SHA512 82d9f6f517de261a4175e1de10b2596a2f82d828622681d64b4707cf7c0ac19d9a07230f3fd39e277a1dd3a92f14f95455aa0d57c68e7b015542c31bce47aea2 WHIRLPOOL ff96c31db61630ea6f1b3a13fc45a6d42e03593d8312e1eb9dfeab1ba258a3bdd67d1ef384ba996aa4f11122d4be3365c18d105328d6d285dc76ea917ee89b8e
diff --git a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
new file mode 100644
index 000000000000..aa286aa0752a
--- /dev/null
+++ b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit flag-o-matic java-pkg-opt-2 autotools wxwidgets versionator multiprocessing
+
+MY_P=${PN}-src-${PV}
+PATH_P=${PN}-$(get_version_component_range 1-2)
+
+DESCRIPTION="Portable 3D Game Development Kit written in C++"
+HOMEPAGE="http://crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png speex truetype vorbis wxwidgets"
+
+COMMON_DEP="
+	virtual/opengl
+	media-libs/openal
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	sys-libs/zlib
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	ode? ( <dev-games/ode-0.12 )
+	cal3d? ( >=media-libs/cal3d-0.11 )
+	jpeg? ( virtual/jpeg:0 )
+	bullet? ( sci-physics/bullet )
+	vorbis? ( media-libs/libvorbis )
+	speex? ( media-libs/libogg
+		media-libs/speex )
+	truetype? ( >=media-libs/freetype-2.1 )
+	alsa? ( media-libs/alsa-lib )
+	mng? ( media-libs/libmng )
+	png? ( media-libs/libpng:0= )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	cegui? ( >=dev-games/cegui-0.5.0 )
+	3ds? ( media-libs/lib3ds )
+"
+RDEPEND="${COMMON_DEP}
+	java? ( >=virtual/jre-1.5 )
+"
+DEPEND="${COMMON_DEP}
+	java? ( >=virtual/jdk-1.5
+		dev-java/ant-core )
+	dev-util/ftjam
+	<dev-lang/swig-3
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-gcc52.patch
+	"${FILESDIR}"/${P}-wxgtk.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+
+	# Installing doc conflict with dodoc on src_install
+	# Removing conflicting target
+	sed -i \
+		-e "/^InstallDoc/d" \
+		Jamfile.in \
+		docs/Jamfile || die
+
+	use wxwidgets && append-libs -lGL
+
+	AT_M4DIR=mk/autoconf \
+		eautoreconf
+}
+
+src_configure() {
+	if use wxwidgets; then
+		need-wxwidgets unicode
+	fi
+
+	econf \
+		--disable-as-needed \
+		--enable-cpu-specific-optimizations=no \
+		--disable-separate-debug-info \
+		--without-lcms \
+		--without-jackasyn \
+		--without-perl \
+		$(use_with java) \
+		--disable-make-emulation \
+		$(use_with bullet) \
+		--without-python \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with mng) \
+		$(use_with vorbis) \
+		$(use_with speex) \
+		$(use_with 3ds) \
+		$(use_with ode) \
+		$(use_with truetype freetype2) \
+		$(use_with cal3d) \
+		$(use_with wxwidgets wx) \
+		$(use_with cegui CEGUI) \
+		$(use_with cg Cg) \
+		$(use_with alsa asound)
+	#remove unwanted CFLAGS added by ./configure
+	sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
+		Jamconfig || die
+}
+
+src_compile() {
+	jam -q -dx -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	for installTarget in bin plugin lib include data config bindings
+	do
+		jam -q -s DESTDIR="${D}" install_${installTarget} || die
+	done
+	if use doc; then
+		jam -q -s DESTDIR="${D}" install_doc || die
+	fi
+	dodoc README docs/history*
+
+	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${PATH_P}" > 90crystalspace
+	echo "CRYSTAL_CONFIG=/etc/${PATH_P}" >> 90crystalspace
+	doenvd 90crystalspace
+}
+
+pkg_postinst() {
+	elog "Examples coming with this package, need correct light calculation"
+	elog "Do the following commands, with the root account, to fix that:"
+	# Fill cache directory for the examples
+	local dir
+	for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
+		terrain terrainf;
+	do
+		elog "cslight -video=null /usr/share/${PATH_P}/data/maps/${dir}"
+	done
+}
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch
new file mode 100644
index 000000000000..5b76b2e94707
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch
@@ -0,0 +1,110 @@
+https://bugs.gentoo.org/426870
+https://bugs.gentoo.org/459440
+
+ include/csplugincommon/rendermanager/render.h | 6 +++---
+ include/csutil/blockallocator.h               | 6 +++---
+ include/csutil/parray.h                       | 2 +-
+ include/csutil/redblacktree.h                 | 4 ++--
+ include/csutil/refarr.h                       | 2 +-
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+--- a/include/csplugincommon/rendermanager/render.h
++++ b/include/csplugincommon/rendermanager/render.h
+@@ -194,7 +194,7 @@ namespace RenderManager
+             || (mesh.preCopyNum != 0))
+         {
+           // Render the latest batch of meshes
+-          RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
++          this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
+           lastRenderedMesh = m;
+ 
+           lastShader = shader;
+@@ -208,7 +208,7 @@ namespace RenderManager
+         }
+       }
+ 
+-      RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
++      this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
+     }
+   };
+ 
+@@ -242,7 +242,7 @@ namespace RenderManager
+ 	  iShader* shader = context.shaderArray[mesh.contextLocalId+layerOffset];
+         
+ 	  size_t ticket = context.ticketArray[mesh.contextLocalId+layerOffset];
+-          RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
++          this->RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
+ 	}
+       }
+     }
+--- a/include/csutil/blockallocator.h
++++ b/include/csutil/blockallocator.h
+@@ -193,7 +193,7 @@ public:
+   ~csBlockAllocator()
+   {
+     ObjectDispose dispose (*this, false);
+-    DisposeAll (dispose);
++    this->DisposeAll (dispose);
+   }
+ 
+   /**
+@@ -204,7 +204,7 @@ public:
+   void Empty ()
+   {
+     ObjectDispose dispose (*this, true);
+-    FreeAll (dispose);
++    this->FreeAll (dispose);
+   }
+ 
+   /**
+@@ -215,7 +215,7 @@ public:
+   void DeleteAll ()
+   {
+     ObjectDispose dispose (*this, true);
+-    DisposeAll (dispose);
++    this->DisposeAll (dispose);
+   }
+ 
+   /**
+--- a/include/csutil/parray.h
++++ b/include/csutil/parray.h
+@@ -112,7 +112,7 @@ public:
+   {
+     CS_ASSERT (this->GetSize () > 0);
+     T* ret = GetAndClear (this->GetSize () - 1); // see *1*
+-    Truncate (this->GetSize () - 1);
++    this->Truncate (this->GetSize () - 1);
+     return ret;
+   }
+ 
+--- a/include/csutil/redblacktree.h
++++ b/include/csutil/redblacktree.h
+@@ -1155,7 +1155,7 @@ public:
+   T* Put (const K& key, const T &value)
+   {
+     csRedBlackTreePayload<K, T>* payload = (csRedBlackTreePayload<K, T>*)
+-      Insert (csRedBlackTreePayload<K, T>(key, value));
++      this->Insert (csRedBlackTreePayload<K, T>(key, value));
+     return (payload != 0) ? &payload->GetValue() :  0;
+   }
+   /**
+@@ -1194,7 +1194,7 @@ public:
+    */
+   const T& Get (const K& key, const T& fallback) const
+   {
+-    const csRedBlackTreePayload<K, T>* payload = Find (key);
++    const csRedBlackTreePayload<K, T>* payload = this->Find (key);
+     if (payload == 0) return fallback;
+     return payload->GetValue();
+   }
+--- a/include/csutil/refarr.h
++++ b/include/csutil/refarr.h
+@@ -111,7 +111,7 @@ public:
+   {
+     CS_ASSERT (this->GetSize () > 0);
+     csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
+-    SetSize (this->GetSize () - 1);
++    this->SetSize (this->GetSize () - 1);
+     return ret;
+   }
+ };
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch
new file mode 100644
index 000000000000..96b6aa712340
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch
@@ -0,0 +1,53 @@
+--- a/include/csgfx/imagememory.h.old	2016-04-17 09:09:31.497152401 +0200
++++ b/include/csgfx/imagememory.h	2016-04-17 09:12:13.838355158 +0200
+@@ -179,8 +179,8 @@
+   /// Get a pointer to the alpha data that can be changed.
+   uint8* GetAlphaPtr ();
+ 
+-  virtual const void* GetImageData () { return GetImagePtr (); }
+-  virtual int GetWidth () const { return Width; }
++  virtual const void* GetImageData ();
++  virtual int GetWidth () const;
+   virtual int GetHeight () const { return Height; }
+   virtual int GetDepth () const { return Depth; }
+ 
+--- a/libs/csgfx/imagememory.cpp.old	2016-04-17 09:07:19.555451540 +0200
++++ b/libs/csgfx/imagememory.cpp	2016-04-17 09:13:09.339398463 +0200
+@@ -208,6 +208,23 @@
+   EnsureImage();
+   return (void*)databuf->GetData ();
+ }
++
++const void* csImageMemory::GetImageData ()
++{
++  return GetImagePtr ();
++}
++
++int csImageMemory::GetWidth () const
++{
++  return Width;
++}
++
++void csImageBase::SetName (const char* iName)
++{
++  cs_free (fName);
++  fName = CS::StrDup (iName);
++}
++
+ csRGBpixel* csImageMemory::GetPalettePtr ()
+ {
+   EnsureImage();
+--- a/include/csgfx/imagebase.h.old	2016-04-17 09:59:09.211101864 +0200
++++ b/include/csgfx/imagebase.h	2016-04-17 09:59:20.041919599 +0200
+@@ -61,10 +61,7 @@
+   // Most images are 2D, so provide a sensible default
+   virtual int GetDepth () const { return 1; }
+ 
+-  virtual void SetName (const char* iName)
+-  {
+-    cs_free (fName); fName = CS::StrDup (iName);
+-  }
++  virtual void SetName (const char* iName);
+   virtual const char* GetName () const { return fName; }
+ 
+   /* Commented out: should be implemented by all descendants.
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc6.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc6.patch
new file mode 100644
index 000000000000..f0b099a3e3d4
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-gcc6.patch
@@ -0,0 +1,238 @@
+--- crystalspace-src-2.0/include/csutil/redblacktree.h.old	2016-09-20 22:06:36.732698058 -0400
++++ crystalspace-src-2.0/include/csutil/redblacktree.h	2016-09-20 22:09:08.437064011 -0400
+@@ -37,7 +37,7 @@
+  * @{ */
+ 
+ template <typename K, typename Allocator,
+-  template<typename K, typename K2> class Ordering>
++  template<typename K1, typename K2> class Ordering>
+ class csRedBlackTree;
+ 
+ template <typename K, typename T>
+@@ -237,7 +237,7 @@
+ template <typename K,
+           typename Allocator =
+ 	    CS::Container::DefaultRedBlackTreeAllocator<K>,
+-	  template<typename K, typename K2> class Ordering =
++	  template<typename K1, typename K2> class Ordering =
+ 	    CS::Container::RedBlackTreeOrderingTotal>
+ class csRedBlackTree
+ {
+--- crystalspace-src-2.0/plugins/terraformer/pagingformer/pagingformer.cpp.old	2016-09-20 22:10:54.287917849 -0400
++++ crystalspace-src-2.0/plugins/terraformer/pagingformer/pagingformer.cpp	2016-09-20 22:12:31.684739007 -0400
+@@ -1159,7 +1159,7 @@
+   else
+   {
+     // Something we can't return was requested
+-    return false;
++    return NULL;
+   }
+ }
+ 
+--- crystalspace-src-2.0/plugins/documentsystem/xmlread/characters.cpp.old	2016-09-20 22:13:28.794863758 -0400
++++ crystalspace-src-2.0/plugins/documentsystem/xmlread/characters.cpp	2016-09-20 22:22:26.124668024 -0400
+@@ -46,20 +46,20 @@
+   //       0 1 2 3 4 5 6 7 8 9 A B C D E F
+   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 00-0f
+   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 10-1f
+-  CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,S,S,0), // 20-2f
+-  CHAR_ROW(S,S,S,S,S,S,S,S,S,S,F,0,0,0,0,0), // 30-3f
+-  CHAR_ROW(0,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // 40-4f
+-  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,0,0,0,0,F), // 50-5f
+-  CHAR_ROW(0,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // 60-6f
+-  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,0,0,0,0,0), // 70-7f
++  CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,(uint32)S,(uint32)S,0), // 20-2f
++  CHAR_ROW((uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)F,0,0,0,0,0), // 30-3f
++  CHAR_ROW(0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // 40-4f
++  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,0,0,0,(uint32)F), // 50-5f
++  CHAR_ROW(0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // 60-6f
++  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,0,0,0,0), // 70-7f
+   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 80-8f
+   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 90-9f
+   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // a0-af
+   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // b0-bf
+-  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // c0-cf
+-  CHAR_ROW(F,F,F,F,F,F,F,0,F,F,F,F,F,F,F,F), // d0-df
+-  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // e0-ef
+-  CHAR_ROW(F,F,F,F,F,F,F,0,F,F,F,F,F,F,F,F), // f0-ff
++  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // c0-cf
++  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // d0-df
++  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // e0-ef
++  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // f0-ff
+ };
+ 
+ #undef CHAR_ROW
+--- crystalspace-src-2.0/plugins/mesh/protomesh/object/protomesh.cpp.old	2016-09-20 22:13:51.298710883 -0400
++++ crystalspace-src-2.0/plugins/mesh/protomesh/object/protomesh.cpp	2016-09-20 22:24:27.087156627 -0400
+@@ -141,7 +141,7 @@
+ {
+   n = 0;
+ 
+-  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return false;
++  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return NULL;
+ 
+   SetupObject ();
+ 
+--- crystalspace-src-2.0/plugins/terraformer/simpleformer/simpleformer.cpp.old	2016-09-20 22:14:11.555573385 -0400
++++ crystalspace-src-2.0/plugins/terraformer/simpleformer/simpleformer.cpp	2016-09-20 22:25:57.007048574 -0400
+@@ -1012,7 +1012,7 @@
+   else
+   {
+     // Something we can't return was requested
+-    return false;
++    return NULL;
+   }
+ }
+ 
+--- crystalspace-src-2.0/plugins/mesh/skeleton/persist/standard/skelldr.cpp.old	2016-09-20 22:14:28.534458231 -0400
++++ crystalspace-src-2.0/plugins/mesh/skeleton/persist/standard/skelldr.cpp	2016-09-20 22:28:15.857616492 -0400
+@@ -157,7 +157,7 @@
+           {
+             csVector3 v;
+             if (!SyntaxService->ParseVector (vector_node, v))
+-              return false;
++              return NULL;
+             bone->GetTransform ().SetOrigin (v);
+           }
+ 
+@@ -166,7 +166,7 @@
+           {
+             csMatrix3 m;
+             if (!SyntaxService->ParseMatrix (matrix_node, m))
+-              return false;
++              return NULL;
+             bone->GetTransform ().SetO2T (m);
+           }
+         }
+@@ -201,7 +201,7 @@
+             {
+               csVector3 v;
+               if (!SyntaxService->ParseVector (vector_node, v))
+-              return false;
++              return NULL;
+               socket_transform.SetOrigin (v);
+             }
+     
+@@ -210,7 +210,7 @@
+             {
+               csMatrix3 m;
+               if (!SyntaxService->ParseMatrix (matrix_node, m))
+-              return false;
++              return NULL;
+               socket_transform.SetO2T (m);
+             }
+             socket->SetTransform(socket_transform);
+@@ -550,7 +550,7 @@
+           {
+           csVector3 v;
+           if (!SyntaxService->ParseVector (vector_node, v))
+-            return false;
++            return NULL;
+           key_transform.SetOrigin (v);
+           }
+ 
+@@ -559,7 +559,7 @@
+           {
+           csMatrix3 m;
+           if (!SyntaxService->ParseMatrix (matrix_node, m))
+-            return false;
++            return NULL;
+           key_transform.SetO2T (m);
+           }
+         }
+--- crystalspace-src-2.0/plugins/mesh/animesh/persist/skeleton2/skeleton2ldr.cpp.old	2016-09-20 22:14:53.609288299 -0400
++++ crystalspace-src-2.0/plugins/mesh/animesh/persist/skeleton2/skeleton2ldr.cpp	2016-09-20 22:29:41.797284147 -0400
+@@ -516,7 +516,7 @@
+     if (!name)
+     {
+       synldr->ReportError (msgid, node, "No name set for animation");
+-      return false;
++      return NULL;
+     }
+ 
+     CS::Animation::iSkeletonAnimation* fact = packet->CreateAnimation (name);
+@@ -524,7 +524,7 @@
+     {
+       synldr->ReportError (msgid, node, 
+         "Could not create animation, another animation with same name already exist");
+-      return false;
++      return NULL;
+     }
+ 
+     if (node->GetAttributeValueAsBool ("bindspace", false))
+--- crystalspace-src-2.0/plugins/mesh/watermesh/object/watermesh.cpp.old	2016-09-20 22:15:10.911171145 -0400
++++ crystalspace-src-2.0/plugins/mesh/watermesh/object/watermesh.cpp	2016-09-20 22:30:58.603396904 -0400
+@@ -363,7 +363,7 @@
+ {
+   n = 0;
+ 
+-  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return false;
++  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return NULL;
+ 
+   iCamera* camera = rview->GetCamera ();
+ 
+--- crystalspace-src-2.0/plugins/csparser/csparser.cpp.old	2016-09-20 22:15:32.086027857 -0400
++++ crystalspace-src-2.0/plugins/csparser/csparser.cpp	2016-09-20 22:36:18.576856714 -0400
+@@ -571,7 +571,7 @@
+         break;
+       case XMLTOKEN_KEY:
+         if (!ParseKey (child, &Keys))
+-          return false;
++          return NULL;
+         break;
+       case XMLTOKEN_HALO:
+         {
+@@ -779,7 +779,7 @@
+           {
+             csMatrix3 m;
+             if (!SyntaxService->ParseMatrix (matrix_node, m))
+-              return false;
++              return NULL;
+             light_transf.SetO2T (m);
+           }
+           csRef<iDocumentNode> vector_node = child->GetNode ("v");
+@@ -787,7 +787,7 @@
+           {
+             csVector3 v;
+             if (!SyntaxService->ParseVector (vector_node, v))
+-              return false;
++              return NULL;
+             use_light_transf_vector = true;
+             light_transf.SetO2TTranslation (v);
+           }
+@@ -830,7 +830,7 @@
+         {
+           bool flag;
+           if (!SyntaxService->ParseBool (child, flag, true))
+-            return false;
++            return NULL;
+           lightFlags.SetBool (CS_LIGHT_NOSHADOWS, flag);
+         }
+         break;
+@@ -1193,7 +1193,7 @@
+         {
+           csColor c;
+           if (!SyntaxService->ParseColor (child, c))
+-            return false;
++            return NULL;
+           sector->SetDynamicAmbientLight (c);
+         }
+         break;
+@@ -1387,7 +1387,7 @@
+           iRenderLoop* loop = ParseRenderLoop (child, set);
+           if (!loop)
+           {
+-            return false;
++            return NULL;
+           }
+           if (set)
+           {
+@@ -1569,7 +1569,7 @@
+         return 0;
+       case XMLTOKEN_KEY:
+         if (!ParseKey (child, pNode->QueryObject()))
+-          return false;
++          return NULL;
+         break;
+       case XMLTOKEN_POSITION:
+         if (!SyntaxService->ParseVector (child, pos))
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch b/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
new file mode 100644
index 000000000000..740f22eaa24a
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
@@ -0,0 +1,48 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-06-14
+
+--- crystalspace-2.0+dfsg.orig/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
++++ crystalspace-2.0+dfsg/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
+@@ -292,7 +292,7 @@ bool csGraphics2DWX::Open()
+   {
+     Display* dpy = (Display*) wxGetDisplay ();
+     GLXContext active_GLContext = glXGetCurrentContext();
+-    XVisualInfo *xvis = (XVisualInfo*)theCanvas->m_vi;
++    XVisualInfo *xvis = theCanvas->GetXVisualInfo();
+ 
+     Report (CS_REPORTER_SEVERITY_NOTIFY, "Video driver GL/X version %s",
+       glXIsDirect (dpy, active_GLContext) ? "(direct renderer)" :
+@@ -705,8 +705,8 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAP (MENU,            CONTEXT,      CONTEXT)
+     MAP (PAUSE,           PAUSE,        PAUSE)
+     MAP (CAPITAL,         CAPSLOCK,     CAPSLOCK)
+-    MAP (PRIOR,           PGUP,         PGUP)
+-    MAP (NEXT,            PGDN,         PGDN)
++    MAP (PAGEUP,          PGUP,         PGUP)
++    MAP (PAGEDOWN,        PGDN,         PGDN)
+     MAP (END,             END,          END)
+     MAP (HOME,            HOME,         HOME)
+     MAP (LEFT,            LEFT,         LEFT)
+@@ -722,10 +722,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAPC (NUMPAD2,        PAD2,         '2')
+     MAP (NUMPAD_DOWN,     PAD2,         DOWN)
+     MAPC (NUMPAD3,        PAD3,         '3')
+-    MAP (NUMPAD_NEXT,     PAD3,         PGDN)
+-#if wxVERSION_NUMBER < 2700
+     MAP (NUMPAD_PAGEDOWN, PAD3,         PGDN)
+-#endif
+     MAPC (NUMPAD4,        PAD4,         '4')
+     MAP (NUMPAD_LEFT,     PAD4,         LEFT)
+     MAPC (NUMPAD5,        PAD5,         '5')
+@@ -736,10 +733,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAPC (NUMPAD8,        PAD8,         '8')
+     MAP (NUMPAD_UP,       PAD8,         UP)
+     MAPC (NUMPAD9,        PAD9,         '9')
+-    MAP (NUMPAD_PRIOR,    PAD9,         PGUP)
+-#if wxVERSION_NUMBER < 2700
+     MAP (NUMPAD_PAGEUP,   PAD9,         PGUP)
+-#endif
+     MAPC (MULTIPLY,       PADMULT,      '*')
+     MAPC (NUMPAD_MULTIPLY,PADMULT,      '*')
+     MAPC (ADD,            PADPLUS,      '+')
diff --git a/dev-games/crystalspace/metadata.xml b/dev-games/crystalspace/metadata.xml
new file mode 100644
index 000000000000..d51e9062a2e6
--- /dev/null
+++ b/dev-games/crystalspace/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+Crystal Space is a free (LGPL) and portable 3D Game 
+Development Kit written in C++. It supports: true six degrees 
+of freedom, colored lighting, lightmapped and stencil based 
+lighting, shader support, mipmapping, portals, mirrors, alpha 
+transparency, reflective surfaces, 3D sprites (frame based or 
+with skeletal animation, also using cal3d animation library), 
+procedural textures, particle systems, halos, volumetric fog, 
+scripting (using Python, Perl, Java, or potentially other 
+languages), 16-bit and 32-bit display support, OpenGL, and 
+software renderer, font support, hierarchical 
+transformations, physics plugin based on ODE, ... See the 
+extensive list of features for more details.
+</longdescription>
+	<use>
+		<flag name="3ds">Enables support for .3DS files in CrystalSpace</flag>
+		<flag name="bullet">include support for Bullet library</flag>
+		<flag name="cal3d">include support for skeleton animation</flag>
+		<flag name="cegui">include support for Crazy Eddie GUI</flag>
+		<flag name="cg">NVIDIA toolkit plugin</flag>
+		<flag name="ode">include support for Open Dynamics Engine</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">crystal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-games/flatzebra/Manifest b/dev-games/flatzebra/Manifest
new file mode 100644
index 000000000000..2baf088ce368
--- /dev/null
+++ b/dev-games/flatzebra/Manifest
@@ -0,0 +1,5 @@
+DIST flatzebra-0.1.6.tar.gz 359098 SHA256 4e7bb0a77136ec3b81e0f73c1d08e828d38ef011095d5ce7068a94f3bb21d67a SHA512 500df95ee23bd2decf1e11be76725733d9219ef06a844f2de337fc11494eeea57e5ab6298cb4235c394216dd75bfb64a4e9f732362ca5ee95c43086b2ca38f75 WHIRLPOOL 96d058b434c08e69a05d9ee1576629361134e9edda32e15ffa80c640aa03675360a03838f1f339b77f50b3c2e423a28bbe7fa19925568da377dd42016f4c4e62
+EBUILD flatzebra-0.1.6.ebuild 714 SHA256 eb6f165195f03543d6bde17100f67ab9a1ebdcfcba58733767958a087e8370f9 SHA512 065476edfb99031057a11afb51a6eaa748ef9ea9c67e9a1381f06b5bcd5d0369c990ac9e223354caf5acdd2fddae48d87046238209dcf7a0e93e0b3a42494bf6 WHIRLPOOL 34928b5e15bbd659e1f3eeb73621dc657343902d71d79b1f804cafe45fec4aac3e51332c4bb0f82e0195dc65fa16e455766ae5ad9a99c51aa5ccfe49141b9800
+MISC ChangeLog 2434 SHA256 84a6e80108194e0e853e912e3f640deb259e8c6015db3c7d7fc31976fa6e5517 SHA512 bd77e7f5466bcbe20ec4664db9d6790029f98986ffebce434adf39224ea43b3baae5a8c56abb72a0fa65f3514edf8ea89046c34e1c66a0a1c0753a2189b6dfbb WHIRLPOOL 8cf3e8077961ad9b068f3dc6bbe2f40b84eee0c78416f14f7bb9ef0310636879ba57ec48a3b8e236e081c98a971160e8f5e14a7e2689203445c3d6e7437cdca9
+MISC ChangeLog-2015 3876 SHA256 45bf20060f62d7e4d5cdf7e9fa51916ffd0514d7800e51e447ea7d8af8157015 SHA512 6267d4a9262fbb13c198af98c93a1af6deefcef72c822ae415a5d008bfa319fb3d43689ed843948ef2d2cc06981c3f0a5da621b7ebfa7dcec0d8fcb44a4c6c84 WHIRLPOOL 27a7080b06874fbad8d3f5dc8a298ba91d65f41b0b50be366db902c3234f29986734bbe8581364119956d82da92baa50eb7199c9606f3f32d6b117ff37d406db
+MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
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/Manifest b/dev-games/flinker/Manifest
new file mode 100644
index 000000000000..8a5f10648815
--- /dev/null
+++ b/dev-games/flinker/Manifest
@@ -0,0 +1,5 @@
+DIST flgba.zip 41380 SHA256 92b7e0f4c61f85b12c473701ad0b09e68de6d60bbe3f4183ec91b500b53eb92c SHA512 36e9542d5588c655b3001f7515cca487d0f820cbc7e8613afcda5dbcd1b9c48e4d2f9c3c8b755a466eb421ea6198102408494006c14e3ea3e6a22c2e0da6bb1c WHIRLPOOL 273b1c271b9f3acbbd7a820ce18cfa1f5fed98cc0699dc1575cfa71c5c94a37d34e5102158b18b8fc580cac1bcd71db566dcb7d2fb6368892c1ec16daf311995
+EBUILD flinker-1.72.ebuild 662 SHA256 c63675e1de1b11dcc89ea3572f8038b20346741b9e4e55306fe6f66ba1258b0c SHA512 afc6e48351d07d5cc6a839117657077a30a0889d90d43a48b04a14048343cba022d30cf5ab36adeeb8228af3802374a19ccba4038b790b33416ea1168afcbdca WHIRLPOOL 47dcf48569363ab0dd6f9d89b4597e13124b37d0e1e3642762bfb6f4dccbc3b5a87458a7cf51741fa31bb65a2a49098d885c8d360d4cf8f73136d0986c0edcf1
+MISC ChangeLog 2426 SHA256 3abe3b92aae1a3968b7cd8e99304767e664da4f5ff46131da58f165fe8e7eccf SHA512 10b6a47ae3b639fa130dff4879fcb60f49c35e9f7bc000d4f7c5913327843ba491c16989c0b5a2a6f01ea1bee5bcd1041948a42f5cafb9581c7bd03c1225b155 WHIRLPOOL ed451bee17c116d4f49f00b5bc2f5a69195fa326753cc0af478c5e69b838f1e6f2098168a244abb232318ff2dffbfc1ce68e764bd747fbad891e710a2505d112
+MISC ChangeLog-2015 893 SHA256 0d521e1be7df0b6b838687b55e797a5942d5dc30b8229908cfba86de19643131 SHA512 e3ebc4827fae563202fb4ca668183fe80475fb6993fc2803550c175c6050d9302f4b38df51678c6e7a5e0ad8fcdcb453a2da80624ef5613590b0862a6eb29453 WHIRLPOOL 2468be8fd2af84a4a8a12c2b1646086124be6fe5891ae9bb9b232475f91782546aa29370f30935e1c50d1cc15e87097b4b4e97793c819ed6b921e901019ec161
+MISC metadata.xml 520 SHA256 c882e2103317a05582cf196321b7e6a5cca461d171d3ed2da9d8c4bd87d2a99c SHA512 43499a6b69b0fd7e4fbe773b9f3a4e64e69f49fd2f72c9b03f63035fa660b496d7695d9fe1bd4572d7dee14ab44c159882b32578f4d98d9e9348c2d2f09c73d6 WHIRLPOOL ab8fb03f69a17e38c3f966dfbd3d48aa877ba0b600ad8f01f32b871fce7e5e59a6f81395586b7e940f006786f777a45b50f039dd8087082f38a01bc1c7e4e96d
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/Manifest b/dev-games/goatee/Manifest
new file mode 100644
index 000000000000..7f719d37d5ec
--- /dev/null
+++ b/dev-games/goatee/Manifest
@@ -0,0 +1,10 @@
+AUX goatee-0.3.0-ghc-7.10.patch 546 SHA256 139d2d3e5165872562a8a4a0288c26246d2ac1131348810e61ab7e6b5d237a86 SHA512 2551f95738d40fdb231244612ce795170bc829017f547512351975a52f608adb9feb7275fca57eddbb4cf6b6f0c178dafa3e805942c9373dff19cdcee4346ce2 WHIRLPOOL 5548043ed10d219bcdd5276bada55e8ab0b86bde10b7dc1047b4fca2fe0a783245c3ff5f767085af0e1b07c48d8ab5dd45899cad111f168c5634bf5a19dd9988
+DIST goatee-0.3.0.tar.gz 83679 SHA256 4d2ca32cf42161e18d3c528c24d0ac16a78b0e331759ce97714d5abcab65c0df SHA512 57c5340ba6aadbd4fd5d328702012e02a5e36c50be7f714bc1f8adedb3270c2174ad3c60d30dd7b93b93b4a3a3e6436ec9e5957561e13046dfde869b71ec2cd6 WHIRLPOOL bff45c30c33ea0e2e82fcf138d2b99de96b459c67fbdf952c4cc94e115e416b0733751dafeacfbd3738a7295dc99583449f2a56db9f50eb2a039de0981870eae
+DIST goatee-0.3.1.1.tar.gz 84493 SHA256 88837cda9add9a05ca6f8bf8c0547f6cc629253f6e033b198e27142735074ce2 SHA512 cc08009476a9f5d670874f3a4417d9c1c942e7c38ad88fe45dccc008585ad9e4d7cc3db61eeb84ebb65ff31cec7ba387a6ab5f27490152796a148b6bca3a47c0 WHIRLPOOL 07fd2df0db169fb27eab730beb8dac5f640a08981e9e5555e957b02e601eba5f0374eee31c85fa35351cbd70ee054278a0e38cbf19b35b60a9bde314b79f2ce5
+DIST goatee-0.3.1.2.tar.gz 84576 SHA256 a9a1332749575de3b300b83b1b5109916252cb2024a21f1b8b22597f0227e1d3 SHA512 b8723679823dbb092346f8a6c556c3391888f004d609d6b61c73c9f590901abc5d4024d0ad4063692078637be0171d78e9a91c9436735423d597f310226ee9db WHIRLPOOL 3bb8b892b98baac7a8c396c4f2ad12d9dcf207a196f4d92a37d13ebcaa0d464df65853216b32d0714fcd6e4934d488dedb841608e5869b88fc82ad121c6300b5
+EBUILD goatee-0.3.0.ebuild 863 SHA256 706d259a15569c4935e40897df880672dc2500d1adada6e447273b4f4b4b8342 SHA512 51281e3cf0975299225f4479f7c15e8cc04452bf803c0dedf5dee0caf98cbcaee1931f014a433b38f7d18f16ff9a91c91d19f531dcc6f24a6f86486b1bcda232 WHIRLPOOL 244816056690937eb92a082fa56f1e52694d4f50d87dde7cc68d3795fc3962e8527f9acca4d20b052ff45ccc8f964952341699365b7ddf7e361ce5a4cfb8d210
+EBUILD goatee-0.3.1.1.ebuild 835 SHA256 ff4a8432b41715b5bb76c1340f232485b9356bff8b0d8546d0a6cef31e840861 SHA512 3fbaf090b2423ce21a66912438271e9cdc935a234ca4059718ea599cbc1686c4aef9025210ad487a7b4784cb7f05da169991ef1122fdb0fef8178ce444ed2c63 WHIRLPOOL d6fb2aaf03e6b9757e3c644bf98ba8d1cec521dfc10a2e42530a4a604ea76ad1ae7dbbf8e9342192e59483af7446f17796451b49579c22afc76e00fed971421c
+EBUILD goatee-0.3.1.2.ebuild 770 SHA256 41941b51bb52938d640091b9749af0d3efd41acf1afdfba4241559e307c9761d SHA512 11e30dfa40a908c1e2cb5fdc04f98642fe0c95a91536f315fa666ad9329e080f8ac0c728933d40d1c732f9cbb19525a226ebdf0cba72fbaa0312fc79816af9a1 WHIRLPOOL 88a9c0703673d3f46829e0f68c8588e1ff60c0190968c625ff5bbd51c510104e9b0a8a6b6cbdd98d4c7c3459c086ee8121c3808337a7f0caae864a143294ce8a
+MISC ChangeLog 3480 SHA256 4804dc2f77fb5059c92684ca51cb81ca84ddbfee990eb8e99e6d89afd43918d5 SHA512 fe652a14093f503245470d503412bf7f27d9b91f0cc87bd60c3d83ddee26f0753d35f0ff5a834bcb46a6647024a1c5bab8d5ba1e413ea37dac6e1e679b7e7bf4 WHIRLPOOL 501146f9fac1e841484992f0116f185db8daecf1157db19963d7a07c5448c8393163ac839993d3dd28b67d5cc5d6559ad43f9c840bf81dc734941adffe78c31c
+MISC ChangeLog-2015 1091 SHA256 975e9b03577e97a08d44b544f3eec0bc8522d42afa9ca1d684f0be78ccfbd54e SHA512 ef8fc3d95f676300f88aef2c9716285c2ed0096b42bbc5e47ee8e2c001bcdc2fe6262836397ca0d534edb1800f8f092bf7475f5484503a69f1ead94434772b0b WHIRLPOOL 3fbbc5301680de702442d84966f93675e93117186991f124554040dd2fd89deb71a7844e519fa0554cc4de68ee66deb1a712209b2161ce6edddab087ce7a4029
+MISC metadata.xml 815 SHA256 a83b725464fd4ad63ae05624dce216adad493962c8f707d13a83b7a0b3a10b03 SHA512 34c22d6f4785a966025c02f5e51ae0159e4dea45359a97e795865b3c75a119dbeb5d9c9485c897381ed932e21c7ce846753de66926b0bf4ff0a5a08a4472ef49 WHIRLPOOL fddd61f4cd8a3025976e4b62a323eb4ee8726c9d10f8f6e6e86545c729d801888d6791dff5aa6ae38377537237c1cdc8f39af881cdd691062481e68a7c85559b
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/Manifest b/dev-games/gtkradiant/Manifest
new file mode 100644
index 000000000000..68c9a90e5d76
--- /dev/null
+++ b/dev-games/gtkradiant/Manifest
@@ -0,0 +1,5 @@
+DIST gtkradiant-1.5.0-2006-03-02.i386.rpm 3130735 SHA256 339c9c1f86f0b3a033b6c41426c2b893f42d87f192291107e4939750c8bc0069 SHA512 198c36d505dc68e5bbe550248eb57264527c3ce135d0f63513962fd10255aa6b7176b4262b6392361628098e09cf983991ebb4bc0bb75c54a996a0c8eda9dd2d WHIRLPOOL 279e5b3c40337a07de5bd0bfca660332ef89042ced3608f5b85f910d4d0834f2c80c4a537974d5cacade9329b9e81dcdaf3cbdf7bffcf4ffadbadcc62e4a17c3
+EBUILD gtkradiant-1.5.0_pre20060302.ebuild 884 SHA256 8c4fb9aa45c598fc59b7f7e83069e66d47ba15a420efb15af12293c54cb38a5c SHA512 c378d7da74a9d20d3c8fcda4d2074250df18cb92b445022c01c407e17f2b129e647b619617cc935c32e5403ff38c2ec672cf84c868c4f78e43253592576a1804 WHIRLPOOL aff950ce0fbb68e203f8fc0c57cc4e90de0c66fffe5b68aa14a2a7330f667c31ed677615409e957e5c8009ca7937fd09de58ae9c57ac4c82f363ba5188ee9ccf
+MISC ChangeLog 2955 SHA256 dc3600f5d8381b21634acd39a32ab3db6dc5d9fac09a9f1c7867af89986d0ff8 SHA512 4a4eed4ae536cfab28025e26a003503e7678c87d1ced1d7c52f86fa0795a50f898e60628539a6822f2894eca2b7e9e77fca8ac35df3536205be0400480c8ec9e WHIRLPOOL 27ee665e4516158ee46cb9b8afca7660713e1b0e43f26f2bf6ed25b099aff3374ecaefa91d1d55411e6d756a68843f09f63de29b86e910461e2c499f53576930
+MISC ChangeLog-2015 2323 SHA256 0b069aaba952568f2b1d95501ead487cae27c9300ebd4bc318ad56d1c5810037 SHA512 1d95cb5cfe713987fdded7d9c03bed99595319218a4cdcfaeeb44d50a1a55e838d7b746fdf66206e55a187c99004727e10278413faeda5c5efaa7a19c04a6a53 WHIRLPOOL 67c8370b3d26e9769624f468e6197cdcb2dfdb4f15db3aac6fc7e7ad55287765d26302a6a4dd198e6128a44f67b40812cc9415b53360129b8841cddaabc08b4b
+MISC metadata.xml 537 SHA256 be437d07353f46aa1da07bbc7bd642f3acd5e8b62d683514c8e74068b6300b1b SHA512 2deacb6b6cf45f2bf2acbdc564a14a0e36e79bcdec05ce8e0dc8d0cf1d9245b31470839086b9e5eb563f97895d2d01de304d2b3507202d4587d21bedf57a2266 WHIRLPOOL 90ba86d6816a0ce53f2fc15191953df860b5ebf82e2e276f69cc1a4cdcc49e203aa1bd52a0a348bd91b16aff212f23557465774078a01f34966ca1d03c10820e
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/Manifest b/dev-games/guichan/Manifest
new file mode 100644
index 000000000000..dbfb85d81015
--- /dev/null
+++ b/dev-games/guichan/Manifest
@@ -0,0 +1,7 @@
+AUX guichan-0.8.2-as-needed.patch 545 SHA256 d47b984eb6289ebe9ad945372dc861884c956de4e518912d26d6cf32721f5785 SHA512 521fc3fa1e85d8ffc5758b5b8ae16a04e44391867b7a660179505980fd572d8e3430e2c2ed4bcf7def645ae1a1b54d16802b06c1cfd254e11cd9813529f06de1 WHIRLPOOL 839cea274d2b146b207606851cbd6071d85b1a733dd4c0981217eda52ccd3bba77f45258fd5f7ff7ac160c15bc8576fcbe88a6b3b1a64976675127c41e5640f4
+AUX guichan-0.8.2-automake-1.13.patch 263 SHA256 aa79ad3379779e402fcec5a3690e71622346307efd6ee3c83277b81533ad2d89 SHA512 804684f620de981890e60d68c25c7d36cb23faae038144b6e65df2927ddc20b6d072fcc9fd6aecd9c73410bc21e532087f349f7d5acd17a9799e6073d53af410 WHIRLPOOL 4dc1186c6a9aa0d816800f49722b14f8a828ccc87947cb375d5bc910a158e4c6db174ee0dac9fd0221c1a10c9245e5247638e1f1178758d3f89c39c90c60bb96
+DIST guichan-0.8.2.tar.gz 574662 SHA256 eedf206eae5201eaae027b133226d0793ab9a287bfd74c5f82c7681e3684eeab SHA512 b05b3da3c998399eadbaf3154de533038bb394919569c361c26245aa0e7072493b12d3556c94a2420622007525e19dcd76a27db06a76fb56ec96d50429a6ed98 WHIRLPOOL 3ad88b99e8be509a2e66e71999245904a96aa9a2f805adc208c3ff19b036335c334ce38ed90ee11fb1e19120e5a545530dda6de0cd81c011adadd89731e5da53
+EBUILD guichan-0.8.2.ebuild 941 SHA256 80ba7cfcab4624dec1747b9a42427717ff83ae3b10b836bc51ab3e6a5bcb219a SHA512 e969ffc89ee76cb66f85adf9f754b49e2459bedeac76e5faef8d69cf1f36006b6b2d55a9f58d215789768d042229b2e4db184a36efa7a07eadcb92485bf97e77 WHIRLPOOL 829b7bf002749557da74f231a0a343c484617bdd908ff95990d045ba230830f7b58fb08b80a3835f98e65395b90f3e83826d7949d8d4d1a4f0fe70f9cbfc754e
+MISC ChangeLog 3221 SHA256 31f64a4110ba960e3a4d8b374506bfc5658b1b38d1c9567fe19149afb480529a SHA512 75091c812db9c8b67ff82676b288f637fcf2a43e9429e2bc9dda23fe2a31ef50b915940194e84bfebfcb34e15226e1afa34fa53c575ec8f165ee89a9e5f8b27f WHIRLPOOL 5bc151b5de606c50c6aef143edcb640d2d3bfb0bddd16293bde5714d8d0719764259230f74578a800067d99c49e002d169576a708eed71a6d68350053a20b4a2
+MISC ChangeLog-2015 3674 SHA256 6e5655ca0ea46ffdd56d0a09a57ad66cc7734508a0e736b3eec93968d9e5ffe6 SHA512 f7e6c7937400a7205ea812e1ffee6101079d906fda2b107ffe51071f38403388c05934f253ab563c2ed1247b574dd9a2f941586922321a2470b7e15c67104c1a WHIRLPOOL 3a71bc3b5fdfdefaad2c4232c215ea469dec6d1a44fe2913c8b1e09da279c0b768ff879169948de7f2ef94862559e37d9051d3eab2866a59de03ed2a0d568b27
+MISC metadata.xml 454 SHA256 6bfbc8f43b5177622ae7cf5f5301bf198fd8536a7d1b1fef1df1b09de007ab27 SHA512 251a56d1bc96013f0b04e30586ab367d9ccf3ef6f39b375ee48186e40669574f3026297c7d3214cc5dca143bf71d7d91db071f64dd05ee9c07a8005ed483af09 WHIRLPOOL 2a17aa92a4597d84eacb97dbf828cb17fae5ae0bc79f03bf1390cf9ab417fb60dde3e2e081d2e60f7c3ea345a1cc052d3ccbfcd9cfe407682a6336cb9cc9a4c4
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/Manifest b/dev-games/hawknl/Manifest
new file mode 100644
index 000000000000..00be6041ddac
--- /dev/null
+++ b/dev-games/hawknl/Manifest
@@ -0,0 +1,6 @@
+AUX hawknl-1.68-build.patch 1538 SHA256 57650e91bdfc190df3b7f37b9f38491bc72b5698758ce54dc473941570a5e61e SHA512 c3bce38bd43987dbe2707c7ab0f13f36689f322e15b9ef7c9bba4d39bae30f2f4992593d74ee11a97c0367eabda42e6d3af84f0821062c0f984dbaea0066467a WHIRLPOOL e143add22db758ef6126739977809cf180a6d5028839fff403175df7095c689bc3159316123b8f76663803f1932b208eec3113fb738f37f404eff607d679a031
+DIST HawkNL168src.tar.gz 181263 SHA256 31a2883dbfe02937c9c862bb1aac0b89e465bbab822513c06bffa3f13e4c3c2e SHA512 52d518a19aaa8005e2e43a693571244a81a5a4450e2f92e6c0a64efb4b32ebfc3aff5d5b3ed09a3cdbee2e444d83067471ac714d7ae03d8cd78f905364c510f0 WHIRLPOOL c47fac6b08d06be3bc94f341471a6a57767d5de4d25598bac6e715552730463f059e07bce8d56289e0569511c2a9da33ee73e3d0c53d00e174f972da8736d3f1
+EBUILD hawknl-1.68-r2.ebuild 853 SHA256 f8d9450af607cf8fbb5578bb63d2e0e0661c43c45b8ad706ddc8a68ebc2e5868 SHA512 5749a3bb03b77a857ab79eaf8d65307aa9c12a2bb18319a63dd87d20f63d1dd059aefb3df9ee984c44add2c89cc13d248c3fd83033006be3b7e2a7173e123e27 WHIRLPOOL 87fa538ca6a9dbda89666cb18b4ece4b8b5660c81346adb25830237600972268bfb2ce94827fdf7761927a3d9c8f85bb99ee753a5212bf94941a89816c5b1ded
+MISC ChangeLog 2461 SHA256 9c6a5cfb8adf084be9068b4e81917fb2c1e93d6d99e3aaf477836d744ba296a5 SHA512 488b9737bb908ceeefb6f74e15e05f0a8db09fe135451e45dc0f930d020df256fd76e6af9fa5aae636518f6be72269fe610a8ec204f9d9ae181a9ee5ab756395 WHIRLPOOL bdb01ea650d2268a7da2e7e616aa4598c5631afb92efebf79ebc46b744d9179fe03a592023b0f0c78ec5a4bb6358c2cb6578a712c843f293da4694c487a849f7
+MISC ChangeLog-2015 2626 SHA256 3cac0f28d3d4b41e1e26cdd430f05b5c764861342d3f1e7ce32daf628129beb4 SHA512 d28343a6efc5652546af104d83f6b6778868acc7b40d3d24db910017ac016fc8f327cac1628a80a25d1c4e080b014dc451ae05c8cc20eb370ef253769ed0f911 WHIRLPOOL b1c9ee94abc7b76280def48241698090d6f900e12ba42f4d8b08c04216832b6fe7d7012008cbc0084a5271ded36a6933a2fe377ed804f2e00391e44f249987c6
+MISC metadata.xml 1140 SHA256 a0f48ce6fe005abcd3b55c61544e993cd9165c99492c874cbaeeeb5acf2ff14e SHA512 088f17589d2c28f7673b68de696fab59559d1074092b804d72550cfd591094fdaf487250928092cf926e90c7699780145d07c49c1132d472b99a3c6caeec7381 WHIRLPOOL b4d238e7b21bab2ed57ebe7fa250aa22724ebaa102b46974b344bb258e6a63210217b1477744afa29f1b01dbe626a654f738ffe70c79ade75046589e34a403ec
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/Manifest b/dev-games/hdl_dump/Manifest
new file mode 100644
index 000000000000..cfa6f0a0b3cd
--- /dev/null
+++ b/dev-games/hdl_dump/Manifest
@@ -0,0 +1,6 @@
+AUX hdl_dump-0.8.6.20060901-fortify.patch 1443 SHA256 fa519c575df336db148b3f13b3b6aa7494f7d70320ba0226535c808eec4542f2 SHA512 7af0cd2dfcc0b3535cdfd6d8e3b85e475187e89ef46801f2306032d9c8b7d5bdfaf2b5b1f399d8dc3d54251fc0fb063ee7778f3cf2e70f0c685ae81ceafb17e9 WHIRLPOOL 9519ff10600de23d333329679dd73533137647ebb30b2c05c7f1f08b847d1f92c2ffb63edf9709ba896b0ac4e69450357154cc1516c3c9ffdd6fc5ff3d35e22d
+DIST hdl_dumx-0.8.6-20060901-src.tar.bz2 156322 SHA256 6ccb427da1fb957d82e6e0929e3605abe136f44326e85b16b6cdc3b59569486b SHA512 c54c72c3f4d57ca8f3299c0b6044ec5376504f7b7a4c7977d71b996bc8d98577ffa868891e1a599aebbe58b8d3ccf2513c5cf8a47350c0b0f53fd21a0e64bbc8 WHIRLPOOL b70135fb6e663db1016dfd8db5519c33b31e9e8b1ba219c72f513cab6d158564c9bcaa6886ce06b7ae3d75976b4a3f1b49561c799bbda80bda84cf378e017aa2
+EBUILD hdl_dump-0.8.6.20060901.ebuild 699 SHA256 8473f373f80227268c44de91ac3a93a4a4801776a216ede8e1151b8c43ad9ffc SHA512 e93e9db6acf82a74d6960cc4d52ad670e007c9845eaa85bb92f5359ee56279e52f4c2e4601714ee689f957ff667578c9c769582199467f81f99e400824aa5df0 WHIRLPOOL fda3f73adfa8dd89d1ad2ac99ae0e9be89e392f2fb7164c4f6f15b09b6ce475b73be7c1ed821d12a89fd347aba43b3296d6859dc2ab73a34a1792eb5c32165f2
+MISC ChangeLog 2497 SHA256 7751098c322bd75370086bcd7b55d28121ee4975c9b2ce07ad9af112be2e8745 SHA512 b23fc7adfa16be4adcab0bf10e5630c92b2f94a6e4be2a248c84ba2fe784eb2a0c6f0f871df348f256dfce15748453320d433377f85f8197e3e6cb185a6d53d1 WHIRLPOOL b453604dfeca177176bf5e69f6d1810ae654f717c20adb6a5789a51c52c1da92784e3f4298c3028d52e934e4d2e5ffc0fd9de40088250ee554b489c469c2384d
+MISC ChangeLog-2015 1451 SHA256 9eba5da85ee8c059fb982850817265e6121594eacee6ec0e3caf7fb0aab1914f SHA512 8c44080eb3802dfb7e4797d2022050dca98676635f0744315332169e2b90b2e1015bbbcbd8ae2267769e9f1f768fc902a0b32be03bba60dc8a643da7a0d1a2c0 WHIRLPOOL 318eb323ae69c79d7a33c9a1f896d0f5dfb2cf32340f0f1c26d1514deb8b075830e2e7831bde1d47c2c5f9161b57ff5d8196980ea1da9b180c93c7183fce7f38
+MISC metadata.xml 324 SHA256 5002873c11394f6bfd43e1b5fae2fbf53de7e6658fb89a789f163b099a707b7f SHA512 769e4c41f66ce942547890212b3638695b297c3b3a5344b72a2f741139fafd6cd6a7af35a1899630d9695bee18acbdda743964555a620b2011d99020f75b2045 WHIRLPOOL 879d083ab2950adc7bbac86416eeb6bce407f2e10a2de0fc80e8e97fa34a891074fdde5981ff8b3918adfe28516dc47bbf3772bb52a95f3f64cc012246c99392
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..888e364f5064
--- /dev/null
+++ b/dev-games/hdl_dump/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-games/higan-ananke/Manifest b/dev-games/higan-ananke/Manifest
new file mode 100644
index 000000000000..1a437b796c72
--- /dev/null
+++ b/dev-games/higan-ananke/Manifest
@@ -0,0 +1,6 @@
+AUX higan-ananke-094-makefile.patch 1080 SHA256 a9a1371de5b20d472ace3c536fb0371c5af10c94e72e0b7d7bec32441abb7b5d SHA512 d227e478980d987225cee50a632f5282efb8805588f62c020d719c4f828cdfaa41d400ec8ba7a523af72d304bcf6c6e0b9fe6eaea72eb337d885750825de60e0 WHIRLPOOL 402fb5dfd67b6ec7b74422108fe336026dd6c9c930a59304b3ed59c8b5c3118bf4af54085472cfcec04ded2ac1f7ef6eb61c199542f711e1686b8b2624b90a36
+DIST higan_v094-source.tar.xz 882732 SHA256 5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b SHA512 e7e48c76cdc93d2d66db1fa0c71e64903cf4188571b2d5ecb8066dd4e2172a67da4dee68bed6fd0a532b6fd397fa4f537b97de58cc5043a9e970d48d0b66b0da WHIRLPOOL 42e2b628e83b6cb8d87ce82c2e91105b0be06790a1927aa7d52f0b1a181af5d627f467009d15daffd470e3c38a2bb7d67ba84919fb1aa9c8d06ad88ca3163641
+EBUILD higan-ananke-094.ebuild 696 SHA256 b46adbc7ecb6e1751eb397f7af70fb2b0a5683cc9b1b82dae8f02847118a6a3e SHA512 597df8cc24e7b17ae4e4f001d0aebf256da44af8008326952c0286412844ea2d6e1ec15a4f1b635c1cc9768ad0e8fe15b51b09469fff041babce5bed0a2af31a WHIRLPOOL e93c50770cd34c4f12c248f2fa5f6e81aedd720a10b944f47bb3ac058e13840d01e1a8d1ae521acf15f7a66113c21ac597db34f1b07aee674f7f4bda34ef2b1f
+MISC ChangeLog 3240 SHA256 1dc19e602d951e289351d55b3fd7182ae521ff308a98d4cf28f748d666ca9571 SHA512 322b0c3245156d3e9db165317eb1a8fb7a74c49d80e305301b891373260a0ff4d61d9c3b5a00ca2bb8b0642bb9a8b90cd8014e9589f723f30c6c238ce8155a74 WHIRLPOOL da448c77297e9c187d9fe37a0fd1522bd8b2341b435f5a41ddbc4b2669910861b7dc0db6ea4a690ae9e29cb7f0761842c676780a142680a2c5b6a5fb24d72312
+MISC ChangeLog-2015 1234 SHA256 ef0ca3c7c3d6ca33f3e73af41d1e49b82d91e8baf8b7a8e22c7929787b4e28f1 SHA512 ce967efbf87de5a47ce661203675329d6972aa432dfb1c8b4442bc0133ffb6ee7ea1e86c42950f268060ace0e782b3d8ec0cd47a3dbfc9c41675db27bc7c0e60 WHIRLPOOL bdc25e1d4435e80d348dd539a2f44e85ac36d1aab57e1df69cd73575fab42a8d36b0df24ec0749316dafc042b8e4117eca5e4c5ffb3055e1054ea2e3e6cb7e1c
+MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
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/Manifest b/dev-games/hlsdk/Manifest
new file mode 100644
index 000000000000..dbaada56dc09
--- /dev/null
+++ b/dev-games/hlsdk/Manifest
@@ -0,0 +1,6 @@
+DIST hlsdk-2.3.tgz 4542895 SHA256 895a3295caed8c4f9de0283dcbd664b4c6038514974c447afe91f0dd3990e90c SHA512 fbcaf03240851903ad18971acc5a522a4ad9fd48087e1c85b7d2c12999702f69d0b487f3a2f51157859f4373cecc57415e8e048facd874a45553b9b609b2df6b WHIRLPOOL 2cc22ab759ae273c04d479dd7d6533ae156caaf1ca73e1aabdaec5a1fba9e49ff192308258cafca9ae030dc3a222618852e259a3002a43677a5d272ede5e5552
+EBUILD hlsdk-2.3-r1.ebuild 550 SHA256 f7a76fb4131b75638f8377612cd6f37c9701f1cea355015381ee7c2255aac421 SHA512 ec01cfee8d8cd4c8992f46679b82aa02b36cf50b2544f307523a59953ac864fe624456fe3ec5f98a09e0d2bb980b576e0d65887bd21491fb0f346df3fefac484 WHIRLPOOL 4e415ecba8f605717de7f56a64c6e7d2d893b635da1ffd8852f6c1c55ef5a841a1ea75a85381ee4f05fbd806e08ef9043e578a6085e30a2f262f033dcfd00479
+EBUILD hlsdk-2.3.ebuild 568 SHA256 eec86c6fd39131444d8b81e677b7df77816b9df9181b924c51bbe5abc3ab348f SHA512 afb7041fbc3526a8c2c1dc0c80b04308efdb69e7c94d968348efb0638939663f9f674110901a25d6a06f5baa367133cc3e93d8fc99ddcdeb1d8378083238ffb6 WHIRLPOOL 2b910e45212525731894747b917d6cfe1f76c2e3ea90bcd0c58e6e61c977475de08d669b19c59d6d345927808bd2cf371008fcb8c7f32fe323939bb2c7f4dc20
+MISC ChangeLog 2663 SHA256 c24825a9f9aec140ee69e881b18f81f4291c8c2431446a9e9c144f77aca8e71e SHA512 22316d11f437042ce64e4a77ad41b5d12172f9181b9114d63c7e9177f372fedf3481e740535df23337159e833d88418f7ce8024a1b083da65a930e57d60f7b3e WHIRLPOOL 37f17f4da18355ff9ce467b403fec71b7508a1be956806ee2128ff3f8825c2e9edb5835fdf60bc58dcb1a3633ffa59bf785b6e560be97eed716d8d03193db0cb
+MISC ChangeLog-2015 590 SHA256 83a0be31ec95f5a02c0317f3aae1581ba0f2b621365d66fb1c41eaa7b1780d36 SHA512 d1d620175921e17071510961690062096c06f992a4746c2a9ec2b27ec074611427bc9c1d56dccb671703eab4f81ea7923e5456ced8c885bf3a846f1714aef5a5 WHIRLPOOL ff6491f9128d79b41d5e6ad7f35d415bab8cb7314cffbfd451f7d21e7ead949795528b670f4a711b3e1965826d64f7f0b07b471f6e296d5adbbd552d55c9698c
+MISC metadata.xml 791 SHA256 7efedba299429616f7847a6de5f8aab8b5a11138a13b065955330693f54bb904 SHA512 665bcb56912ac4ae599138bf80eb7d88c314fab9bf7b87200e977c788b30a4b05576f9b2c8f85167c85c655b671683bf7159dec624f7bbfdf0e7f902eefa3fa2 WHIRLPOOL bb844e115408fff12a7d98907edf3325f122490c794939e5a378e0c9b200e5345c773a1f0ca574da453bff1fa665da72dad71c06b97b0f784481fcb9e8326918
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..02aa121b4bc3
--- /dev/null
+++ b/dev-games/hlsdk/hlsdk-2.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 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/hlsdk-2.3.ebuild b/dev-games/hlsdk/hlsdk-2.3.ebuild
new file mode 100644
index 000000000000..0c4edf9bee07
--- /dev/null
+++ b/dev-games/hlsdk/hlsdk-2.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit games
+
+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() {
+	find -iname '*.orig' -exec rm -f '{}' +
+}
+
+src_install() {
+	insinto "$(games_get_libdir)"/${PN}
+	doins -r multiplayer singleplayer
+	dodoc metamod.hlsdk-2.3.txt metamod.hlsdk-2.3.patch
+	prepgamesdirs
+}
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/Manifest b/dev-games/irrlicht/Manifest
new file mode 100644
index 000000000000..5bf0f931a600
--- /dev/null
+++ b/dev-games/irrlicht/Manifest
@@ -0,0 +1,17 @@
+AUX irrlicht-1.8.1-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633
+AUX irrlicht-1.8.1-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b
+AUX irrlicht-1.8.1-gentoo.patch 3813 SHA256 e1ea240dc0746036cff6e6f151389f650d8b4425e3a91fed5383200f51c86475 SHA512 b2ac774f6b2079158d94e5c13c831b7f53fbce3953684ae3d797fbfb3d313b2d35fefee807daea8aa24374ddb47bbd2fa65577982b9a9123178f50561ea1d8de WHIRLPOOL b9f2c2db21aeaf59714ea91578a702e7cc8beb6ddef3d6a20dfaaec44fccd06638ac854b72a2b6fcb52f11213dffb8c610e7ef4f7b3f0f1f513aa27f00bcfbe5
+AUX irrlicht-1.8.1-jpeg-9a.patch 484 SHA256 ec5346a4f46f3cfbdd21932038e8eacfb267fc5b1fae114ab613188ded638fe1 SHA512 bc865101bf5315a445d09a03cddf25b90c68b06a27a514feefb9bb627320c7295c2f66c53492c4f47ad22e59c0278b6e9bc2381d371045b7766db13c09b80c01 WHIRLPOOL a0b6faa7f822fa7c400ade21d84142dc764662f2091ce9c449316dcd4091a66de5348a779447b77ab0c3a107e673cc0df0b9a7b1bef4a0fbe3b742c65e926a0a
+AUX irrlicht-1.8.1-mesa-10.x.patch 1394 SHA256 d17e8084cb5b458aef85a136b6366e07e615b8dcca18fd7f66a988886d7ab750 SHA512 44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c WHIRLPOOL b8f537dc83460b5f4e40a4296a5c6f9be8fa1f2d771425d582fa6374646eb11c8642cb8ab5af551d9c9d7602dc05ca37386c26ec7e83089bbf30e205aa53a5b2
+AUX irrlicht-1.8.4-config.patch 1332 SHA256 ff09a0fc4073ec98e8ba52743771c79fb8e73a9945a6cdf7a31f22689baaa96f SHA512 deb481b6d9c80264cf9dcd3edb4a83a5d522469b7764a46b7c5de3a9e3b9d93ef2c9cbfa18af2fc258bb424d5485e57ce320afea33445fc30746b0af86832853 WHIRLPOOL ed1fa729b46c601b8d1d11873c8eebbd5298bbc60d1ca423b9bf3ed5ce6197b5b57a6d464393fc06168f8ba7b781a2bf9369523239f366670e509b4bce5e0775
+AUX irrlicht-1.8.4-demoMake.patch 28102 SHA256 f3950fc93cf3ba18350741709667ed950dc1e25f0ce6417fe6a4695963b4d36b SHA512 31ede81f80ae1fb495e433ac31df7653c80ce67908c77d78d240afb5e075a3486c61aca4970951b9cda4357de704b4f3f0797c234e2d1646d917abe211bbfa77 WHIRLPOOL 51655ea6a17ffbad0dbd6e825903416126c513e8d59f8b42d9ec34651ed0bd465a4fd0337fa177fb46862ffc17ec8e1e83d6f8d2d982c9efb64ef8b80aeb5c75
+AUX irrlicht-1.8.4-gentoo.patch 3843 SHA256 051ee3b575dacef71dba1baceeceae65c0a6174bcd69355511b1b91a920bc133 SHA512 72d25edd116a3d98168dba63af68c4d58145d50c665682c934bcf4db59e6ef235ee6ddb4611b6426577db6d0aebf93d26ef09a3e23f6236b798c276ca806a885 WHIRLPOOL bdbea1aebf632802f13e3b075ed5c52946af406fe04195da622a9457f8a2ebc1b8d4652aafc1ce2bece25f9eab187aa06d3d583243d191e3effca75cbbef51b0
+AUX irrlicht-1.8.4-jpeg-9a.patch 514 SHA256 c46479779e02b70bec8ddceea2789658e5d242347fa80c567d0a5db61fc598b0 SHA512 2b1471140f6e40c56d0f2e1504ee796bac139f0b6951298560a7dcdd85b0ed496547aaec67b2bff381a506ec316a26f025e62212c1a819f7bb70f89739de18e1 WHIRLPOOL b5c6447064369df135c4c8e28206ddcbb8c5921b9d10527da23e8167c977e8e1895ab1404796cac44e9e24f150505140589a1ef5147e53e3feed4c217f92bdf5
+AUX irrlicht-1.8.4-mesa-10.x.patch 1394 SHA256 20a0f11141fbe46bc68c6384f9e4ef77cd0c035844a8a9f95cf056d13b44fcf0 SHA512 cdc2d05457cc6bda571d274eab0873abf8233a3e2f3983a2412ecef91994fe75d670078f47a2a16c3aa1de90e2935483894e1774de80c7fceb6db8a786dd5b06 WHIRLPOOL 31bd05df1ba197a92b343777a46030004b330b32f94b1f5cd01bdb58d820fc34879b1448402fdd30f25d19dd2cdfb6910d81a8f363f1a8d0fbb71c40a1597947
+DIST irrlicht-1.8.1.zip 24167632 SHA256 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb WHIRLPOOL c66f0a15575327667cbe82c79919518771e55d5e919c972e64e104a6272b78a20bbb7bbba864722dead4248fb43dd722227181d696eb63e82b4093aaadac132b
+DIST irrlicht-1.8.4.zip 27927144 SHA256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 WHIRLPOOL a5fecbd27968fbd4a5b17b9528388ec0870d1c3ceb85e36bbab40ce30aa61c7f2f387df160808dbaafa4488abeaf238c7cf93994b380a1b2c3a8a5c421949be1
+EBUILD irrlicht-1.8.1-r1.ebuild 1615 SHA256 b543560e9674b6167392174729a2c7d824d8d8d6972d0d84bdf2133563a596d6 SHA512 c9348f931c7b0097162d4c36fd4b9a880c2a299a6521545d856f70c45a661bf27ad0aa9d689dbf139364051e21110e3e4f1965e3f1b5c4380e42724cc58fb257 WHIRLPOOL 6f8989c189c9bbef947931731f20fbf3748d80b96fb371061fe6a43ad35d7aa5ee82624a5ab905d6895ab3401d0437171d5d58531483cb571446c2124ee6c73d
+EBUILD irrlicht-1.8.4.ebuild 1694 SHA256 a7254f3cb18b03a6cc13e9a1c14b83e12a761e424eb8f1e7e42b159dac341253 SHA512 78bd3f89ceb6900a42eb353f274d6655d53142dc8ba86c618fdc076315f5a273bc7fe2adbcf5704282b3bf184a7b3170ea02e78de040447aa1cf83e19a782ebc WHIRLPOOL 52cb5195fc76604d00d56e15622de9925bcd84bbc069981ba4e2b559921ed1de5363de56b4a4fa93d973e16faf2542c98bdb77c4d87207e17c5558f6c035a9af
+MISC ChangeLog 4179 SHA256 ceceebee35cd6fa15b383999d181a3170066b574bc2238f17639c677b35a70b7 SHA512 80ea9c43266a34f48178b9f3c3dae0c46415b775d8cce2132c26d8b59d8a88772b2ab78093cc0e6e12a9d8f80f062430ec9933c41c77b33460a6f4a9135c1ed6 WHIRLPOOL dabd647f760c7dd60a027437a1d3300b68aafa837602565a560c0116187b5a422cba53a797dcd7c953682ab8eca001a6b748180b24a204c886e1b8bfdb5cfa8c
+MISC ChangeLog-2015 12585 SHA256 0eb47ae0efcdb3caefedb3856b121a8318349157dbfd0d2d26fb2bbe7ed082b3 SHA512 bf044eb47c500db31b5fa7dc915b726d1968220b9f6cecbe70e93b418cf35087c5f8b9a6b5d5678b445ed47dd1ce373e39494858814160ca4867e202be463343 WHIRLPOOL 3442532399fc647f6a235dae175f71fcf54caa50530b6c544469df1930d4000dda6ccdddbaeb6634413b893b8860467ab76d2ae463065a4fbcd073ad53fa1e36
+MISC metadata.xml 964 SHA256 6d4f138b3aaa739da979224a68a8073c3faf538ecb3cdc28d4f2c7cef37da901 SHA512 858c0cf4a2ac22ca6728a1449e59fd7a8c098a01587cd039e725b26ee71feb13217036f24bb5de2cbde6f27855eeb0347b43887a56f64a6f7a98f47b0f481503 WHIRLPOOL e2881367b04e7b3867be89e544c82e5fe9d493440b4706c57fccbfb822edaddde119d5a57e5e3edf760e0725b1c97321df4139b9a66dd0c753018eff57c4fdd0
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
new file mode 100644
index 000000000000..5cb2a75b7872
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
@@ -0,0 +1,29 @@
+--- include/IrrCompileConfig.h
++++ include/IrrCompileConfig.h
+@@ -245,7 +245,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif
+@@ -261,7 +261,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #endif
+@@ -598,7 +598,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
++//#define _IRR_USE_NON_SYSTEM_ZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+ #endif
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
new file mode 100644
index 000000000000..27f553dfdb21
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
@@ -0,0 +1,764 @@
+--- examples/Demo/Makefile
++++ examples/Demo/Makefile
+@@ -2,8 +2,9 @@
+ Target = Demo
+ Sources = CDemo.cpp CMainMenu.cpp main.cpp
+ 
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -Wall -O3 -ffast-math
++CXXFLAGS ?= -O3
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS += -Wall -ffast-math
+ 
+ ifeq ($(HOSTTYPE), x86_64)
+ LIBSELECT=64
+@@ -13,7 +14,7 @@
+ 
+ # target specific settings
+ all_linux: SYSTEM=Linux
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ 
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
+--- examples/14.Win32Window/Makefile
++++ examples/14.Win32Window/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/12.TerrainRendering/Makefile
++++ examples/12.TerrainRendering/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht 
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/11.PerPixelLighting/Makefile
++++ examples/11.PerPixelLighting/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/08.SpecialFX/Makefile
++++ examples/08.SpecialFX/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/06.2DGraphics/Makefile
++++ examples/06.2DGraphics/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/04.Movement/Makefile
++++ examples/04.Movement/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/16.Quake3MapShader/Makefile
++++ examples/16.Quake3MapShader/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/15.LoadIrrFile/Makefile
++++ examples/15.LoadIrrFile/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/02.Quake3Map/Makefile
++++ examples/02.Quake3Map/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,7 +18,7 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
+ static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
+@@ -25,7 +25,7 @@
+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc
+ static_win32 all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32 static_win32:
+ 	$(warning Building...)
+--- examples/19.MouseAndJoystick/Makefile
++++ examples/19.MouseAndJoystick/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
+-CXXFLAGS = -g -Wall
++CXXFLAGS ?= -O3
++CXXFLAGS += -Wall
+ 
+ #default target is Linux
+ all: all_linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/13.RenderToTexture/Makefile
++++ examples/13.RenderToTexture/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/10.Shaders/Makefile
++++ examples/10.Shaders/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/09.Meshviewer/Makefile
++++ examples/09.Meshviewer/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS +=  -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/21.Quake3Explorer/Makefile
++++ examples/21.Quake3Explorer/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp sound.cpp q3factory.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
++CXXFLAGS ?= -O3
+-CXXFLAGS = -g -Wall
++CXXFLAGS += -Wall
+ 
+ #default target is Linux
+ all: all_linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/03.CustomSceneNode/Makefile
++++ examples/03.CustomSceneNode/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/20.ManagedLights/Makefile
++++ examples/20.ManagedLights/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
++CXXFLAGS ?= -O3
+-CXXFLAGS = -g -Wall
++CXXFLAGS += -Wall
+ 
+ #default target is Linux
+ all: all_linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/05.UserInterface/Makefile
++++ examples/05.UserInterface/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/01.HelloWorld/Makefile
++++ examples/01.HelloWorld/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+ 
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS = 
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+ 
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+ 
+ #default target is Linux
+ all: all_linux
+ 
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- examples/18.SplitScreen/Makefile
++++ examples/18.SplitScreen/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/07.Collision/Makefile
++++ examples/07.Collision/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/24.CursorControl/Makefile
++++ examples/24.CursorControl/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+ 
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS = 
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+ 
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+ 
+ #default target is Linux
+ all: all_linux
+ 
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- examples/25.XmlHandling/Makefile
++++ examples/25.XmlHandling/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+ 
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS = 
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+ 
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+ 
+ #default target is Linux
+ all: all_linux
+ 
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- examples/26.OcclusionQuery/Makefile
++++ examples/26.OcclusionQuery/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
new file mode 100644
index 000000000000..ccbf2cfb921e
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
@@ -0,0 +1,46 @@
+--- source/Irrlicht/Makefile
++++ source/Irrlicht/Makefile
+@@ -46,11 +46,7 @@
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
+-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
+-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o
+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
+ 
+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions
+ EXTRAOBJ =
+@@ -61,18 +57,16 @@
+ 
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
++CXXINCS = -I../../include
+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
++CXXFLAGS += -Wall -fno-exceptions -fno-rtti
+ ifndef NDEBUG
+-CXXFLAGS += -g -D_DEBUG
+-else
+-CXXFLAGS += -fexpensive-optimizations -O3
++CXXFLAGS += -D_DEBUG
+ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
+ endif
+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+ 
+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC
+ sharedlib sharedlib_osx: CFLAGS += -fPIC
+@@ -88,7 +82,7 @@
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+ sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+ 
+ #OSX specific options
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch
new file mode 100644
index 000000000000..90ed828d1a99
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/show_bug.cgi?id=520746
+
+http://code.metager.de/source/diff/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp?r2=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404823&r1=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404320
+
+--- source/Irrlicht/CImageLoaderJPG.cpp
++++ source/Irrlicht/CImageLoaderJPG.cpp
+@@ -66,7 +66,7 @@
+ boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
+ {
+ 	// DO NOTHING
+-	return 1;
++	return TRUE;
+ }
+ 
+ 
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch
new file mode 100644
index 000000000000..e90ff36443a0
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch
@@ -0,0 +1,40 @@
+From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
+From: hiker <henrichsjoerg@mgail.com>
+Date: Wed, 26 Feb 2014 11:13:03 +1100
+Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
+ problems.
+
+--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,6 +21,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 		#include "glext.h"
+ 	#endif
+ 	#include "wglext.h"
+@@ -35,6 +36,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 		#include "glext.h"
+ 	#endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+@@ -48,6 +50,7 @@
+ 	#define NO_SDL_GLEXT
+ 	#include <SDL/SDL_video.h>
+ 	#include <SDL/SDL_opengl.h>
++	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 	#include "glext.h"
+ #else
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -60,6 +63,7 @@
+ 	#include <GL/gl.h>
+ 	#include <GL/glx.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 	#include "glext.h"
+ 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
+ 	#include "glxext.h"
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
new file mode 100644
index 000000000000..0c51ffe884b9
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
@@ -0,0 +1,29 @@
+--- irrlicht-1.8.4/include/IrrCompileConfig.h
++++ irrlicht-1.8.4/include/IrrCompileConfig.h
+@@ -245,7 +245,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif
+@@ -261,7 +261,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #endif
+@@ -598,7 +598,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
++//#define _IRR_USE_NON_SYSTEM_ZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+ #endif
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
new file mode 100644
index 000000000000..e46841d8f43b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
@@ -0,0 +1,764 @@
+--- irrlicht-1.8.4/examples/Demo/Makefile
++++ irrlicht-1.8.4/examples/Demo/Makefile
+@@ -2,8 +2,9 @@
+ Target = Demo
+ Sources = CDemo.cpp CMainMenu.cpp main.cpp
+ 
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -Wall -O3 -ffast-math
++CXXFLAGS ?= -O3
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS += -Wall -ffast-math
+ 
+ ifeq ($(HOSTTYPE), x86_64)
+ LIBSELECT=64
+@@ -13,7 +14,7 @@
+ 
+ # target specific settings
+ all_linux: SYSTEM=Linux
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ 
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
+--- irrlicht-1.8.4/examples/14.Win32Window/Makefile
++++ irrlicht-1.8.4/examples/14.Win32Window/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
++++ irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht 
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
++++ irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/08.SpecialFX/Makefile
++++ irrlicht-1.8.4/examples/08.SpecialFX/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/06.2DGraphics/Makefile
++++ irrlicht-1.8.4/examples/06.2DGraphics/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/04.Movement/Makefile
++++ irrlicht-1.8.4/examples/04.Movement/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
++++ irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
++++ irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/02.Quake3Map/Makefile
++++ irrlicht-1.8.4/examples/02.Quake3Map/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,7 +18,7 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
+ static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
+@@ -25,7 +25,7 @@
+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc
+ static_win32 all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32 static_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
++++ irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
+-CXXFLAGS = -g -Wall
++CXXFLAGS ?= -O3
++CXXFLAGS += -Wall
+ 
+ #default target is Linux
+ all: all_linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
++++ irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/10.Shaders/Makefile
++++ irrlicht-1.8.4/examples/10.Shaders/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/09.Meshviewer/Makefile
++++ irrlicht-1.8.4/examples/09.Meshviewer/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS +=  -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
++++ irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp sound.cpp q3factory.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
++CXXFLAGS ?= -O3
+-CXXFLAGS = -g -Wall
++CXXFLAGS += -Wall
+ 
+ #default target is Linux
+ all: all_linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
++++ irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/20.ManagedLights/Makefile
++++ irrlicht-1.8.4/examples/20.ManagedLights/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
++CXXFLAGS ?= -O3
+-CXXFLAGS = -g -Wall
++CXXFLAGS += -Wall
+ 
+ #default target is Linux
+ all: all_linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/05.UserInterface/Makefile
++++ irrlicht-1.8.4/examples/05.UserInterface/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/01.HelloWorld/Makefile
++++ irrlicht-1.8.4/examples/01.HelloWorld/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+ 
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS = 
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+ 
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+ 
+ #default target is Linux
+ all: all_linux
+ 
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- irrlicht-1.8.4/examples/18.SplitScreen/Makefile
++++ irrlicht-1.8.4/examples/18.SplitScreen/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/07.Collision/Makefile
++++ irrlicht-1.8.4/examples/07.Collision/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- irrlicht-1.8.4/examples/24.CursorControl/Makefile
++++ irrlicht-1.8.4/examples/24.CursorControl/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+ 
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS = 
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+ 
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+ 
+ #default target is Linux
+ all: all_linux
+ 
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- irrlicht-1.8.4/examples/25.XmlHandling/Makefile
++++ irrlicht-1.8.4/examples/25.XmlHandling/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+ 
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS = 
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+ 
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+ 
+ #default target is Linux
+ all: all_linux
+ 
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
++++ irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+ #default target is Linux
+@@ -17,14 +18,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
new file mode 100644
index 000000000000..d40a7da18743
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
@@ -0,0 +1,46 @@
+--- irrlicht-1.8.4/source/Irrlicht/Makefile
++++ irrlicht-1.8.4/source/Irrlicht/Makefile
+@@ -46,11 +46,7 @@
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
+-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
+-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o
+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
+ 
+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions
+ EXTRAOBJ =
+@@ -61,18 +57,16 @@
+ 
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
++CXXINCS = -I../../include
+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
++CXXFLAGS += -Wall -fno-exceptions -fno-rtti
+ ifndef NDEBUG
+-CXXFLAGS += -g -D_DEBUG
+-else
+-CXXFLAGS += -fexpensive-optimizations -O3
++CXXFLAGS += -D_DEBUG
+ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
+ endif
+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+ 
+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC
+ sharedlib sharedlib_osx: CFLAGS += -fPIC
+@@ -88,7 +82,7 @@
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+ sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+ 
+ #OSX specific options
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
new file mode 100644
index 000000000000..2c6f7ddeb93d
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/show_bug.cgi?id=520746
+
+http://code.metager.de/source/diff/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp?r2=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404823&r1=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404320
+
+--- irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
++++ irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
+@@ -66,7 +66,7 @@
+ boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
+ {
+ 	// DO NOTHING
+-	return 1;
++	return TRUE;
+ }
+ 
+ 
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
new file mode 100644
index 000000000000..145d543b8ad0
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
@@ -0,0 +1,40 @@
+From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
+From: hiker <henrichsjoerg@mgail.com>
+Date: Wed, 26 Feb 2014 11:13:03 +1100
+Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
+ problems.
+
+--- irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
++++ irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,6 +21,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 		#include "glext.h"
+ 	#endif
+ 	#include "wglext.h"
+@@ -35,6 +36,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 		#include "glext.h"
+ 	#endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+@@ -48,6 +50,7 @@
+ 	#define NO_SDL_GLEXT
+ 	#include <SDL/SDL_video.h>
+ 	#include <SDL/SDL_opengl.h>
++	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 	#include "glext.h"
+ #else
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -60,6 +63,7 @@
+ 	#include <GL/gl.h>
+ 	#include <GL/glx.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 	#include "glext.h"
+ 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
+ 	#include "glxext.h"
diff --git a/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..12713536b7eb
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib 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"
+
+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-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/Irrlicht
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	edos2unix include/IrrCompileConfig.h
+
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-demoMake.patch \
+		"${FILESDIR}"/${P}-mesa-10.x.patch \
+		"${FILESDIR}"/${P}-jpeg-9a.patch
+
+	sed -i \
+		-e 's:\.\./\.\./media:../media:g' \
+		$(grep -rl '\.\./\.\./media' examples) \
+		|| die 'sed failed'
+}
+
+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/*
+
+	dodoc changes.txt readme.txt
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples media
+	fi
+}
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..b56191e612b9
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 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"
+
+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-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/${PN^}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-demoMake.patch
+	"${FILESDIR}"/${P}-mesa-10.x.patch
+	"${FILESDIR}"/${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/Manifest b/dev-games/libmaitretarot/Manifest
new file mode 100644
index 000000000000..6466efc848e9
--- /dev/null
+++ b/dev-games/libmaitretarot/Manifest
@@ -0,0 +1,5 @@
+DIST libmaitretarot-0.1.98.tar.bz2 158060 SHA256 054079a99dcd9de3c6488f897fbce6cef36ef417b48b0ebc1e3de3ae4bf997b3 SHA512 1626f7cd8d53be97b70f4258e83fccefc8edc0605e8850466e94a09f9cfbecf9f763ca7b9154f1fb77da15e9856398b8fce12b12064463a0a9293f8273e95d90 WHIRLPOOL c8c95ec36329cfa38baaf2928c4a143cff89c80e8adf6903c5a23391b1f8bcd28a0e3d4a9445242d5aba0dbb2cc68be80a567aa04befe331d30da09c0b9711a3
+EBUILD libmaitretarot-0.1.98.ebuild 444 SHA256 1ddad467174ad29a96147d6f32c1472905363a2f329ee337b48fc60e3bfa2e9c SHA512 ef0d212322583dfb722bb07806380e1e67277ced204cf24691e5d154bfc8085bcf92a2c0594a9fa4a10cffbf87e97ce3092a78e77d4bbeac1793c883bba9cb6c WHIRLPOOL d8b50666c7963c6605cc36ba4ec7b969e72616c88c805a6bc44db6cd5064c5a2d4db66b87ce398afff58184439df038a9b030199ab694c9a6be2becbcdaa498b
+MISC ChangeLog 2567 SHA256 e3adf63e1751cbdfc65fc1484bb7dd838b13ca585e5e8d69e443562c5432c81d SHA512 041c6743291caf3abdd316e8b36e689bc12b6083648f2b9bdf19dab68d9e458beab169dbad03acd24e00fd78ca372ce3bc6f60bab57e0aa5359f3f505779cf8c WHIRLPOOL a9ef310b2a92534242f1bbeb6dd7cbdcf348429cf6ec14973e670095a6d34831d9f67630b30416e9454671f0833057a4cd5b8b23ee420ac983958db1fa5485ae
+MISC ChangeLog-2015 1064 SHA256 9f9a5551a018fa13170ffbff2c981002ec99ece60fc0d325988e183b6f985ed7 SHA512 0b736757eb565af572bcd804ecaa9b420fd7a19d5798355cc8f691ae84b1a9a5850fd4c40457729f99bfd23c33e672ed9282664ae7c159f3475b59d6dfbc752e WHIRLPOOL d2270ab186f21de8533c5880649637ad73a09f7c545c2fa2e7b24527a1af35fc5aaa8643c10e88909477aeb038774de782ae07368d1942e278c1d9e1b44c13c2
+MISC metadata.xml 899 SHA256 954aa976cf6b50551916cfa4cd893f7a18d9e02a896341fc7964fb114db63e4f SHA512 091676b440e79b36ae51a0e8807e50351dcef526ff1f22872e43a0065fe87c43beee8db06ede2c1b118b55c585f30ec83cd679bd74f101e9b03760d1e1c65bc3 WHIRLPOOL 401818fe79fecb5f2f0b6adf5ba815028e1354155bf204721fff6bf56f33fdf2f84ff84971aebf16cfd1b8d2d35e4310b2ca7045d7b5a53545ce067d0f243c15
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..ddaeb89d9484
--- /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/Manifest b/dev-games/libmt_client/Manifest
new file mode 100644
index 000000000000..476cdc003e2a
--- /dev/null
+++ b/dev-games/libmt_client/Manifest
@@ -0,0 +1,6 @@
+AUX libmt_client-0.1.98-format.patch 2325 SHA256 c4213eea1b0b3906b2aa9fd79d145b25e9b77aae5e5ac37003689085c5ccb4c1 SHA512 c4ee6b5a5ef2a62f8022fe6672c2cf9769e9f120fad3abcbbd86c1ff12bc66c5d36ba285b8576eb410cb337c9bbb3e11c9941761a024f0d445b143a1d3de4d65 WHIRLPOOL b2977751e6a2d767440204ca9f739b10de67b3c54594c12be5bcad3957d5be7f65d0eed27745f8400433d1572293dd75841ff5c1c2cbbeeba3e67cd51ce9027b
+DIST libmt_client-0.1.98.tar.bz2 146319 SHA256 e9f9fab225a8fb6462b8b32737253925735a1069383574a324ef0cd35330b71c SHA512 1eb53bd36a171dbc3138942ec8314aaf8a71ca207060ea6d7499d18c2680fe8ebc822d8ec9843675a7c329039d2c985783f239b74b13c004e47a38250a8c4411 WHIRLPOOL cde4fafc73d675ebc53b93c93ccae435e39e7a279de22ed709d6a06fa7cc120ca86728f53de9ab940e2f8aaeb724b0fcc468b0fbb87de969e7e2915b103f642d
+EBUILD libmt_client-0.1.98.ebuild 527 SHA256 f7c77e22586f6006bc5a7aee4772af21f35ec9aab04006a7647e8fcafaa2d020 SHA512 f3739072f22a10bd7713ba4a3263c571ecfdc488b6ba0e152fd0be417ebeca8c389ec873974db5daebdaef24c5efe7815d40430059ea9e032c168c461ee7868f WHIRLPOOL 82cbbc17579d36b9505bbc30f676b27e120bd77e2ea2b86010e8fc710556039190bfd66c756475b7aac7dafabeb0c19fe4c69a75bb0f657860f781da2c76e470
+MISC ChangeLog 2756 SHA256 ebffd1bc155717d081d0cf1d162904bd81f5c596971f3a7ad4eaf6d4a7c5a863 SHA512 fd6d49670140aa503d31aa1a2897943950408e83915037e383c8361b8580dc0599ea115bb9ae4309432fe415c1b562e0ae89ffc8bb2093476583175daa477518 WHIRLPOOL a27ea20cbb1d576c4d8ee3bce65f4886a863c0c00f3114485004e45c24f6ef2087329603a24e3341ff889f3abc78e714c638bea40050a112aad7d66148c31168
+MISC ChangeLog-2015 915 SHA256 e1bbb460fee0f07b61a9abc227f427e780f59d8ff2005681d15f55bf61f74440 SHA512 435b2d0c9a1e2abd80fe583dd9fdfc835dab53cd84a0f4ce5667aebe1292b2b60519c39c88b88b180a3b26c3d509b1fecb155ba1ca630d0bf0c04e2a9b56383d WHIRLPOOL 3a6d247a24b2fe2d6c89aa03623069d536b79a084f74b95747a74cb59c1324692ac1ce0ada88a24826fca6b65696e58ab82f17ee26e38b84e222ccb5761c055a
+MISC metadata.xml 899 SHA256 954aa976cf6b50551916cfa4cd893f7a18d9e02a896341fc7964fb114db63e4f SHA512 091676b440e79b36ae51a0e8807e50351dcef526ff1f22872e43a0065fe87c43beee8db06ede2c1b118b55c585f30ec83cd679bd74f101e9b03760d1e1c65bc3 WHIRLPOOL 401818fe79fecb5f2f0b6adf5ba815028e1354155bf204721fff6bf56f33fdf2f84ff84971aebf16cfd1b8d2d35e4310b2ca7045d7b5a53545ce067d0f243c15
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..ddaeb89d9484
--- /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/Manifest b/dev-games/libnw/Manifest
new file mode 100644
index 000000000000..bd4f5b5b9cc7
--- /dev/null
+++ b/dev-games/libnw/Manifest
@@ -0,0 +1,5 @@
+DIST libnw-1.30.02.tar.gz 317336 SHA256 bf310934f3d77521a6f52474063a7c7c169eb365f597c5223525f3c26116f89e SHA512 5175fe6737dc1a3ddd5e53354435ff0db56ad560f24e330f348190b2ed9e6d2418dc20497dcb64f316572c4c75b298fe12794fde73516347d70e737700f67939 WHIRLPOOL b2e1ebdb8e9c8f33fbdcbf65ac2fc23fe855cdf33109b33f764d1bc159490a08058238bd8a8dfc745f9a94490445b04a194cae3e1ff316f3cecdeeeb59d9fe4d
+EBUILD libnw-1.30.02.ebuild 648 SHA256 445370ce08dd6fcd8efe06a22f6aa9f13ce82e71767e8a1077efa71e041339d4 SHA512 ed38b757ccb6a879f746d926a6ad0028a77dd8250d09bfcac425a4ce2ab41978104714c1d0756ecd7d54b88fbae1d559b1a32e2c29e6161b80ff10b386c65517 WHIRLPOOL 2e5d9a25614e14e6600cfcacc799aa8493012aa340a9c2e6fa3df8f0ea151769999e19ca3a4e22d2f75a4a9ed7c7c4bc7e276cd7464a0f482cafe33ae6edd3d2
+MISC ChangeLog 2426 SHA256 a7a24b843408c00b78f81a1aed50d12954a96421ddede426fffbf8622acf5df0 SHA512 8d87cf087005b5eeb7a0eb39d31c142e33c6480a2ea3716f6a1fde9d28eb12d4093eee180f1fcf16f9cff426d163a6691755aa1188d48cad17b5f8131be3b881 WHIRLPOOL f402a34d5e43c7723d6d6652e3e95c14ade1d2e924a1228ec1b67b12a748736c7e291dd42cd8a172cf6da02177514644c4d62c24fb994d5bf7e807e3f9ceda61
+MISC ChangeLog-2015 1511 SHA256 009860210f2a6a9e464d9d402ae2b4a3a4df36c42409ca29296607a54e2a98e0 SHA512 ed96046d9748ab7475cead1250b0ee6710316fedd20f6af8b33b72ad0242afbfa3698613d52570364b5df679cc0018f17b4fd4086a20570776feb42706702571 WHIRLPOOL 5e6f5a002507164942fd803f6600eca35c2e37cb4be35ecfb587f50c24cc2b0d21cfb36fc735047c13b9e5d7792b7e5157265ce5cfa55d8384915d9fea26df4c
+MISC metadata.xml 1005 SHA256 d492e8b0f5fb415cb4e5507218ae03bc7baeeb1d32cecd446fe519f30250df43 SHA512 126197d5c5117e3a491dfe5c18103a3544ffdef8c6bd8ac300fecb716e4324f2d0ea07183cd648ac552c8a2b2c37a3cb9a33a5a2898596678da88416bd697ab7 WHIRLPOOL 2a991e8a35a2d673553ca9ef1712ffc4e1e02f9d24bbd7db8c805e1e9073c1f82bc51aad6fddbe5a661bf87063b5da8de62d59d785dc5ee19984861480051863
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/Manifest b/dev-games/mercator/Manifest
new file mode 100644
index 000000000000..f8ff7b85ca52
--- /dev/null
+++ b/dev-games/mercator/Manifest
@@ -0,0 +1,5 @@
+DIST mercator-0.3.3.tar.gz 436499 SHA256 04c71d780979a2b43835b8b30879b39c4d7688661dab8e2bf7046ef9e7aff1e9 SHA512 d8f0bcec904c77ceaadd11474a4a83ec4d5e5086f0c878b147b00f3fb3ef2ae6596553d2d4548f943aa280672dde938d34f4d231782b10149190f5d8029e039a WHIRLPOOL 4ecfe2dcd04526bf9b29e76524c1c6a457fc302aa98c504148a958c3ef399eb8e9167dbf5ed29dbdedd0dedab85c624269224cb030b938308df23a71d06c5129
+EBUILD mercator-0.3.3.ebuild 601 SHA256 04a58c097a19254a9d038aa430c00493087833ff60eab33b2e1f935394324f93 SHA512 7bb5521974814adc559303679035d82362353d64d81e16b6d7831296f2cf7cd461b292b7a6c2ecfb3c927c133d50300cc59dc557ed27ae7c850aec58d609c1b3 WHIRLPOOL 2d8fd896eca704bcef44a97095a184d295a31c36864aa975fb826edb367891f0debe6e3cde088fdaddeff7eb4b7e5e779fc40c228cfbad4fba356ee7bff6793e
+MISC ChangeLog 2431 SHA256 cd2a790522d62392ee66abc801aaedfd991a529d9d8f984483b7f9e465037001 SHA512 476cd18b387dff20817ebd2390624b9c14749ed03f31fddb333e8275c14a75f2c08706ba0066f3f83a2918fa3ecc4bd8b3d3162c355eb602bdbd7205a6c0d65d WHIRLPOOL 50567001f460cd00ab12e1daee316e6361326f47f16c863f4ca27a57d991f1cc9aba7f0df70942f4159cd0301fab219a54bfb48950eb52d53cd1f709418d652a
+MISC ChangeLog-2015 4615 SHA256 ecf8199c54de09be56a5c00f7d5fa57bb10c250945aea037d1f21e89498f1aef SHA512 5544a6fe622c69c05b89d7be32c90ddb88d7782f51190808fbf01cf1d2ea6edf072ba20eaf858c004f35b4715cf0d1dbf6ce0e1be832f8a0906c28e848eb8e88 WHIRLPOOL 82d4d9bebab25e1e40d93efe6d5b57e7382fa490380314ce05ed2de0641e6f73ec9efb03934aa88ce64acf886914e7a5baad68b31f348366415631b9a9784237
+MISC metadata.xml 1299 SHA256 3adc1557ce42b9c229d9c7625b392296f83621142aaffbaf248824953068514d SHA512 5c9db3c98c40f56c1859ce211e9a485a70a60dcc05065c7ad7af1bd16cf95b654da6660fafa0e617f99d7159dfe64629ab53d8529015a50b02872c35d698dc60 WHIRLPOOL c7634e0babc87dfc8b69b41f149bc007da96184663add818bfbdd09f1cdab551d579489f2d3f7289ed2fb790fe663f0092f962b176c05d02193d7ff9f3b0eb96
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..b472cf3aa319
--- /dev/null
+++ b/dev-games/mercator/mercator-0.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="WorldForge library primarily aimed at terrain"
+HOMEPAGE="http://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/Manifest b/dev-games/mygui/Manifest
new file mode 100644
index 000000000000..f834928eb07a
--- /dev/null
+++ b/dev-games/mygui/Manifest
@@ -0,0 +1,8 @@
+AUX mygui-3.2.2-FHS.patch 1209 SHA256 22586a7d4c73372b2251a6381a4df8e4baea02df0ee59f966c23087dbe1184e4 SHA512 21aba7d654a7197423bdeaa06fa79219d850c76248546227ece1f4916072289f0ebf68a9ad9a4569a1d5dfc15cf86762db3c0d4d58f4c233c1b4293ffb35e50e WHIRLPOOL e039bf19f361b25d90e49f8c69d482adc183e0a42c0410c72178905db387a01c03c7db3e164a4c201e28cffe65b4707f2b456786c2669696de1f374241c65c69
+AUX mygui-3.2.2-build.patch 2801 SHA256 2a18a9cc38f14e77fafeeb57518bf126b5b9ce4e18ae1c9a34513fa225d89ff0 SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d WHIRLPOOL 604c045a20b635fa20c863db4574ca55cffd83a6c86d3190f88b8fe0b6488a08aeed9137d046853e92ae5bd0327f46b269330d54f646ab262a288d214467844b
+AUX mygui-3.2.2-underlinking.patch 398 SHA256 7ae82493e90b9543bf592060348adff59b64c5469ea3b3d08a44f416ac27a614 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9 WHIRLPOOL 195a7786c561b9844e8385dd562e336ef88feeff13d1703e246a34bf28a9f6919c9ba9899bbe50b5f2f0b25efc7b5916046bec083f8ddd20168da8b4d3caf890
+DIST MyGUI3.2.2.tar.gz 22081236 SHA256 0a28d7ec8a47993cb68deb48b36331e28f12dd92580b709eaef21d599b67a78f SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4 WHIRLPOOL d79a765f4442a3a07e5cb886ac5f14a3d444cdb8c7d43f6900a8855316f71af643faa2a4a2f04a64d49a36f2e4fb6065292c856d1aaef2bca6ad79a7508d5bad
+EBUILD mygui-3.2.2.ebuild 3706 SHA256 9da99d2c81cc8f7c2b9e2a1f8898db93aff659aa1a1a2f41ce02f559b7cfcc6c SHA512 7a6fd7fda83620ae6dfd8374b7963386a322d2d9572627e48c29575e8c1dbf1cd90d92bfcc6407a401b63086601d8cc3770485e344d0ca65ebe4c2893be23808 WHIRLPOOL c1bacb87210826421ac1e625ebc73b2513cbfee5edbe1194fff3a988557452dadb43d9f5eb979ece11d663b46d9712a8a500570eb24fa0ccba3576a4517db353
+MISC ChangeLog 2654 SHA256 cc48efc8f1dbef6d329c9fdff5252af7b4ca8df4e7e6b9566629604754bcd85d SHA512 d66ab852d3dea3a7efe37dcc0c62a2ce92fa81da48bfbbde40ba0e7d6fc08ae595a0f64469cb70e29b0a2cff2c47329dbf3ffd22e6d4539487b4bfe26e73e41c WHIRLPOOL 68dfab2e7959066c7682294364f556597024bbecd583c55778a16ac16b5add20dd22d91dd7ecab140461294c364ecaed662ed43991168268c7d9f4afb16bb3c1
+MISC ChangeLog-2015 2097 SHA256 133ae144a409d1c3ed80271dd91d016bc81ac65ae28d9f83ce6bbba11541410d SHA512 82ea3ff08a29afd78c771048963a676103f601a69875ce28f0449ceadc3bb2af73eb1d39f5b5af2a54f5ffd0d5c403f239176504aefdb8dc460eac89ed474c5f WHIRLPOOL ec89e6106df08216c4d501edf2556b13ffed5dd19b91cf7657c55564a9fcff5b02afd97d90fab0f60ad571ce40c5de35645abe40ab20f9f859f59bc12d0c0d17
+MISC metadata.xml 2042 SHA256 898846cedce5499c6e7095392e8a0ae9469a81a220c1e5cf215218db6bbc1732 SHA512 76aa0598c2e5505c4c2eead9c59a54849cdad281196d763859aea254a286a7928cf29c7aa4e709f45aabf3e160ec70fd0b92a644519e1ae5b90257f74d6a4844 WHIRLPOOL d48a509f0e2a5aa7dcf0f7f394c1765cbd567fe74346fc2daf5a7753bcd7d62af54ce669dde138160b95885658789e9eea9e2ccefe28b1d67684778ea36a3e14
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..a86d18089e40
--- /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="linguas_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..60ec5b14954f
--- /dev/null
+++ b/dev-games/mygui/mygui-3.2.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 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 linguas_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
+
+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_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-FHS.patch
+}
+
+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 linguas_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 "${D}"/usr/share/MYGUI/Media/UnitTests
+	# wrapper not available for linux, remove related media
+	rm -rf "${D}"/usr/share/MYGUI/Media/Wrapper
+}
+
+pkg_postinst() {
+	einfo
+	elog "ogre.cfg and Ogre.log are created as"
+	elog "/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log"
+	einfo
+}
diff --git a/dev-games/newton/Manifest b/dev-games/newton/Manifest
new file mode 100644
index 000000000000..7e89bfaff6ba
--- /dev/null
+++ b/dev-games/newton/Manifest
@@ -0,0 +1,5 @@
+DIST newton-3.13.zip 61059070 SHA256 333da6211fc9928e077d1624a8dfb03ffe35cbe50ad58c17c46252e1201f81da SHA512 767078222569fa6f3b0564fc5882eaa439b76b636101128f19db5047547b91e4a8be45ba8fadc426345db7784a17a7d1c22dce7e87533cba36fd70d145881f32 WHIRLPOOL 63c2a412e23543daf43f646788dfa9ee1e77a3a9b2ff19d9011055a858f77c090e9df75d0e51e246444d37a5e68315508a1c404b49b474469ec7954f8caffa91
+EBUILD newton-3.13.ebuild 828 SHA256 306bb5f9f0ac383a65ee3f7e64f07e3abc57f36441fb5a0f0a96ec0a5df00201 SHA512 bf29c51f8f4b000e1263c84eef4e07ca2eb23515c6778077c97a871a9ccbbe3b4b7f5a9ec2e3e963081ef527dc9194f5175a995db6bfa59979cf5dad3e6afab4 WHIRLPOOL 059a55a0376320a28ac371790903fe3f714092ebf92aa4a05ae714cd047bc6a8a0fa9289f5482b49473829142fab9a9e1e10ccbfaed7a4bf303656b19eda0fcc
+MISC ChangeLog 3373 SHA256 b2eb41f585f848e58805f860328377fba66709ef969bdb397e8431004bd864ec SHA512 cdd79754a948b4f38a7aed1b02107e431a85a01583b0ecc7ba0f44bacf132870a28811e017b8d41f364aebc9a4eced5e775099d787d5f9fa5ea39cad9c41e920 WHIRLPOOL 36d97db7380551ef3db7a2d48428a1c2c4d668594d54a4557da888f9ddc6f789a60719f7d1975674cc567634746cb00111682772496c548d0ff83fcc62f7999a
+MISC ChangeLog-2015 1880 SHA256 c12b5d80e64e08af6e34be60b96b95e2fdde1ad7491320c738b000bdff10b05f SHA512 ad75cc748beb030ed237af24b05605fe876ad1685fce4aa762a30cb7331e184cc29c946e3309a41be0d7eb1575e59ebd2eefe8cebea812814e8df7baed3cb0d3 WHIRLPOOL 812359f8cb9a09e710d88193f364ab1a2121fc45b3c0959f0d6131135a8dc50feb5501cdb30902148db02b77ec74f31aeb31e36b6eb6c10fdf892c338f0e283f
+MISC metadata.xml 342 SHA256 e1b43df3ff4bca08d6a9097a7d0d90f340e86483d6113b6dc91dfa8685e31d15 SHA512 c7cbedbb073be0d661d134a4e09270aa82232273736a9ad94bf107f551d5511bc6e9849155d01f30342515928b7b1209a4e286437d21bf94151721146340d579 WHIRLPOOL f2d6ca2d9184ca6278d9ba077f5f58ebd31e2dd41e4ae615d43f30b389f06131a47b0c0a052e10a4ed608fa0993f797234180ada33ee9665a35f4729bbcc47a2
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..8d1e3466db5f
--- /dev/null
+++ b/dev-games/newton/newton-3.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs cmake-utils unpacker
+
+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="$(unpacker_src_uri_depends)"
+
+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/Manifest b/dev-games/ode/Manifest
new file mode 100644
index 000000000000..0ae87230cfa4
--- /dev/null
+++ b/dev-games/ode/Manifest
@@ -0,0 +1,9 @@
+DIST ode-0.11.1.tar.bz2 1720088 SHA256 877884a86a3d53f3c5f2e35fbd8a3dc23c20249f0636c76f6ef41f6bf57a03a1 SHA512 1e015231f4d01c68e7539144d197031cca23d4b58ea53733184a826ce23388956c428a53385254e7eed2c5d3fc28224a688eb13be7ea648bd78e186c8f203d37 WHIRLPOOL a77c4a61b1dd551911e87a2233f279ac5e6cdea9abf1704574f2a42ab683a426b7fc2a8e9b422f80ca379532b7d755cf7d28f1a47948dd80444cff8c7796cd32
+DIST ode-0.12.tar.bz2 1816246 SHA256 65c5315a42c725d2da01ea2c1b045583d54e0d1a95e3f7c062e5ba3769f5c350 SHA512 303ffda8afcb89a87d09c44393f590f5646f10e8959ca06746121859ad2407709cd711ab185fed4817a9f74c9ca4ee13d1698a28577211bf65dbaad1141f6fc0 WHIRLPOOL def7dfd7bb9f78db9c593bb99eb635da9868dd05362817ca344e583ca157da87c3e6932b9912684bc3deed2aff9eeb409d57fd9eb388e2f195f9c83b5cccabc4
+DIST ode-0.14.tar.gz 2132897 SHA256 1072fc98d9d00262a0d6136e7b9ff7f5d953bbdb23b646f426909d28c0b4f6db SHA512 356c3edd10274a00516c459035180c74e611fffba42b7674fbf1ee5225a27b54dfeb5eeeaa2ff85ecd2fdea5f634e2732df38333b58c4a43f7befa25ba321927 WHIRLPOOL 542867795477b03dd3268ee5e9d54c86990b67016084b8ef68364615fc0eb6e7f0264b5180e7c4bc0ef972234ede26ccb652505b95958e412286addfa5b56591
+EBUILD ode-0.11.1.ebuild 1523 SHA256 e08edc4eef4840f195729930058904f7e1dbd0fc030cf297c191f006bfba0484 SHA512 f95c9219f3893d8d50a1f2345bb90c5b4fc5e17d57d9efe95d01521fa2c0f55bfe9b4948530f348da36f72e592bdadad70e31cf092a52aa6bc0d8fe4d20060d6 WHIRLPOOL bcaf86951a3d76a2d7cca570dfc5a2085ebf016f99870d930815bc3cd7f4e11acd80694b4b23e45546b622eef872f3b7b9efff3d6af93c7d6adf4959972f0e9a
+EBUILD ode-0.12.ebuild 1547 SHA256 72c132f67f1455ff7255635f0727e97a1ea39f683103846e918b43ac62becbf0 SHA512 5d10471b3c81236437ba5d380f6cf1796a5f5e3a84cb7b5f91dcfd0d6f4409302c6c5b212f3c51c552a0067ae3b94df91bbe6da8a20fe381026c25069cdba0e5 WHIRLPOOL fea2545476fc16f15d00c6122f22b74d33a6de83fb78f04bddb1a95fd990d8b460d0aadfefb377610fe1e6c11ab5ebc452c41d31a89256d871321945409e719b
+EBUILD ode-0.14-r1.ebuild 1645 SHA256 ce06e98214eba21f8c03827ce135f1027e9ddcb034131ccd08f6cc3871928247 SHA512 838033419f3ef7226ea7d5375b812d4dc2e8ecf74741f288b318449ce0724a22f5c2fc85008add57eeb7adf20b1d297a7d2afdc29e69f579b77aa5de3c94a712 WHIRLPOOL 3a2580716ea9f75de10cd00f33af891b47012ac835baf1c4026cc7417f97d7c968da621d1f6935c2b8184389ea458a11ddcc39f221d0f560ff54d9dc8cd64c10
+MISC ChangeLog 3027 SHA256 c8fa0638157bdfeeb6d110759b35be0b2a3c2d11cf3c16ae56a125d59f84dfb5 SHA512 e9ac0ccc1e4363fac86fb20ebda4897fc3a5a7c24772573cd6699b75d2ed1e7284f617a043abf329da019f32e6a5a66e7076711b7fdf2b81b2e222164e395231 WHIRLPOOL 8675ce637650142c226261f6ac1795f3f2639a60732743b8aadaf1f99d21655f5ea2aaf1a5c557be4c1add8a31c87e382a8589a6c8b5a319de0fb872fd02651d
+MISC ChangeLog-2015 8687 SHA256 3de9149ac9056af6dc1008e3047ced16028b864552b6c978b46274bdbd30de15 SHA512 8371b7161f36903c8e7428f5cd3c7674260eb7cf18446cacec5de1dc7a09f8dd7a72667b3e14671350df80c3e8df59d2d8632a37f9823e3bb7190a98397170c6 WHIRLPOOL ff994712885d4ff92b793de9c37fa9a420565454ae7d750162bac5f22262036ff61d3cc6c32d3b92dfbc81473207418e8b1d8f29a5ee6d4921ec94b71d4100bb
+MISC metadata.xml 917 SHA256 6b20a044c4a15cfa2021e4ec5d656a59bb2d886ef4da5e9ee4563f822df84e7d SHA512 46b02d068b5ae22dd6a7cf7e56f4525c377e5c6f35476842f76523c0f0c8582342f46e0972a99195469d59d9f0136b255c35159f91dbe98004cb9c00ea24ca8e WHIRLPOOL 2d5c0dfad1bc3778aa51108a28628fc87824dd89515cd7634d654df25a9debb37c9705d0000445cc84dad65d54b014402b40d1595cd75c7ca458361afff4d69b
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..710cd3dcdb97
--- /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 ppc64 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..3af95e61faeb
--- /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 ppc64 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..08bd2181affa
--- /dev/null
+++ b/dev-games/ode/ode-0.14-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 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 ~ppc64 ~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() {
+	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/Manifest b/dev-games/ogre/Manifest
new file mode 100644
index 000000000000..f916e8ca70e8
--- /dev/null
+++ b/dev-games/ogre/Manifest
@@ -0,0 +1,9 @@
+AUX ogre-1.9.0-gcc52.patch 2392 SHA256 36ffe23eab258a1bba85573b1704379d136b15ccb2d33aa0ab24db54d1a89c42 SHA512 ade6885334698ea2df8a678b3b9058f2cd06aa6c32dd57645e5b28e3f22cbaacc4821bbd661e97ecc426f216114dd9595d9b98c9368061561afea82779a942c7 WHIRLPOOL 6393459415ab178f032a53086b715f31ffa971f892ad266369fb5c623db4b7b79020fcc391d962df6d42ba1584240da8f77c9c9aeff536e058b5bbb4147013bf
+AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 SHA256 331eb7b47513df49edebcd45ad754e1ba11b5f72553876e462f0de6aa7a32447 SHA512 7248e6dba4837765ebf0bc1cd06c07891ea785a415ecbd279f1d6adc88b4a8aae0a12993635d9139697771e8b94739e709e2410754e0e004571d1a48a1bf614d WHIRLPOOL 1a692f70128a5aff5c2cbd6b8d46c3e98fbae540cc4835c75ae704e398dad20f69dc85eb2ef372878703492ae39c349cab2f30058c70978a13643e1fbdcd67c7
+AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 SHA256 b339cc3e2d21700a6849e3c9d01bc56837e6b13ea1ef0365e246fe0993456499 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9 WHIRLPOOL aacabdaa0c7869fd6d6e8ff084b888be0b4a1a4c88a2203dad6145a81193154d84acdbdb5956060d5a2f0dcc9d35fe77bf26cd427baf0371ac1f9df2ba9d2368
+AUX ogre-1.9.0-samples.patch 226 SHA256 6dc4350267714ce564a6f2977eed60646c95e69a2d3abec1273144a8d1f74992 SHA512 7e4a90954940ab87b338c680d22666d5c9a70425e02ab314ca925346862385a1e9ace75b4099b1223da5a658b5311f4557a3f846e2d404764153cdfafb7e5b3a WHIRLPOOL 404ed091248806bd6418aaa530cdc035ce1e6bf3b5d931e93ba3e8e5900f08692301eb2339ea0c760856b8b7622803d4cc1ecf22db62be33d3f1ca97cf9acb38
+DIST ogre-1.9.0.tar.bz2 128098305 SHA256 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde WHIRLPOOL 625cc09ba5a76757b47764c41583584f538eb9561e5bfd546192e06da504aa3924d7070a7dfbe420c4db3edf5870baf5e8b77cc611aa4185806508f79302d6cd
+EBUILD ogre-1.9.0-r1.ebuild 3779 SHA256 737601014400dcc07e66f4b3017f569703eecda810f36c1ab9b63a2d7ecf9d17 SHA512 bf30a6025dee4e09875cb0557a973848415c67925207e2183c206e990b3454dff2ec955585830cb9dcfb97c6654a096a590600ff767030d77de540498f80d147 WHIRLPOOL ff2738a47d0fb797bd11ccf61f3ec21b4ee4173f908cfb9064d75b8e4187b0a966879dc6de12b53e2c798330eceefc596f6648bc04e6862494440ccd92a7d28f
+MISC ChangeLog 3947 SHA256 a96702c5fe785b41f44b8d3a9b31875afeb2f82beed8144d43c5cddc698e3527 SHA512 0e1a6475a119ae81d28f552244236e227173c3bcb573badcf8f02f6eaefdf9c9f7489ec904e95eec4d2f91554688a35bd00fd79b9c2944461b3ee4eef3ab03b3 WHIRLPOOL 88fd1e60b97ec38935947c5f036141dd1cb4da612994669746f145d922eb5f726c71d3c9572f70e79e774fdcb8cb548b4b69da398322874603f0b5c4d98c2150
+MISC ChangeLog-2015 14769 SHA256 f5e52631051f0c33054b4a97d4da67c61136b80807fef520738f2bac700961ba SHA512 c9c8f40e0a8507c1b07ed6a8ea871628f9fd5eb279304e3d56d078a95da282b3b73a1eb775fb4b6cbc89130fe11d7c3c49ea67cb1faab3a1d6acd7e457b51a73 WHIRLPOOL a1ad7516ddd1d5df84a3d8b5bfded71d4c57fa419392f5af75315e8b1ac5ab6b1e85ea01a9486dad651f886bdd8266522389fc2d44ab8f5c6cad2408af555e99
+MISC metadata.xml 5223 SHA256 234652b68c2af651d2d2b367fc9a3643ff70bdf29536ef9ef7421da183a06e34 SHA512 0dc362c5fda467f45c1910baaa4bf51dc48dc01bcb7ae9230008d868d5556227b77c030a0d2110646bcbff8318d4c0c1c2a3a7b112b3f63c0132bcb1adaa61fe WHIRLPOOL c2d92daec07df57a7dd7066813b8574335b15987058b04e6e956f9b47248da48356c75b4c8651695926857f20a6a7310e192c5aa04b92ab91072a2ee7c6af2f3
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.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..812a8bd94cee
--- /dev/null
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2016 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="http://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}
+	x11-proto/xf86vidmodeproto
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+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
+	epatch \
+		"${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_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/Manifest b/dev-games/ois/Manifest
new file mode 100644
index 000000000000..b14580604d3d
--- /dev/null
+++ b/dev-games/ois/Manifest
@@ -0,0 +1,7 @@
+AUX ois-1.3-automake-1.13.patch 242 SHA256 6b009a414f09d5ccdaec20c3cb93fd9fc4f98920eab708731cc0def5a7de4485 SHA512 c3f386d1a6d62df22408bd7c3ed639b87e91ec4fd6a663fafda9f9e399e1c08e38018967301afb432362d6944cbae4828adf22ee6649343be0848449aed6e029 WHIRLPOOL 1c71dfbacbe71146728423c883c8645d3f488c53e8a8274f5e0f9144e2eabfd52a32bc1758fead717c944d2a8efc55d632b5d58a3518fdec0384aa476fd884c9
+AUX ois-1.3-gcc47.patch 1209 SHA256 2846f805123db51759fa4281c1dd715677cc08fbb02d0d5ecd6c09620de0d208 SHA512 499b960c29eb6be7adce5fe475af61f1a4cc6a3cdf8939eb4a690265f9c83923f3d365b8cd312e224b9f1c22606d607a45ecf05efd85edf87be3e89ede93c6d3 WHIRLPOOL 9f6416e9f9716fb120791b073377b088b37bbc6a1e04fbe7d37bee0dc08485f8c68f09a7ee7efc398292ac04553178a0f4551ff1352a261e9b8f4c40c82060a2
+DIST ois_v1-3.tar.gz 136739 SHA256 50fa76d827e119a80e2c86a5196ac4354e556f80b0a4fa440f69e1057b37faa1 SHA512 48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3 WHIRLPOOL 45f0887fd759d0a0a38d6126c1693fabab7724f6835288dd528f1845305ef7eeb4bb78549d0d449e8f2b9714c23b0725e43514565853d3132ff0394981fba197
+EBUILD ois-1.3.ebuild 617 SHA256 1bcafe4a8ab779899436bcf4452f3240b97feb2a33938a99960910c49f0a5fc0 SHA512 a0ae76bb48b80baa47e7a9a6e3e566fb1b86f01ea9783f80bbbc4c4c3aee9709d2f938f411dd2c5dad64319d34c4a515334e7cac3a7a4b0dff8f51bf07e74b33 WHIRLPOOL 385d9b8ae4f2c150df3b2a61443ff3adaf1c50c92354983e598209759852ba101c1443981a3a370f99eb36524f7ace7fc39b6be0de7debf1334c70b4d50cb375
+MISC ChangeLog 2814 SHA256 754d76af33c310f37befe0cb30372df8ae43d17e607e5889fef87442f4e7023d SHA512 210e07292a43c1b875e1b31e4a06926c2173d74f4587970226a7962da915c6dfcd240a3fd3ccdf55dd3d1493520f50f675fc21678684871349c44f0e1859e180 WHIRLPOOL 24771e5c775936bdf411a00f35a8088f9056245334ce950e76d79e64510e011adc1042145be2a3cc70da2aa77c85f1cbe12d24e5e54bfc4051327094cd7d2f56
+MISC ChangeLog-2015 1788 SHA256 0483af098e765bea17079723bc21d5d77b8123bd3f9f24141598bbd7b46a2158 SHA512 f7a4421edf64b24a524204e0f026d1184af883d5f9371bc0531464312ae79671955d02af0c74e0828c0dbf710f8b9b26bc1d7ecfa51f8ee324310ddce3203506 WHIRLPOOL 029675af625901baec2487f9e3449dc984b251f900b661947a05f38b9edd1f02bb13799c12e7774362397bc49e2560132f9e5f934cdbda085c603b1a866be60b
+MISC metadata.xml 328 SHA256 1924464c07a11cde008c8b599f2c7c93ff47cec6220d06302487b71d1324926e SHA512 3ff57cfd54985a9b278904738d8911322385025eb0e4e3f44742a19f5781761fef047e695927b2890e1311f567130cb2efdbae26b3afd69764bb70d48690d70c WHIRLPOOL a1a4bbd3e4f3f8e50f92d83ce3b20c8fd1c9640deb59e86dab7c358a5d2314d830a9370eb64522189a39badc9f6e40d5dcd576f9e6619edc519975232495b46b
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-qt/Manifest b/dev-games/openscenegraph-qt/Manifest
new file mode 100644
index 000000000000..dbb058c8639f
--- /dev/null
+++ b/dev-games/openscenegraph-qt/Manifest
@@ -0,0 +1,4 @@
+AUX openscenegraph-qt-3.5.5-cmake.patch 3190 SHA256 662ecd9f72b17749f3845665a65c0b814c581981bfb900b2c12939e9b5f5297e SHA512 b5350082a9755f73274103b1bc6d5b08954cd6b23e22d15e26e617bd55016ab3df29c0712af775e4e357213456fd8daa4d443f28b06979e76e32ce0df60393a1 WHIRLPOOL 6d885f84d789010d08547f8eea34fde4dcaf6575aae771d4a88e0072c6aebf03b5b7a6e2b61205fa760a0a2eccf5d6c2603f3199ef809db3cc34d981ff581639
+DIST osgQt-3.5.5.tar.gz 1003973 SHA256 3e20af0496615077c2182e676fdee2a141a4216bf2f8af151197161aa3b88d1f SHA512 50faee9a1539c1e29bb1c244fa32194b22cbe43f43980b7c270aa45cd225ac5e3fe9445d63b1efb767c8a2ce8e5ffa417783d1a446ed965b23a06100a241d498 WHIRLPOOL 341844ba09ac7b01615be6bf6ad3bcbc48bb1203b4083aa8a9077e6399e64c7f5057cbf8abef7e265d5d13679aa9000fd7affb0ea86e94e1c1b113f4d8180f8d
+EBUILD openscenegraph-qt-3.5.5.ebuild 935 SHA256 e0bc056cac9d86f91cbfeb66aacaca40c41fb6519820d112e184ab7a3fffaaa4 SHA512 78498f15d294ebe9706cc8d5146a6196345e05da6b1e6cd9f73ada81a55d95a8e4bed9090e643c56b7a346c0af1b08f2ebf45a6eaaf28ee7ff7ab3ea50ec14a4 WHIRLPOOL 774ccbdb09c26d0b9f79a305e7484cd6bc62cf87c472778fd23538e51a00e08684dae36bae328c72f8dbc7b157e5bae092956346b694f038276f94da2ee80868
+MISC metadata.xml 993 SHA256 1af372a4ad34c9b7491d980535622686fdad34f7ebdb1f61e94318830ec55618 SHA512 2e95379c212b8f0a0d5bb4ef3ee16d29dae6b9923fff0d07d01a4f2d08d276a536fa5354ea2e210a641f01d805d5ab543b908e67323040abca40aa3afcfe7aa3 WHIRLPOOL c330fb9561c33b8908cb4942f77cd50827e185ead127d4610df3d362a4e40c527ea97e97573f0ea507b3493ce7d91232213a6098d488229a754d0ca96585a4e8
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/metadata.xml b/dev-games/openscenegraph-qt/metadata.xml
new file mode 100644
index 000000000000..9658acfd106c
--- /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..b0d18aaf7f45
--- /dev/null
+++ b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 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 ~hppa ~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
+)
+
+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..cf5845322fb8
--- /dev/null
+++ b/dev-games/openscenegraph/Manifest
@@ -0,0 +1,13 @@
+AUX openscenegraph-3.2.1-cmake.patch 11002 SHA256 4a524a4ef4982f837f99fcb876b49373be40e142f6ba39b5758d8983665c0859 SHA512 d9ae3d5ef7840eddb972ead8a3d7cf03c3c78b7857e0c6f7c1893eacae4bd581aac9f85ffe4b17cdbc182686eaf0fac52f5985931c6fbeae2afc21f7e5e9d9eb WHIRLPOOL 40428cf1c80ffbbdd1926bee009c63b1b2eadd6c7336fd4e0c235f2c0b56d9f63d06679a2e8ad282d6e6c1c879e186a95a20c3120046a546675016832d01c64a
+AUX openscenegraph-3.2.1-gdal-2.0.patch 1646 SHA256 1b3009d10f3fc4f63167d964226aa59f29c713612ece91d6d118eecffbdf6594 SHA512 108aeccecdc8b043de6e998c4d8f36af21bc7257250c58010f17b01b4d87839aeb5b80c303501db704121bf3dc4b5462ed8d04bd684dc3355791d2b54753f193 WHIRLPOOL d4afca1e86a71436e02001d795e71ae16e71999094b64c2341e1488b2dcf606a7ff7aa0239659ff9d44a1a8915c506ae66369f929f6844d8ed5806f5b81ef097
+AUX openscenegraph-3.2.1-giflib5.patch 800 SHA256 96dbfe83ae4df13f61f87835a40bd51d6107e16cacec4d36899d2a0593985da5 SHA512 c7a7f7076d00735316b0ca576b30bcf542f89db396180898b35d1361181b224883e15c2e16885c055a12e7bcaefb6c87e2cdfca6a7c367c1deb0e51e2a48a14e WHIRLPOOL c2240e150faca47b3b9116c255e4363f5637cc0ff567270197f70fab88a2e6b6042740e1e38731d13e18282002cd02712b3fc7f1dce4e99dac3908717c9eae0f
+AUX openscenegraph-3.4.0-cmake.patch 11173 SHA256 2bd359ba2d4c40d086fc4d00d60432fc08558950551723bfaac727ccbd235514 SHA512 820167c01dcb03ea014cd711398bc1239d13e30189ad001b07bf7bf1139795b5191110b8b28106688224cd285929b4d4628208616c2b8d291f8a482d131a9d77 WHIRLPOOL 453f065d0a1777d9663b160db06d2aa979468f02e828cb5164b202312b9297aa89cdfbb2e3177ba1c4e23e48cbceffe51f1e0f185aacdcb332d61a3579f64bec
+AUX openscenegraph-3.5.1-ffmpeg-3.patch 7660 SHA256 67b701b2479ffb9af30f5dc213dc173c2c9bd9d5ff1d3e6c890bfc157dbd4101 SHA512 1fbb01748841f62262e52244f4f66feaf397150888fbfbf781baf0b31affb93118257a8377c946f17f42291916f4988309a708d0b8e3156057c655d157cc0275 WHIRLPOOL c01b1a3f5b99d3e1a9f6fa9e95429818052c66507151b7a6cef1e0852a8d4fe5ec2f125e9067f09af4fb7fdb3523030af70e848b3a5380a3b7e75adedd83758b
+AUX openscenegraph-3.5.5-cmake.patch 11029 SHA256 7959b7173964224eedd3582f89c43e3c000b5323b2325d927f7c10dab6d3dc0d SHA512 f5cf409acd5d4e11b7f90fca8775e50cf57ae020fdae74e26d05a984726cb614d33f317c5ec985a198865cd445b3a1e8e2f5843af8ba10c890eb332ed9498504 WHIRLPOOL 8cd7b04e5aa45ef34b70190d3f214cda69b08e02105e851b8d4bc2460141b590e6d749d4d101442a91998a29580d6dacd4f0aa7b44ed30e5e468d84cacd5c87f
+DIST OpenSceneGraph-3.5.1.zip 8353019 SHA256 c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0 SHA512 5d419cb2e59efaf1e9b2efdb3a28e1deb5bf8b62a1be2ab4fed06e50064c4c4fb9f1332e65e0bfe0c6d8e99fe0cc134f863ba46965eda9546d125fbd22151057 WHIRLPOOL bf57ea2d55c8cb8d45cc392a4bddd603e9835329b074e14a6d4454695da8cdd899160b60a7d7f3c395ac1fd30f4125ef37c3932d876576ebec84a53fea96bbd4
+DIST OpenSceneGraph-3.5.5.tar.gz 5666085 SHA256 f44c96ade3a1d3c547f36504d75633bedbb9b8f6f42dac4fff75166db7d3aadf SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827 WHIRLPOOL 2aa4cd7c375a5cb25cce28dc13c86ea73eae0994540f27b7007ee25655e6119d7f26df306fc70d8d9d5c31de3111d3b8f6b6d1671e47cbc2bd649e6f70a9a475
+EBUILD openscenegraph-3.5.1-r2.ebuild 4024 SHA256 867f0d3007f7be8f459943be8f9f1cdc2aa165485f6ee6812fef5161cc4e5fbc SHA512 dab1177b5a09a4cca5835db4ced957b51d2d428c157f1f62a9d2611a2c9d999d8aa2cc9764c4489c5f51ee97aea6a7bdcd985bc9ce54d5634dc96a8762cfcd7b WHIRLPOOL e006a10337f6560e9d37cfcd353e6237c17db1ee4855b955dd1a3255e12bc1056752172cdb18811d19c9e0feda8bc8f5216c3b5163a0bfff9233babb285aeb6d
+EBUILD openscenegraph-3.5.5.ebuild 3776 SHA256 5d77c307e097a2117f5935f7b9587601223ed67ba0d8cd56a420ab6e6ae9b538 SHA512 230abc2860cfd149d6a02a62ae783ba978b4851857b49b4e1db20b2bba47b3c778a7153de42b97b1bc956b99f4ce656681627302665783b4b540448f43b3909b WHIRLPOOL 6401f6821a067eb5fb6da8c700857c1d60158d3be9f079ebf67d9c0ce7bd7b346ed0815ff98dfe761cbacd3f8fe2e88ba2eedfcc31794423eccd42f1c3b3d80d
+MISC ChangeLog 5556 SHA256 13d1ff717e3cda2e217aaf6ffde0f52e4b9bc93850809cac459a83cb7cf0fbf6 SHA512 02106d52b2aa28c86e1ac1630317b6eae79d70e23e0be44f5f915fe64a801da89378837adf096db7c44dbb67eafb61e8ed528e368648020c6615a624513ad25b WHIRLPOOL 2df145bdeebcc57bcaa39c65dc2d5d304ed2302a42b0de9a607e69fe49a7570f3b2b3b2d58149cf1645b51cddcf9e124f5c2e326f4f0bce3bae02141f83a9b7a
+MISC ChangeLog-2015 10142 SHA256 ff597543138ec3a854e7e8e58ae00893f47806b96524d2e249d05425e8ec76e2 SHA512 f80e9a15257386618583a2e00980a9a64dae800fba58ce58191fc93514613d89c5050cefb2974161c53901cfb9536da4e3caf6df7be2cf2f74d56339d86f1bb3 WHIRLPOOL cdd586cd1de3bb2a4919ca248eef5d3ed81099f222c173f1ae9d60f8b575118b41c1076981987587ca3ddd87fcfa121d43cfc7d901639c9afa4429952e9fe0b3
+MISC metadata.xml 1630 SHA256 9ef55266e2dac2170772d38926c0d668d3b14a2ea4f2d2b7cfa531dff57a4a5b SHA512 92108d0c1b77034cba40b3818afc42cf7aa0a3ba7b545f80f1df78b98d413037ac4328b88aafa1e6c5e32a2a33341bf5e99249bbbd96bd40ccfef78c4092e564 WHIRLPOOL b9d3968f465300d9c11a6cbda4a9fb6216059ea1d507a601c5bcb5c5c06de4867304c22049405f4e2b3698c7ee35254f70427b2044b1258407c80dd82eee19ab
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
new file mode 100644
index 000000000000..1a85ee8d47ba
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
@@ -0,0 +1,276 @@
+diff -ruN OpenSceneGraph-3.2.1/CMakeLists.txt new/CMakeLists.txt
+--- OpenSceneGraph-3.2.1/CMakeLists.txt	2014-07-04 13:29:02.000000000 +0200
++++ new/CMakeLists.txt	2014-08-20 00:45:08.857600038 +0200
+@@ -486,6 +486,7 @@
+ 
+ # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
+ 
++INCLUDE(MacroOptionalFindPackage)
+ 
+ ################################################################################
+ # Set Version Info resource file
+@@ -515,37 +516,37 @@
+     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(Performer)
+-    FIND_PACKAGE(GDAL)
+-    FIND_PACKAGE(GTA)
+-    FIND_PACKAGE(CURL)
+-    FIND_PACKAGE(LibVNCServer)
+-    FIND_PACKAGE(OurDCMTK)
+-    FIND_PACKAGE(FFmpeg)
++    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(Performer)
++    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)
+     FIND_PACKAGE(DirectShow)
+-    FIND_PACKAGE(SDL)
+-    FIND_PACKAGE(Poppler-glib)
+-    FIND_PACKAGE(RSVG)
+-    FIND_PACKAGE(GtkGl)
++    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)
+ ENDIF()
+ 
+ IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+-    FIND_PACKAGE(ITK)
++    MACRO_OPTIONAL_FIND_PACKAGE(ITK)
+ ENDIF()
+ 
+ # Include macro utilities here
+@@ -604,12 +605,12 @@
+ IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ 
+ 
+-    FIND_PACKAGE(FLTK)
+-    FIND_PACKAGE(GLUT)
+-    FIND_PACKAGE(FOX)
++    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
++    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
++    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)
+ 
+@@ -630,10 +631,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)
+@@ -689,15 +690,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?
+@@ -1001,7 +994,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)
+@@ -1017,7 +1010,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 OpenSceneGraph-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS
+--- OpenSceneGraph-3.2.1/CMakeModules/COPYING-CMAKE-SCRIPTS	1970-01-01 01:00:00.000000000 +0100
++++ new/CMakeModules/COPYING-CMAKE-SCRIPTS	2014-08-20 00:27:15.371715620 +0200
+@@ -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.
+diff -ruN OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake
+--- OpenSceneGraph-3.2.1/CMakeModules/FindFLTK.cmake	2010-11-11 17:51:46.000000000 +0100
++++ new/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)
+diff -ruN OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake
+--- OpenSceneGraph-3.2.1/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
++++ new/CMakeModules/MacroOptionalFindPackage.cmake	2014-08-20 00:32:02.142858484 +0200
+@@ -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)
++
+diff -ruN OpenSceneGraph-3.2.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake
+--- OpenSceneGraph-3.2.1/CMakeModules/OsgMacroUtils.cmake	2014-04-13 18:03:17.000000000 +0200
++++ new/CMakeModules/OsgMacroUtils.cmake	2014-08-20 07:31:10.261828759 +0200
+@@ -453,7 +453,7 @@
+         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 )
+         ENDIF(APPLE)
+ 
+ ENDMACRO(SETUP_EXAMPLE)
+diff -ruN OpenSceneGraph-3.2.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt
+--- OpenSceneGraph-3.2.1/examples/osgviewerFLTK/CMakeLists.txt	2007-06-25 10:35:06.000000000 +0200
++++ new/examples/osgviewerFLTK/CMakeLists.txt	2014-08-20 00:40:48.620538012 +0200
+@@ -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/files/openscenegraph-3.2.1-gdal-2.0.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch
new file mode 100644
index 000000000000..639cbc958258
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch
@@ -0,0 +1,49 @@
+--- OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp
++++ OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp
+@@ -134,11 +134,21 @@
+ 
+     virtual ReadResult readFile(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
+     {
++#if GDAL_VERSION_MAJOR < 2
+         if (OGRSFDriverRegistrar::GetRegistrar()->GetDriverCount() == 0)
+             OGRRegisterAll();
++#else
++        if (GDALGetDriverCount() == 0)
++            GDALAllRegister();
++#endif
+ 
+         // Try to open data source
++#if GDAL_VERSION_MAJOR < 2
+         OGRDataSource* file = OGRSFDriverRegistrar::Open(fileName.c_str());
++#else
++        GDALDataset       *file;
++        file = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR, NULL, NULL, NULL );
++#endif
+         if (!file)
+             return 0;
+ 
+@@ -156,6 +166,7 @@
+ 
+         osg::Group* group = new osg::Group;
+ 
++#if GDAL_VERSION_MAJOR < 2
+         for (int i = 0; i < file->GetLayerCount(); i++)
+         {
+             osg::Group* node = readLayer(file->GetLayer(i), file->GetName(), useRandomColorByFeature, addGroupPerFeature);
+@@ -163,6 +174,16 @@
+                 group->addChild( node );
+         }
+         OGRDataSource::DestroyDataSource( file );
++#else
++        for (int i = 0; i < file->GetLayerCount(); i++)
++        {
++            OGRLayer* layer = (OGRLayer *)GDALDatasetGetLayer(file, i); 
++            osg::Group* node = readLayer(layer, layer->GetName(), useRandomColorByFeature, addGroupPerFeature);
++            if (node)
++                group->addChild( node );
++        }
++        GDALClose( file );
++#endif
+         return group;
+     }
+ 
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch
new file mode 100644
index 000000000000..bd604c3c19c1
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-giflib5.patch
@@ -0,0 +1,24 @@
+From: Alberto Luaces <aluaces@udc.es>
+Date: Sat, 19 Dec 2015 04:52:52 +0100
+Subject: Compatibility with giflib5.
+
+---
+ OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
+===================================================================
+--- git2.orig/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
++++ git2/OpenSceneGraph/src/osgPlugins/gif/ReaderWriterGIF.cpp
+@@ -561,7 +561,11 @@ GifImageStream** obj)
+     *width_ret = giffile->SWidth;
+     *height_ret = giffile->SHeight;
+     *numComponents_ret = 4;
++#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0))
++    DGifCloseFile(giffile, &Error);
++#else
+     DGifCloseFile(giffile);
++#endif
+     return buffer;
+ }
+ 
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
new file mode 100644
index 000000000000..59f971c94386
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch
@@ -0,0 +1,297 @@
+--- 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
+@@ -651,53 +652,53 @@
+     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(Performer)
+-    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(Performer)
++    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(Lua)
+         IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR))
+-            FIND_PACKAGE(Lua51)
++            MACRO_OPTIONAL_FIND_PACKAGE(Lua51)
+         ENDIF()
+     ENDIF()
+ 
+     # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this.
+-    # FIND_PACKAGE(V8)
+-    # FIND_PACKAGE(PythonLibs)
++    # MACRO_OPTIONAL_FIND_PACKAGE(V8)
++    # MACRO_OPTIONAL_FIND_PACKAGE(PythonLibs)
+ ENDIF()
+ 
+ IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+-    FIND_PACKAGE(ITK)
++    MACRO_OPTIONAL_FIND_PACKAGE(ITK)
+ ENDIF()
+ 
+ # Include macro utilities here
+@@ -763,12 +764,12 @@
+ IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
+ 
+ 
+-    FIND_PACKAGE(FLTK)
+-    FIND_PACKAGE(GLUT)
+-    FIND_PACKAGE(FOX)
++    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
++    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
++    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.4.0/CMakeModules/OsgMacroUtils.cmake
++++ OpenSceneGraph-3.4.0/CMakeModules/OsgMacroUtils.cmake
+@@ -456,7 +456,7 @@
+         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 )
+         ENDIF(APPLE)
+ 
+ ENDMACRO(SETUP_EXAMPLE)
+--- 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/files/openscenegraph-3.5.1-ffmpeg-3.patch b/dev-games/openscenegraph/files/openscenegraph-3.5.1-ffmpeg-3.patch
new file mode 100644
index 000000000000..3a2792e1999c
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.5.1-ffmpeg-3.patch
@@ -0,0 +1,173 @@
+From e85d5743341585c6e6eb1ac693884f80e1fa06ce Mon Sep 17 00:00:00 2001
+From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Date: Wed, 1 Jun 2016 10:32:35 +0100
+Subject: [PATCH] Replace deprecated FFmpeg API to fix build with ffmpeg-3.0.x
+
+---
+ src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp |  3 +-
+ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp | 48 +++++++++++++---------------
+ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp |  4 +--
+ src/osgPlugins/ffmpeg/FFmpegParameters.cpp   |  2 +-
+ 4 files changed, 26 insertions(+), 31 deletions(-)
+
+diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
+index 665c68f..636bddd 100644
+--- a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
++++ b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
+@@ -227,8 +227,7 @@ printf("### CONVERTING from sample format %s TO %s\n\t\tFROM %d TO %d channels\n
+         if (avcodec_open2(m_context, p_codec, NULL) < 0)
+             throw std::runtime_error("avcodec_open() failed");
+ 
+-        m_context->get_buffer = avcodec_default_get_buffer;
+-        m_context->release_buffer = avcodec_default_release_buffer;
++        m_context->get_buffer2 = avcodec_default_get_buffer2;
+ 
+     }
+ 
+diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+index 9375657..083d3db 100644
+--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
++++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream * const stream)
+     findAspectRatio();
+ 
+     // Find out whether we support Alpha channel
+-    m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);
++    m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);
+ 
+     // Find out the framerate
+     #if LIBAVCODEC_VERSION_MAJOR >= 56
+@@ -95,20 +95,19 @@ void FFmpegDecoderVideo::open(AVStream * const stream)
+         throw std::runtime_error("avcodec_open() failed");
+ 
+     // Allocate video frame
+-    m_frame.reset(avcodec_alloc_frame());
++    m_frame.reset(av_frame_alloc());
+ 
+     // Allocate converted RGB frame
+-    m_frame_rgba.reset(avcodec_alloc_frame());
+-    m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height()));
++    m_frame_rgba.reset(av_frame_alloc());
++    m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height()));
+     m_buffer_rgba[1].resize(m_buffer_rgba[0].size());
+ 
+     // Assign appropriate parts of the buffer to image planes in m_frame_rgba
+-    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());
++    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());
+ 
+     // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame.
+     m_context->opaque = this;
+-    m_context->get_buffer = getBuffer;
+-    m_context->release_buffer = releaseBuffer;
++    m_context->get_buffer2 = getBuffer;
+ }
+ 
+ 
+@@ -267,8 +266,8 @@ int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, AVPicture *src,
+ #ifdef USE_SWSCALE
+     if (m_swscale_ctx==0)
+     {
+-        m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt,
+-                                      src_width, src_height, (PixelFormat) dst_pix_fmt,
++        m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt,
++                                      src_width, src_height, (AVPixelFormat) dst_pix_fmt,
+                                       /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL);
+     }
+ 
+@@ -315,14 +314,14 @@ void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled)
+     AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
+ 
+     // Assign appropriate parts of the buffer to image planes in m_frame_rgba
+-    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height());
++    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height());
+ 
+     // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine
+ 
+-    if (m_context->pix_fmt == PIX_FMT_YUVA420P)
++    if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P)
+         yuva420pToRgba(dst, src, width(), height());
+     else
+-        convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
++        convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
+ 
+     // Wait 'delay' seconds before publishing the picture.
+     int i_delay = static_cast<int>(delay * 1000000 + 0.5);
+@@ -349,7 +348,7 @@ void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled)
+ 
+ void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height)
+ {
+-    convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
++    convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
+ 
+     const size_t bpp = 4;
+ 
+@@ -367,31 +366,28 @@ void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const
+     }
+ }
+ 
+-
+-
+-int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture)
++int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags)
+ {
++    AVBufferRef *ref;
+     const FFmpegDecoderVideo * const this_ = reinterpret_cast<const FFmpegDecoderVideo*>(context->opaque);
+ 
+-    const int result = avcodec_default_get_buffer(context, picture);
++    const int result = avcodec_default_get_buffer2(context, picture, flags);
+     int64_t * p_pts = reinterpret_cast<int64_t*>( av_malloc(sizeof(int64_t)) );
+ 
+     *p_pts = this_->m_packet_pts;
+     picture->opaque = p_pts;
+ 
++    ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags);
++    picture->buf[0] = ref;
++
+     return result;
+ }
+ 
+-
+-
+-void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture)
++void FFmpegDecoderVideo::freeBuffer(void *opaque, uint8_t *data)
+ {
+-    if (picture != 0)
+-        av_freep(&picture->opaque);
+-
+-    avcodec_default_release_buffer(context, picture);
++    AVBufferRef *ref = (AVBufferRef *)opaque;
++    av_buffer_unref(&ref);
++    av_free(data);
+ }
+ 
+-
+-
+ } // namespace osgFFmpeg
+diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
+index 7883b17..778c1a9 100644
+--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
++++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
+@@ -94,8 +94,8 @@ class FFmpegDecoderVideo : public OpenThreads::Thread
+                 int src_pix_fmt, int src_width, int src_height);
+ 
+ 
+-    static int getBuffer(AVCodecContext * context, AVFrame * picture);
+-    static void releaseBuffer(AVCodecContext * context, AVFrame * picture);
++    static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags);
++    static void freeBuffer(void * opaque, uint8_t *data);
+ 
+     PacketQueue &           m_packets;
+     FFmpegClocks &          m_clocks;
+diff --git a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
+index 288e440..5915ab8 100644
+--- a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
++++ b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
+@@ -19,7 +19,7 @@ extern "C"
+     #include <libavutil/pixdesc.h>
+ }
+ 
+-inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
++inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
+ 
+ 
+ namespace osgFFmpeg {
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..4a686db2be4b
--- /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.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
new file mode 100644
index 000000000000..e37bfe37e566
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 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
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="http://trac.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/35" # Subslot consists of major + minor version number
+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 qt5 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= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	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-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xrandr? ( x11-proto/randrproto )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS.txt ChangeLog NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-cmake.patch
+	"${FILESDIR}"/${P}-ffmpeg-3.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)
+		-DOSG_USE_QT=$(usex qt5)
+		$(usex qt5 "-DDESIRED_QT_VERSION=5" "")
+		-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/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
new file mode 100644
index 000000000000..bd6fba7e3d2a
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 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 ~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-proto/xextproto
+	doc? ( app-doc/doxygen )
+	xrandr? ( x11-proto/randrproto )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.5-cmake.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/Manifest b/dev-games/paklib/Manifest
new file mode 100644
index 000000000000..140a38862e67
--- /dev/null
+++ b/dev-games/paklib/Manifest
@@ -0,0 +1,5 @@
+DIST pak-0.3.tar.gz 12885 SHA256 6139688e96d044386ac92e587791bf29d0adc501240765bb08fe4b00f31cf6c9 SHA512 05eb8402fc1b1b0ab381dbf815c59fa1fde1e1aa081c124d0f2f3b257fdefd23e9c7995c055b368f53dabab60722b6505976bc601d991265581ee36cb96b7750 WHIRLPOOL 982cebeb1f48ecd0099f694f00ebcf292968fa1710b6b1020e760fbdcf95e70cdccc7caed75a65ead3b856839fe84f89c090e25b772f0d3de387ea5c7068d821
+EBUILD paklib-0.3.ebuild 683 SHA256 9e13f6461ff64ef9029a0e259be71a347ac38a2e57d9ea0170812cb2f7485bc1 SHA512 dfbb47532a6107e6093cf19c317669eebfc7a749f8a9e056fdfb146c0f327a60ff18bbf195979f4d9b561666d717f7ce9f6e1bde7289ef099f914c5afa118b84 WHIRLPOOL 56a038048435b94cdd7e097b780a78c2213627d5462164c79b7cbb1373ea1ab05848680b8b19349554777f3f9397e47583389dba61a316c1fe8bf2d0dd2737d0
+MISC ChangeLog 2530 SHA256 e61fb3d6350e01beb34c75ea889fabcf3c51d79471255a92b2161ff6fec154bc SHA512 7e29b766b74eea29457c10b7a36411a9e501bb934d28e0174021087f1b89eccd9e0a41caf2ebf259b7700086ce3e6906bfa4c99596f7e58a7da2633099ce48ac WHIRLPOOL 62fc0253d3e8ff71b0b4f7807a44083d539b5d6e1eadd1b6452ea061a49a2b43b97819a81563916560ad3351b773ab3a1b7ccb0cef272f331e0b0cc63f479c25
+MISC ChangeLog-2015 740 SHA256 5683f2fa52cb0315d394e9d3d0b60d8dd729a7ad26e3a24e7b706c0115d480e4 SHA512 2cf50bfb7e9ad9d00a0cd36593fe2c21666abbf7659a87ba328d5f28e1abc27d9e9131d3fd75404a109672914a096f4639b9fd6b73d5035b11165d16204a8b62 WHIRLPOOL 6fd37632a505fd47d0a65464da63906b8dbc574a105c372d608ddee61c2a038424efa9eeab4fe415a4f52d90ba723b8ecb885ee0c7eaba3a7a3fa18cdb1756c4
+MISC metadata.xml 329 SHA256 2fdd827699fa46139f4dedb4c6771dd97b3dc0ef453754abb2496c91ee3370da SHA512 949275b2029d9a51b2c076b5706a2b58c6e9a41ca0a5d126871ca9580d861f8a8882d257fb0a07c150f86d21a6084429e4f55a990a884a861d31e54e6d888cca WHIRLPOOL b486a07dd355c93b389099fa079ce60cf1a1fcd22189ee85d715b8d2715f14589dcf0eec708635525d5991401cb412f75d002042f5fe3ceff71bb425f104ef10
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/Manifest b/dev-games/physfs/Manifest
new file mode 100644
index 000000000000..b9fd4b95c8d4
--- /dev/null
+++ b/dev-games/physfs/Manifest
@@ -0,0 +1,9 @@
+AUX physfs-2.0.3-zip_seek.diff 535 SHA256 4371e43ae98ea9292a50e611f961e76a9f76f3b135bfdae27430031e07dd402a SHA512 016f5cafecdfc7f4d2d9dcb517f0ebe7b7765912361399e2c7e239c936c287ca15c0124fd9378c23d6d0d3669c45c4d4dc498098eb052901d349459c94a29ef2 WHIRLPOOL 0e36ec294b8f4e1cf82ff28f47a21f9df2ed8ed9b5c63b2500415704b072b38d71a531ae8b1436f6f125dea7277c689767facf54e882ab3a9ab4831fa121ad14
+DIST physfs-2.0.3.tar.bz2 560628 SHA256 ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80 WHIRLPOOL 30362f92d5702842142c08c3183a384876a03e9e3e400364b0fa59c99ffee994667c1ad08fe633ef146e98301789a980a3419f60a18b24b9c341bb74144ccc73
+DIST physfs-3.0.0.tar.bz2 194277 SHA256 f2617d6855ea97ea42e4a8ebcad404354be99dfd8a274eacea92091b27fd7324 SHA512 4293dc72a5b2e41fbd02c4426da7bfc1e94a013d8a332b3124798a91ef27b4a57adef303f23d5e03150855de69cf22fc8bb29e6395725a18e3a12f6c74b4111f WHIRLPOOL e0010e15b2449565939dd5e9d65fb63cbbb78069a0390fc0ba95c7671a484db7470ec300cfd8aaa5810aff7fd14bbc669f8e902a9469ba7d51ebeed6c94b15f4
+EBUILD physfs-2.0.3-r2.ebuild 1417 SHA256 afba6b34450c8653be2983fe921bd8a9068cd357cb83988a93cd203ea8f7bfb4 SHA512 0b13fa37b61627c4eb8309087d1e538ba19f66eef0c932f7b0070df4128cbe0e712c62f2c7a1ad1d9b3b08198ee7e2dea0e0483c302a929005df6ac9a06981be WHIRLPOOL 7c7819fa3b2ff275ff3bb25717870bd3f6a585fe3a5f93e6b26e1b0b5063bfddf3648bb836a88aa69794e7c99c727a4220b23ca3571d3a0e55708dd6d24aa699
+EBUILD physfs-3.0.0.ebuild 1132 SHA256 562cdb6452ebeb99c2afd263595dfcbdebc4d30178c76a2457a7dd8d8e79e015 SHA512 9935cf7a2af2f8b3d336d422fd93317799fc1521026a8621aa4a197a3973287ddcead7834eb890f01cee26ac2d24fc2ed4a0cf49ce6ff13c35816b12f14a7ab3 WHIRLPOOL d6c3ce478b2ea41248b57b045004174acd5244945cc6c655eb22b7660027f8b967ad778f490baf1edf7da37474ca8c3ff5880b598429f1dcdd1511f3a3709ede
+EBUILD physfs-9999.ebuild 1246 SHA256 a857081fe4a6c655b759a4b9380b649ccae33fa2857d74339e96eff210a4ad5f SHA512 1db1cb2df7f7f457710ca2b7ed2b7bc40de7d0a24cfdb90ee81b2182e5b3e86902ead39df83acbc01d2dc2142ed94ed9d10ea405d3e584740fb79d382a34d3ec WHIRLPOOL 4bea15d5e1979e879463068df2c60ccbc5692a1cfde55702944624b69f703dae6eefd1ce6e1d1d47031cbbfd433b9747cfe877bf763a3f96c634f827e0143765
+MISC ChangeLog 2431 SHA256 099f43e2fdfd7460a914f8e55fcb59cd66e0be1ed600f211aa5b52d13c20409a SHA512 c019650836efe001d5a932b06951e86c393831e080803adf7a52c196979f05369cc1b7b67ad3e67062afe81a7e3d9a3057055c3d351f81c428d0d094199a11ad WHIRLPOOL 9f72642a54fbc8c8b3a41e3d18ba76abc7fdd65a58fdd3cc139ca4d568071b992e61e285e82885ba418e9fb0f182e9f791b3ca1cbdf71673e0d9593654bdeaa5
+MISC ChangeLog-2015 7649 SHA256 dfe9ed4277f66ca02c979d90d7064f1e8d8485f407bacc0a9698989102b198f6 SHA512 dda73f3b974906e287303cb06e356858f1f87ffc1d429db82b3471ff34652e5589047176b93745878cfa83516be1356a11509471b467bb755b3fa31782cbedcd WHIRLPOOL 3a44a4b735866e5f185790918e4673eeb41f47c3c630d451ddcb2997189656bc282d8a236817e3c4a0044d4c4fcfaf29cc0484953f9994c212f04085a635c691
+MISC metadata.xml 1807 SHA256 a7e6ba6e78f907c535d8ae8f470a524fd3dc89012225f9ec8b7d2f4b218ac241 SHA512 914416e5632d1587b4677b8c8997eed056603049bf71424ccc679a6a4fa050ad2c9f5bf2db0927a5925bdc662565fc2d49901c9de419a623a830a2c6da65341e WHIRLPOOL 17f6fa2ecf2bf30388d86d8cf81e90221847fcd8927c061cb3a2fbcbbf7861c37bcee6ec4b8e9ab99cd2d988b7a143687d8a8e30d2a084a94518ff3bd6004a05
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..5bca86689c43
--- /dev/null
+++ b/dev-games/physfs/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="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="grp">Enable Build Engine GRP archive support</flag>
+<flag name="hog">Enable Descent I/II HOG archive support</flag>
+<flag name="mvl">Enable Descent I/II MVL 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..2411c6c35d7f
--- /dev/null
+++ b/dev-games/physfs/physfs-2.0.3-r2.ebuild
@@ -0,0 +1,62 @@
+# 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() {
+	default
+	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.0.ebuild b/dev-games/physfs/physfs-3.0.0.ebuild
new file mode 100644
index 000000000000..6c6a34f418d9
--- /dev/null
+++ b/dev-games/physfs/physfs-3.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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() {
+	default
+	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..27e3aeb6c956
--- /dev/null
+++ b/dev-games/physfs/physfs-9999.ebuild
@@ -0,0 +1,50 @@
+# 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/"
+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="grp hog mvl qpak static-libs wad +zip"
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
+
+src_prepare() {
+	default
+	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/poker-eval/Manifest b/dev-games/poker-eval/Manifest
new file mode 100644
index 000000000000..49250cf19a05
--- /dev/null
+++ b/dev-games/poker-eval/Manifest
@@ -0,0 +1,5 @@
+DIST poker-eval-138.0.tar.gz 470224 SHA256 92659e4a90f6856ebd768bad942e9894bd70122dab56f3b23dd2c4c61bdbcf68 SHA512 693dfac358beb63b3cbfb2d29bdea65904b894dd9872757db4e203849a0ca7c6951333dd181268c33cb54dd1bd37f57ed963d5c7ab5f9c34e67fdb211fac2fa6 WHIRLPOOL 8103bbfbc97ffd3f808ac5390f8537dc452d8bd96f78f832f8f0058ac384c155ad1cccb2051c9b934e3412b0004000460a614c5b20e2f13541339b11b8be777e
+EBUILD poker-eval-138.0.ebuild 561 SHA256 49347387f99786c917aedbdfee68da073a37efcd5ab425475b77ae13d0556b55 SHA512 87194af9d1dc5dc35400c5c658c480e58e4eb7006983d6af0882aba2ce888f9d2f57cb6d8544e575e6b0fb754c1dc1f069d181d0be26763d07f334befa44d41e WHIRLPOOL 9ff054d2c4887e04efc6fc3141981306c956175e8917bf661cea7a5eeea09d9835fc240c716312b55c8462509b13b3b13a47cb6514bd34ce0b0d907cc6c9714d
+MISC ChangeLog 2437 SHA256 1220b4cc4f231981638bf18b39822e4c33bc4d9cf6be4ca4f0590707cf066854 SHA512 0e5abb9ca2de1adc69dbbc485e2f98c7d923434fa187e33474b1c203dd8f1188b3de26afe11e79a147dec093ea81741d5ddce2a3b291242c3c333dfd4cb888d0 WHIRLPOOL 74fb5665aa5fbf4b6fafc60becd17a8b1118e42822006990f3f97d1c50aa7b736bf052fb5469bf21eed48099c3739959fd20e4e19c7743dd8c874553c9b2d55f
+MISC ChangeLog-2015 2959 SHA256 6dbced0ce0a74e75c924f866b90627a57a1055b8a5395543372dd0bb14a14f73 SHA512 2daed38bfa8a1c2a4bdc3362fca5a6755c742c0959ee781187519b41dc5a8e7f12107638a68ea86c778776ebc2d91987f483144a71ebee2c9efcd6d4070c6d7d WHIRLPOOL 5bfe62dcc911e1167dd9ecb568bd7b6d41fe1f3751f3f26e3f68639f69a84484b3f8700934296cd6eb1e17f6bfd51f94ba75a4a13cdcb5d2eb7491c53d8ae651
+MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
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/Manifest b/dev-games/ps2-packer/Manifest
new file mode 100644
index 000000000000..e0ebb01d98e9
--- /dev/null
+++ b/dev-games/ps2-packer/Manifest
@@ -0,0 +1,5 @@
+DIST ps2-packer-0.4.4-linux.tar.gz 56579 SHA256 c592e88005c6a07edca65566f461155268966523b9113c919e455233d7c1d7d1 SHA512 491f662af5364fe0177a9a6676a80ae218a941f68c00bb7bc375f2002e61ea98afa58d6dd0c1f7e225e5659bd28e82c25128058edebb9dfb1794d297f090a28d WHIRLPOOL 459f194ec560f35631b3518f943b16d43051e9621b48d0cc7b3cc08fb7de5baf92699a81f8aecf246486421177e91e7ff85788b8d48a932914866c88410b61ad
+EBUILD ps2-packer-0.4.4.ebuild 1532 SHA256 06ae052ea910e2c10d5913a17a12064dd7a5aebc519cb61a1383672dbf47bae0 SHA512 2433468255c7278638482d0c6ace2f046c6aae974b4f8579bdb8208a597a39eb5d57d9654b30f0442d57a4bb593832af3fed0e179352db0bc96cc2015499d796 WHIRLPOOL 3a490c57c3e5ca2c3a076b5c8d7c41f38e41af294317dc539d1fcd8642dfed21c728e8185af7adae721df02a2bb0d23128ff7945904ae38ddd3ab76a2e1a25ab
+MISC ChangeLog 2437 SHA256 e67553aa3b71d5cd69ec22e71f37dca7fab480a6e31075f9f2170e3e9c958a86 SHA512 b3776163404587fce2dd69a3ed68f6dcda52773e2f11c2eb0aeab785b0ad450ce5e6cf0ede552ebe03379fb5d80138f0d9a4b180de82f2b2ce44ef5878660190 WHIRLPOOL 3573a9af317c20c3bb6036a2d8e10f65927f36afcb1378c613f0464a20fcaff759a394c22d7212e70002795128b3f3e9739f46380945e0fa85e794b35bd8df91
+MISC ChangeLog-2015 903 SHA256 d4dedacf1596e4e516103520d8f07ae58d8607bf78b825cdaa3e601e6b618b5a SHA512 863e0015b015aab14fb9c3739d1c2f8a52822a04017a252434c61047f6bd137c8e57ee0fa4185fbcd269ec49e7d2f9230d5c0eb966ed8c44f7c3f97c786ff037 WHIRLPOOL 0f4a8d5746ba70c56232a4d154d5acc2ef3ef39143a44b74952daf311a6a95728160840f3e28475681e7fa08a32639412d5ad8475506266602329aedd46693b8
+MISC metadata.xml 345 SHA256 9495822677ddd5acf045c92b4480e0f72526e344442cbb41b4f2a62bacc7d565 SHA512 8eb0407ee72d763fe913a0a68915e9d2bd79daab7e16e96833d4318280d0a93dec7d1caada674815f16d6b62d6fd2ab1a1be63935977e1486d486eaca33f4ad7 WHIRLPOOL 9e3becbbd70a4381e71b7257e9e654927c381d76b005591365b64c8e3f9aed32bf8065910bd59189dbb532394d80b57f21e645b9c712349d307bcee135189b0c
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/Manifest b/dev-games/quake4-sdk/Manifest
new file mode 100644
index 000000000000..1ce0daef27cc
--- /dev/null
+++ b/dev-games/quake4-sdk/Manifest
@@ -0,0 +1,5 @@
+DIST quake4-linux-1.4.2-sdk.x86.run 65799543 SHA256 f8c0c5d26a253d4ccca341a8638e20e2a6e6bae5a8dc432de7b258a0a8db68e5 SHA512 21f09f71f040e22d9d4cfa09aa3d5d276d71716ed4eab5098682f8060eb0159d460f6f02b35d110689570f8c251141bf5d0eb1e4af8f68fcaa66b9e7bcb3855f WHIRLPOOL 39b0413513c90f4e0cac5569d22da476034a2fadbb56148eee229906f079f1494bca1d35d60f9fb70c3d701db16f689dd4bae6771f16700efab64606dd2f28e3
+EBUILD quake4-sdk-1.4.2.ebuild 527 SHA256 0df2c10700675ac7086a2f301b7ddde7c755a67cca502ca81aa63d38d9fd4309 SHA512 156924625d00cff521edc921ad5e0ec9081b41ac589c24b92a30aff638114f7b67cd093da9a6be6aa61c0f922fbc062b8ff2821b3d59757bdf5f43e5a3a9fb19 WHIRLPOOL 34c2b2b546eb85b9f20148e7901c35fc256541f38b955312e5ef6fc4e2c31e717055f17e6c22c15867349dd9ce9f9931b3039b2320dc4f1c5c5f49b013f9ac80
+MISC ChangeLog 2437 SHA256 8837b8c731909fb2557660fd61ed99ee56b2d42bd57e7a3ad3d4ca310499f0d8 SHA512 f946a279727979f217cf331d9759d6c4fe9ae0f25d781e3400e9eda33114dea03cae67ae4c277cd19b97ea7430400c2321a968d3bef9534912ba01d1a961662f WHIRLPOOL b01f7273459459d8b87fb0f13197603c0be2c8ce7c857de04fca25f577d4b6a45760448095f22db8c2476c65061a63ab45202a3194b339156c097d43c42b8851
+MISC ChangeLog-2015 1037 SHA256 6f2ee4df3de1ed7e626452cd2bbd4e63828f7c183324cd808dc642a7a1b02f50 SHA512 b2c90f3f50e587bac2b688734bbfe173e0f271a26b9ac9b0d900e0059a71ef9015c75444b3a347fb183c05ac15bf839201f25975d70e0a86db4ec33799375cb4 WHIRLPOOL 344355a214f7fc6656862c7e9d4222d9c75cfa3da4ea329038ba8c3abdd71fcd8593c7eaae4174fbea03cd1529745118ce7ba59f731515911e67f996ca8fc6f0
+MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
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.ebuild b/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild
new file mode 100644
index 000000000000..508f8172267c
--- /dev/null
+++ b/dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker games
+
+DESCRIPTION="Quake4 SDK"
+HOMEPAGE="http://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/Manifest b/dev-games/simgear/Manifest
new file mode 100644
index 000000000000..08750d80860f
--- /dev/null
+++ b/dev-games/simgear/Manifest
@@ -0,0 +1,14 @@
+AUX simgear-2017.2.1-boost-1.65-tr1-removal.patch 1476 SHA256 23e9eefe8ea033b7e092b8c72b2df3467cfd596449ea5de5c9973230753d2207 SHA512 8d24d58b204c635e01f3fcfb939d425407834c7e504c6d40212874856a080e41d653e7f7416b5cd0145ee9a49b6f6368464eb99d8aebf077c4fe9e87ab18922c WHIRLPOOL b3fab151ba3afa5c23c93f5cbb7b07318348785d07de14567d2ad058536dfe6dc2c094f955227c7f9ccb73ef39c3a32177685a8e9a99372b2c75a257589e1f77
+AUX simgear-2017.2.1-gdal-underlinking.patch 832 SHA256 8d0d2caa6cc103049b0930ceb4ec3d7f99e46951aebe86ca091660a157946cc9 SHA512 6bd15f48612338f1563d8ec4cd4a129b52e03bb7313e84c81d51d0911578ceb3306d81690b242c9adf0afa0687e6530917340ecca670752b5b500020469f38e6 WHIRLPOOL cb599e163877962ce7fcd87cecd7b07d5c28529be31b6804a21294f2705edcc6a7170277edc7ef4f3a4ae7c185e1cb15c23e7f1f3b8d994402e0334183bbaf22
+DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
+DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb
+DIST simgear-2017.1.3.tar.bz2 1235062 SHA256 85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 SHA512 600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa WHIRLPOOL 377caa9327be22f10e0c45a64db7747d66dc7498b425ae5cf330544e727248b84f907b9eebb7c6b8e6a3272d1929a2b2ae1eaf8a4a542469d1e3615e9a2b7966
+DIST simgear-2017.2.1.tar.bz2 1290780 SHA256 9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e SHA512 168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5 WHIRLPOOL dc57cb2b87ec0111b0c555b6b87bcba7ec80c34c2277978c3aac7e71a3df260b4ac32f79698b2ea6d84a3bd6a942dc163aabd80c5f5004c409a189456f812d4a
+EBUILD simgear-2016.4.4.ebuild 1061 SHA256 bc532b97a66e160f1728c3e984e08df008fefefbf38f1e3563f7a5caf303801a SHA512 132606587c2820bf150fe67b5a60018bc49af52ea2ae320c327301f5becd1f402b081e8985457b72c6bc7c2b13936362aef026c7337beacc8fc6592599a7c5d7 WHIRLPOOL c2e8b73fa3e3fa945aeb0a704db525cc3fe0de95ee4944fae9c511f304b66ebc6305d420e6df30b33bdce5dab78fd6588f11f7035b6df3d72147a884105f44c3
+EBUILD simgear-2017.1.2.ebuild 1062 SHA256 981a5d1aeda0c9c7282b649d9803b4ec050a9bbfcc4071b1d55a1c14a8ae463a SHA512 855947e49e07af915a63ec897ffaa504668812d4697b65a7a3431d591c25682ddbaba029c28748d67d2098e9876dee2cb45d126f9a92e4c006a0e078986cfc36 WHIRLPOOL 7e67c807f6ce9851853218ad45b8ad7d9c4ebb365644e4dcb6d1e0ed648b3b4b8edb3c0eda774ca75ca6c9f2a0792ca590c3137956bbfc053282d43349337761
+EBUILD simgear-2017.1.3.ebuild 1062 SHA256 981a5d1aeda0c9c7282b649d9803b4ec050a9bbfcc4071b1d55a1c14a8ae463a SHA512 855947e49e07af915a63ec897ffaa504668812d4697b65a7a3431d591c25682ddbaba029c28748d67d2098e9876dee2cb45d126f9a92e4c006a0e078986cfc36 WHIRLPOOL 7e67c807f6ce9851853218ad45b8ad7d9c4ebb365644e4dcb6d1e0ed648b3b4b8edb3c0eda774ca75ca6c9f2a0792ca590c3137956bbfc053282d43349337761
+EBUILD simgear-2017.2.1.ebuild 1415 SHA256 fab688c40c79ca132485c88621338d12cc4492cc02d57b300ee2da3131a2a57c SHA512 ac5c3ff2dba76fe9f071355a1347a2805b97c6b0c2f6987123d4c394ae012d4915fa8bfaae1f749cc8c69e1d6a92506faebedc97b16ee617c0a9aedb8f691cd1 WHIRLPOOL d9d33bace0c9c0c84ce9a473f96294836ded39accbbab78f7f32c76610e380e2d463e992d7012cb9af8b6838fe165d13d1132da5b90be3effbb1e9775cde2f5c
+EBUILD simgear-9999.ebuild 1350 SHA256 77ae95bb34402e2caf3b31067dfeea20d2d0e80750bacaa1d49c038da97b2902 SHA512 f2554944961cb5bb7d93088e520d6d2ef10bf3f818e1ead536bad1e2e496263f10a47c2d5324764a4e4d0a5b02bd8df2b917223c35c98aa2836bb8ab9bf2f2be WHIRLPOOL 88eedbf104b5deedb38600140901cc9d7ef35f74e8719014db15b27683f8c96a22dd7409a7f08bf63511937a0b7bd11911447dff0c4d4b633c8583e8d8e18b33
+MISC ChangeLog 3863 SHA256 0e3f4cffaee7dca075735c98d102a8af72b4078df93c5419fb4891f031f019bc SHA512 44d2c31a72201607d228025745618c7e793ff35683e51c086929e18df67b5ad5033c3ed8ffba58a550e611b97d512a548d325e9b7e04fc6a851045617d1e0552 WHIRLPOOL eb84bfece0d5c07f0c2fe97e994bae577bf739a6418d538b7bc1608dcf1ddf474da568218513c9c5744343ea9e7c4e47f60391281270ef6d1cfbe897fee10c92
+MISC ChangeLog-2015 11386 SHA256 e0f137c2d4af1399f5a82596819c8747c2b8a6f169f2e1aec448661c82a19f3b SHA512 3b9f8eced1e5c6d43df1bd2130a8237f706dd9a8bfa895896685f99eb44913022b3f61093951daa8c006bc3dd4ec8c1e2b5ea138c52405c68e93a6ef7aac8e17 WHIRLPOOL 26632a83550817a77ae4c23251741a7f94e47af66aa0b98235d84c5516b9b232504e19641e092a5f72043c0a8ab67c71949ecd1c9071deea3e2baab418e0c5f2
+MISC metadata.xml 911 SHA256 dc9b9526a5e3b3563022fec68811ee4dd55598d9dba1e4184bb9191541a04227 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8 WHIRLPOOL 7b3a61b3c8f9d594eca223c0048fda38698138ae2bd35807c1e4219aa336192764986a02d64a002bbc0f36eb8bde718122eec39086ac31495ac59eb07c0800a5
diff --git a/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch b/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch
new file mode 100644
index 000000000000..a9ebe507cee4
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch
@@ -0,0 +1,47 @@
+--- a/simgear/scene/material/Effect.cxx
++++ b/simgear/scene/material/Effect.cxx
+@@ -32,7 +32,7 @@
+ #include <map>
+ #include <queue>
+ #include <utility>
+-#include <boost/tr1/unordered_map.hpp>
++#include <boost/unordered_map.hpp>
+ 
+ #include <boost/bind.hpp>
+ #include <boost/foreach.hpp>
+@@ -832,13 +832,13 @@
+ 
+ // XXX Should these be protected by a mutex? Probably
+ 
+-typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>,
++typedef boost::unordered_map<ProgramKey, ref_ptr<Program>,
+                            boost::hash<ProgramKey>, ProgramKey::EqualTo>
+ ProgramMap;
+ ProgramMap programMap;
+ ProgramMap resolvedProgramMap;  // map with resolved shader file names
+ 
+-typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
++typedef boost::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
+ ShaderMap;
+ ShaderMap shaderMap;
+ 
+--- a/simgear/scene/material/Effect.hxx
++++ b/simgear/scene/material/Effect.hxx
+@@ -19,7 +19,7 @@
+ 
+ #include <vector>
+ #include <string>
+-#include <boost/tr1/unordered_map.hpp>
++#include <boost/unordered_map.hpp>
+ 
+ #include <boost/functional/hash.hpp>
+ 
+@@ -127,7 +127,7 @@
+             bool operator()(const Key& lhs, const Key& rhs) const;
+         };
+     };
+-    typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>,
++    typedef boost::unordered_map<Key, osg::observer_ptr<Effect>,
+                                     boost::hash<Key>, Key::EqualTo> Cache;
+     Cache* getCache()
+     {
diff --git a/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
new file mode 100644
index 000000000000..63eb79ed35ce
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
@@ -0,0 +1,28 @@
+From 9971d517fdf351e40467c88915d3e30e56f999d4 Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski <reavertm@gmail.com>
+Date: Thu, 15 Jun 2017 04:58:03 +0200
+Subject: [PATCH] Link shared SimGearScene with libgdal when enabled
+
+---
+ simgear/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
+index 18c2e04c..6c7cb495 100644
+--- a/simgear/CMakeLists.txt
++++ b/simgear/CMakeLists.txt
+@@ -173,6 +173,11 @@ if(NOT SIMGEAR_HEADLESS)
+         ${OPENGL_LIBRARY}
+         ${JPEG_LIBRARY})
+ 
++    if(ENABLE_GDAL)
++        target_link_libraries(SimGearScene
++            ${GDAL_LIBRARIES})
++    endif()
++
+     # only actually needed by canvas/KeyboardEvent.cxx
+     target_include_directories(SimGearScene PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/utf8/source)
+ endif()
+-- 
+2.13.0
+
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-2016.4.4.ebuild b/dev-games/simgear/simgear-2016.4.4.ebuild
new file mode 100644
index 000000000000..f2c7c954e253
--- /dev/null
+++ b/dev-games/simgear/simgear-2016.4.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="+dns debug 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 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=OFF
+		-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-2017.1.2.ebuild b/dev-games/simgear/simgear-2017.1.2.ebuild
new file mode 100644
index 000000000000..d3914e9c36c0
--- /dev/null
+++ b/dev-games/simgear/simgear-2017.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+dns debug 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 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-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-2017.1.3.ebuild b/dev-games/simgear/simgear-2017.1.3.ebuild
new file mode 100644
index 000000000000..d3914e9c36c0
--- /dev/null
+++ b/dev-games/simgear/simgear-2017.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+dns debug 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 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-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-2017.2.1.ebuild b/dev-games/simgear/simgear-2017.2.1.ebuild
new file mode 100644
index 000000000000..10aad3a8c38b
--- /dev/null
+++ b/dev-games/simgear/simgear-2017.2.1.ebuild
@@ -0,0 +1,65 @@
+# 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 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2017.2.1-gdal-underlinking.patch
+	"${FILESDIR}"/${PN}-2017.2.1-boost-1.65-tr1-removal.patch
+)
+
+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..00072326c7c9
--- /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 )
+"
+
+PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" )
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	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/Manifest b/dev-games/t4k-common/Manifest
new file mode 100644
index 000000000000..7b1581555fb6
--- /dev/null
+++ b/dev-games/t4k-common/Manifest
@@ -0,0 +1,6 @@
+AUX t4k-common-0.1.1-libpng.patch 799 SHA256 9a778a6bbe6f1c95b5ad1418a35bb41dbdbe3afb6520745eb9bd34dfa7a27dbf SHA512 e9d8c4a2487d972231ef631feac67cea679ec585faf0453cf513290f318778070222b6e9a54725f18f5ea874c009a370ec55245a05151e9ecf19403b876be6ac WHIRLPOOL 1d3a8f36e6bcaadfac547162949a8b7e49908feaf43fdb17380b6f9f946906634aa6c4bea74549e557ea949607250195676c101c48f2afcc88bc6fbe82e3a16e
+DIST t4k_common-0.1.1.tar.gz 629215 SHA256 42c155816dae2c5dad560faa50edaa1ca84536530283d37859c4b91e82675110 SHA512 ddf9c0ccf1b6a4ab9f009794262fef86587e31e5110e5a8041214d7c94c607b9f4ca5ec21f04254bfc00a625ab75a04a69b3dcaff9ec13dbb92d5d82b6e375cf WHIRLPOOL 689ea91fea9323b468377eb2ed0c71fbef90527959d65304d110ce70ca62e6173dd010cd449b23785d4a3bc9f2c5c63272ecc8a8032068073a5deec93ae3a7b0
+EBUILD t4k-common-0.1.1.ebuild 947 SHA256 46844e1668ff7a4adcb0879907710049e49fc2989de8c292e3e5fd6a43e61654 SHA512 80e8688b02901af87c5c38c518f382fb0147bdb26aafc2aaa15e5749116a7b1ea6c4140f2cf223e1f34bf4dd01a96a238d4b345873d54375921c3f0e792a792a WHIRLPOOL fca485351e9f4327bca30584115d70c9b7fe55a3ff5d8c58e71457c2ca2f0efe2db2d4aa650d2a69cfef46d0b18f3b414e910a9077b6ad48aeb83e06ae5972ae
+MISC ChangeLog 2870 SHA256 565bd418bc3be79e72be4b8356e5f1bbbc7950450cdf2e354f1c34dfc2ac25e3 SHA512 4a7763df5ec172303442590ad84b59173b4940308b0634bde04c380cda38ca488f5e9d95c041c154efa068f578e7a10a3a1f9fa779c770e666833b443e597159 WHIRLPOOL e2c01996605bac27663a412cdc162b5ed3dc3b38f65cf36c1d1eaf0abe01ae807c66074451b6400092dd5c8c5303524bc41977e2900644c62d17f373a99a5a0d
+MISC ChangeLog-2015 715 SHA256 bdd78d3e63efa992b8c5cfe424efa8bc96415f5facbc2b1ac10d057b88fb2900 SHA512 46a70bd6cf713373a7457f15f02783056a1aaf88cfaa20dd42fbff51816a98afe74e57687bb3b204b9c377acf5b7085343d824072d354199612d2eeede190091 WHIRLPOOL 4a7e537b6ff47aacc064c2bec3931640fb92810e885e2ca87f6ffbd5e6e6777e0ba68b43874166d65e2519e972ee9b21f9cd7862552633fafb3c02e0b78f9501
+MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
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/Manifest b/dev-games/tiled/Manifest
new file mode 100644
index 000000000000..86121dbf022d
--- /dev/null
+++ b/dev-games/tiled/Manifest
@@ -0,0 +1,7 @@
+DIST tiled-1.0.2.tar.gz 6601753 SHA256 23dd9ec1c7437f03fbb45d05b0706d8ed9fa4327ac421c6446034ad5c9899d8c SHA512 d85a90cd515a0f7bcd63bd00452ab271e41c4c23ea78a3167024d4052ff83782eca81836874a9acc03ea304782e7ed4e6e377dadea8197874337e58c38dc305b WHIRLPOOL c72fbb2508438672a8b4995e4c2e88404e76b98df6e4522ad7bd4bf99aecde96e6ba267553d152ca89804d0ff4709d82d7205422325b98e09494425f69149d07
+DIST tiled-1.0.3.tar.gz 6601791 SHA256 3d0665bd988a877b7156842daeddd91fa17b1b473d2e5ebf8a62ffe2c9a047e2 SHA512 4f3c97a91794f86f04965a2332e04f51bc588f7bcfef402edb1092c4e58bb6ace9c90ea522a5fa15a46ca39c8249f62818b80be6d65c11a8d41092ead31cd4f7 WHIRLPOOL f69978ef073d1516157306839cab40c3414d5743f1f9c1cfa952fac0ec81cfef075cd8bebba3f3f84b7b9dfdef48ca069728d6c7c041587d42333d332f59a8e9
+EBUILD tiled-1.0.2.ebuild 1300 SHA256 a8aae5d621e55fe5ec20a4d4778c86a3a23e9875fe4a3a772325a52dcdb11a4f SHA512 1a3328233066bc7529bc90ce43bbee079fabc0ef33c81c58f334ebec3ef8126a8f87368e21f6d1e9be94367ffffc8e60091b7ae756fac8df060f3782550feda3 WHIRLPOOL 2e930801ff7d551f14f041db056c3552c8e1f4f52df9d2da3569de5f189d94861e0f7a27a599048ee388c1d96c67f85156d54640e5ad0893f6b93258bd98f00c
+EBUILD tiled-1.0.3.ebuild 1276 SHA256 d433cb54b4ed169c1b24b228bff864be1a57a5e11b74b9fbaef90037d0d80781 SHA512 4c0096521b3441034e05b7a18734e5499364c50be385e5caca8a501040e32f45c50af0f6918875c20be683894a8ceaad799c7372fc6d9a806db3e0266ee90748 WHIRLPOOL c4f2227c676875288b8d3f0a3ecd0d3049926d98cc7a2b2aef3bab3e054752221d23455529e87a77f302ceee358bccd7b0786598e24f0676bfc62d3063de0b00
+MISC ChangeLog 5612 SHA256 100466b566c68a8ebd2a5890a81fe15a797209824bf9bef1423d405d051523dd SHA512 ddaf347b5aa5ae25f853fdfdd8bced11ab07382741799c0cc7c431771776a7f8bb071934bcf3220d55e69a456b3369b58be5ca5b2aad7823bcd8589e79c0e665 WHIRLPOOL 3c234ec5f562fb2686f07116d86b1481053fc95d441f000aa3c478a4023ea4023947c8868652272d62b53ef706d76e0fc2cdad22ffb95b688127c692b9dd441f
+MISC ChangeLog-2015 1944 SHA256 929acd5cc66b771842c29859d4fe9a41f23b3fd0d4f7401f53ec4190b89c3a2a SHA512 6d227e68ad33b08d51861d90654f26dbc096a7c9df1f928b450d5932c757f473d9e042eb6e7466be5b4bb03d3f5e1adad5a07beb13325b09dc525767a65bb0d3 WHIRLPOOL f47e1b3b6be3478176bc92bbf5f8d262d570d47318b5c558458701c2638966bd35adfad699949f929283250d2f5ef069ca7ce25e3b97d584bb13b077aafad011
+MISC metadata.xml 297 SHA256 e1d442eb2679b1fe002bd1eb197a030baadc386be7ae962bab3d0ddf48043b80 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069 WHIRLPOOL 320a33d53f0def12d7b5c80d0d11fcaff0a82174fedb05d0aa0a57e92826808efa57bf3a12f4f2f936337cc2d63cf6c9cc3acf4c03f4c8b14681fd272dfcc5f4
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.2.ebuild b/dev-games/tiled/tiled-1.0.2.ebuild
new file mode 100644
index 000000000000..d65e64b3aece
--- /dev/null
+++ b/dev-games/tiled/tiled-1.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 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="http://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.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtnetwork-5.6:5
+	>=dev-qt/qtopengl-5.6:5
+	>=dev-qt/qtwidgets-5.6: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.0.3.ebuild b/dev-games/tiled/tiled-1.0.3.ebuild
new file mode 100644
index 000000000000..b2e4dcb64ab7
--- /dev/null
+++ b/dev-games/tiled/tiled-1.0.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 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="http://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/Manifest b/dev-games/vamos/Manifest
new file mode 100644
index 000000000000..f743ceac75e7
--- /dev/null
+++ b/dev-games/vamos/Manifest
@@ -0,0 +1,11 @@
+AUX vamos-0.7.1-as-needed.patch 468 SHA256 cf2d4760c9a9a52f9dadf6569e6030b637327c932de846616c925d58ec7f237d SHA512 e06aca9c628b6fd58b63c1808c52d2222b4f99ccde17c07ffb5c6ef0895a940de37ffc36d4d8fe1c382a71b2d3b4ce49007a301903ff6713ebbc34f5871bc164 WHIRLPOOL 23ea8acbcd215f918aa4274adb4d3514d67281d33f7b1f3d85827f2768b4569f499b657f6dafc133c303f6c739c9fe3c766d28e927ef032d86503cebbc57e692
+AUX vamos-0.7.1-gcc46.patch 246 SHA256 4742492fb9ed4f06a866836030e56ea485c1f8caad4284c000e958212a6897a0 SHA512 0ae32707a87d94ba5f1bf3dc085e8109fc1b0f8bc4cf7bdf3997d7b47e65ebc10cbdee667d076cff41f65c461a16519f8615b5b704be66d6863aadd5a971e11b WHIRLPOOL 010224cf5148275693cb9766f0a860aeed39d323db8c3055de951b81bb2663290f2e741ea82136ea73317dc560dfcc6a4cbc3f4d62bbcf38676dd27e5e8349fb
+AUX vamos-0.8.2-fix-buildsystem.patch 9650 SHA256 2be370537209123089fd28ec4f1429013585f8e7cd901c3838c50aec3b9e4924 SHA512 147cc9f7ecf918dd92da85903a4ec6055ae97b45a9850c3c190e72f7f2d3eaaf43c45b155d2e2629d4e4e08cb08463073f27b2d3fa6f0e741055479d64307ba4 WHIRLPOOL 0895819450a43b68195003d22b46d0773f04d8f1235ea021c25a37d05e09c76b0e78f198efb4fc95337da07cb0c98701a2cc98c581f9da0cba1c6fd1b7943e02
+AUX vamos-0.8.2-fix-c++14.patch 554 SHA256 e6b9ae145ea1113afd9b71cf60814d3098bd34aad27587380b6a39b0ba814054 SHA512 b5fb978bfa0a1d3d7986800e3a9d83bd7eb92b2f6b0060f171d4f388acac3714e397cc966641fbe70297534849010081a8d58b7d3eea6549625f952d3fe81179 WHIRLPOOL 98756e1ca49eaf7c54a9aa1f6340829a92588450cacb6c02d1be84fa294fc84b41310a967c38d10547724a8e37c13d1793bce752c68e425d78571fe104fe0c07
+DIST vamos-0.7.1.tar.gz 1681074 SHA256 c81930b5ea376431c0abf868bf23153440eb6c44c1c47e3d9a53a5a15ab35824 SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2 WHIRLPOOL 925b0038ae1638d270f54b7fee81526589bb4e2a67817834d17678063d2587da753d4e75237d610c4c111fabb1fcdb6b6e42417893f78245cd5f04100d7ada09
+DIST vamos-0.8.2.tar.gz 2148278 SHA256 d4c2d16b4947b5afc46b4f5dcf797d11173ed86b4a599e78223c227a882b8f1d SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880 WHIRLPOOL 75173076be9739282d56713517a1083155f57b2c4cf5a5379a61de952613671a0fd03820a48682082d29c98c7b44bebfef86d17ab9164b5d8b43e1a522bab36e
+EBUILD vamos-0.7.1.ebuild 887 SHA256 5493ba29decbbe5ebb3c31e82a171e8846420aad67d8195c661c789129ef67e4 SHA512 785311b6f0e3fecfbca8b0151fbb8ca2981c880d8eb2776deea9114faa4dda9acffe21eb87ab9225296c9c82ab3359e732a4f9e44e09c4c6efb42dbab8328fda WHIRLPOOL f4ff806f7a09dc8619a6c094d7e8dfb4230385025d19f9adff7376a69c0e7c18c44fb2fff8f23e4fca78691c747d4420241d0b29d8ba539d10bd429f144c80f7
+EBUILD vamos-0.8.2.ebuild 1166 SHA256 7c22f5bb6d3fed01392b64f2c903e8c43857d7ecbbecc4fcd177e0dce721ac5a SHA512 260c7eb011f3b7f66c800930592077ef7f91e9e7c9267825307d3075333ecfde78d334f98f922d745e9d4660e0c06f90c7337671dba7798aaf471d73cc935097 WHIRLPOOL fabaa38f071b67296ddafff5bdc4a0e596755b29f0336e8eb006f6ea968a1a78eb3a1bcb1ff1be8b30a0e0432a03955b6bc918502d3310e16c5d47631d73d4ec
+MISC ChangeLog 2492 SHA256 09da7ae9837c13b5336bf645151b7e41da7116446a65019d625aab0cf86f8aed SHA512 7721bbc13525fe0f68b67e359899dbf7f4a0d83b0baa57b0be4413d5dbbaa6151711be80bc903040db0d3893e0c49fb1215e42f51e763705694b29fe1d4b5472 WHIRLPOOL fc47f253ba4ef1c1053398fa739991027d0cad31854274ce6939693a9142528682179d3c178b554af287801d248a0434f86f71415924d0ef7aa8eab525e4aeb6
+MISC ChangeLog-2015 3897 SHA256 bca16fed77619404a4687d89132415502e4e2f5df629c1dbaaa96445a9fd7d0b SHA512 c03f7d288799b24d6f5d1fa0d9734f3401e2e130fbc039c303c02405d3663488bc4f7720b77157503a5d9934e1da357073a8203ee7ea7552591df1721cea3c63 WHIRLPOOL 1dcf71c508a0a8421a0b35a6b7f7dfde3da941ed15ff5a8d4a40548532a305084f6b84d48fa0cc6bb2b723adaaf0b8ca4452f06013c19625e878de7405259c14
+MISC metadata.xml 328 SHA256 08658aea6deb64194070163d0b443ec71f79d890d87b9a2a8d8bb1639351edb2 SHA512 698c72452fe860f88cff1cb1de6a46902e02fe685081693c2dacbd5c9843fe717128cb9a706849adf19359bba1f809863fe62d569e776649bf5f8b5190663cb4 WHIRLPOOL 6ad690f33a669c6a424bf28eaee370a522e95409ac050c385c19b2cbbf086941bb3fb71da4a48d1dda29dc8c6dedd7939ea8f56890f50b9b09fac3617cd6e5d7
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..60687c852c86
--- /dev/null
+++ b/dev-games/vamos/vamos-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+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() {
+	default
+
+	dobin caelum/.libs/caelum
+	newdoc caelum/README README.caelum
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-games/wfmath/Manifest b/dev-games/wfmath/Manifest
new file mode 100644
index 000000000000..b6411802ed15
--- /dev/null
+++ b/dev-games/wfmath/Manifest
@@ -0,0 +1,5 @@
+DIST wfmath-1.0.2.tar.bz2 399987 SHA256 7072d640597bf102c6641e9237aaec6582849ef6c1cdc3062e369f070e20d883 SHA512 3506dbaed5db914b0be5483d5b589d95ed495b6375384e4b045844f8d76240f97b5c322ac432faf177f16da0fedd0b0e6006877a9b40e7f5d31d3324efa6de57 WHIRLPOOL fe10805d66707d9b99faa31aa6f048a8ec12c20b47d96ce2f72da253a5e152e069775d65c56da059ca74689eb44d5848dbbf4dd2d1a3f6001bd2b76ac9e8f378
+EBUILD wfmath-1.0.2.ebuild 619 SHA256 709b92e00be9f361253863c32b8b8d3866e0a41b32d43f6338d06f1249f1915a SHA512 e62f658eb953f0ceaae142780b5cac6500b00ba60b7778b21ceff9743b08b073f0fc4889b721d6bd99b576bab59eaaf3550e1f1a3c7098072a1697abde2dcdaa WHIRLPOOL 6785b212956bd97ffd58ea83534e0ef05a6a480a2480c7ff16b34ff3db4152186a040e84ee4ea1707a9213353e810ce7d897502b5b24f0c7cd0a7953285518c3
+MISC ChangeLog 3303 SHA256 d8b28ffce76d13f47a3900835154480f0d06f1be4735fef2f25fbc05eedd7c16 SHA512 7c2d5da21c74b3eb97fbf4fe4fbf9af656b727da6c0d637273cc7dcfd6aa98eeb0dfb10da21dbf4e714b00ca0ffd8fbb197f31202fd467d60d2d00ef8abedb47 WHIRLPOOL c40f46cd94ce0cc0db905fc764edec8b0b73db5aee63402551d00f6b8a499073d703c9fce841b0789d75b0de1bffa96e749f91ad40e4fa1bf816ab23e614fa4e
+MISC ChangeLog-2015 3585 SHA256 b1ddb03beafe7e74239a6c73383da5921144fe807c0445530269e1fc11c69096 SHA512 5723b6be3ecb078586ad934d211299133176b446fc3292f0be63c6beef93da1763b763eae193694aee8002dfb68a4c9d8533f5c4f8aa2ded9c1238dcc5d549f9 WHIRLPOOL 28f68e72fc4c8a31b848aa16bda5efab67e95a38dc5fe6c0c7160799dc25d13e33d04bcc8e5c7595402f9d89bf6eb0a720dbad218fae7981443bd5ded2eeb977
+MISC metadata.xml 834 SHA256 12b200ae0b543bbf33cb1e27cdcc1c8fd51cce3337c674414367b47783e84070 SHA512 c99727d8b00129b35865cf778eb9d6c438e53189982b54a87a2463e3664d98572f24d4fe3b7d814c2d19bfe52bafc4df4be155d68f2cc177523ede9ac104deac WHIRLPOOL 1d407fbceefd7aa1cbc73e5a23836b0e3b49fc43a159a1f9232dda9f71547490714f6f68088c113c0a2385ba91746541dc2291c54d2a93c732922221d8d27e46
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>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-games