gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-strategy
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
335 files changed, 9936 insertions, 838 deletions
diff --git a/games-strategy/0ad-0.0.22_alpha b/games-strategy/0ad-0.0.22_alpha
deleted file mode 100644
index 39f7dc6eb1a0..000000000000
--- a/games-strategy/0ad-0.0.22_alpha
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.22_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
-DESCRIPTION=A free, real-time strategy game
-EAPI=6
-HOMEPAGE=https://play0ad.com/
-IUSE=editor +lobby nvtt pch test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB
-RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.22_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.wildfiregames.com/0ad-0.0.22-alpha-unix-build.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4980d5dc338d15157b618aa8c9dd194
diff --git a/games-strategy/0ad-0.0.23_alpha b/games-strategy/0ad-0.0.23_alpha
deleted file mode 100644
index 69c86eb4cd10..000000000000
--- a/games-strategy/0ad-0.0.23_alpha
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.23_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
-DESCRIPTION=A free, real-time strategy game
-EAPI=6
-HOMEPAGE=https://play0ad.com/
-IUSE=editor +lobby nvtt pch test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB
-RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.23_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-build.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abc7af71b215f9d7334e907f192555d5
diff --git a/games-strategy/0ad-data-0.0.22_alpha b/games-strategy/0ad-data-0.0.22_alpha
deleted file mode 100644
index dbdaa1d2196f..000000000000
--- a/games-strategy/0ad-data-0.0.22_alpha
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Data files for 0ad
-EAPI=6
-HOMEPAGE=https://play0ad.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
-SLOT=0
-SRC_URI=http://releases.wildfiregames.com/0ad-0.0.22-alpha-unix-data.tar.xz
-_md5_=a2954d2fcc40f833961132970d09815e
diff --git a/games-strategy/0ad-data-0.0.23_alpha b/games-strategy/0ad-data-0.0.23_alpha
deleted file mode 100644
index 7b9579ca0564..000000000000
--- a/games-strategy/0ad-data-0.0.23_alpha
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Data files for 0ad
-EAPI=6
-HOMEPAGE=https://play0ad.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
-SLOT=0
-SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-data.tar.xz
-_md5_=24409256c806f1dba6c0baf4989b2e64
diff --git a/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
new file mode 100644
index 000000000000..2413f34ee5d1
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+	insinto /usr/share/0ad
+	doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
new file mode 100644
index 000000000000..9b33e87f7945
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="0ad-${PV/_/-}"
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+	insinto /usr/share/0ad
+	doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
new file mode 100644
index 000000000000..64e4b07e2854
--- /dev/null
+++ b/games-strategy/0ad-data/Manifest
@@ -0,0 +1,5 @@
+DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 BLAKE2B 2b3fd05919e344136114903706d5ec452d432e1fb839e9324b23a627bd740e1994dd10db0d4345447950807908d0f299c745c7f0b6c3cb3215f5a23147ab3e51 SHA512 ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
+DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B 7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6 SHA512 9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
+EBUILD 0ad-data-0.0.22_alpha.ebuild 532 BLAKE2B ff7e7ac49fd99928ea0f0c67046db9b480a75af2dff228a6db4da328b5862260fb5372bf242b2dbc8d46969c46b3a917b57b1c80f37b444683810c159bad04f0 SHA512 6ab42ff53c6c0f97bc137c7f453a5a341839c02aef5bcd5ae30b31110e318ee3b8cd6731a2686ecb9e4ba08f4eb9083b3166bea4f17691e1ee55a50f0fa7e040
+EBUILD 0ad-data-0.0.23_alpha.ebuild 534 BLAKE2B 3517c0dc476b363aab702a25ef2bc4d19c2fd162b0c6c9ea41995b190215c8ff859d630700db8760cd80514d4197a4d4583cacf991d0b98118b755da1dc55e30 SHA512 d6d9d5de0fa84a76ca80d701de2e0d8340ac8990c83bd6238e66a180a02820112a3c1e20c2c75fa1e03b4fe4671cdde716092841bbe76c71db060b7ceb3452a3
+MISC metadata.xml 330 BLAKE2B 9f9fa8d997d33a71d11d118396fd718f8109e3e44410d5c8c2aeb54cc48b4c979e88922be7e5e9b0009e330b67ce85696fd747c52b2a23b51dc3e8d475c24254 SHA512 55b1c876bea472fc72321364ac95e97c950c675c68e9a32862eb6135b96f7bf7da5c0b787ddd28685b322a33c60dd51dafe1d382eb46e066a5cf8bd15fb5347f
diff --git a/games-strategy/0ad-data/metadata.xml b/games-strategy/0ad-data/metadata.xml
new file mode 100644
index 000000000000..263ee40e5d4f
--- /dev/null
+++ b/games-strategy/0ad-data/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">zero-ad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
new file mode 100644
index 000000000000..1cb088436b4b
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )
+	nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use editor && setup-wxwidgets
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
new file mode 100644
index 000000000000..0e44c4e36fb1
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )
+	nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use editor && setup-wxwidgets
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
new file mode 100644
index 000000000000..0ec270713ead
--- /dev/null
+++ b/games-strategy/0ad/Manifest
@@ -0,0 +1,6 @@
+AUX 0ad-0.0.21_alpha-gentoo.patch 3905 BLAKE2B 265020af1e1df234d0932c6294e0cda9c0f48bc1b311d6770c8347431c17e5e99c68f4c52cf6e1277ffb2e57431a6c237d2dc4f452e563eb343b06f62ab1eede SHA512 592e9fdff6ef6d88efc9c4a5c856e41240845187cc4a4b3d9d6b5c616eb1f664fdf702b7b0a30cdfeedd6d87ac0fab913df477567b84d42e13d2cf2761cfdec8
+DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 BLAKE2B a9204949e4dd669228b2a0e2c2dc5d2ccd4f18767e32c4f772714c61314ca0fb283d41201cb9f0547588a6dbdc20fd9d7d14ff153bc3087003c27f4ec2f6fef9 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771
+DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
+EBUILD 0ad-0.0.22_alpha.ebuild 3388 BLAKE2B 527f19ac8a3dd38ee3f2d6005223ea45b76a01739640bae7456427c6687518a7a5fe60dd7cc77a13861c0bfd381e59fad8d81084a6245b84566dffa459035e2f SHA512 c7d221e6ee1c8e68686e82c245ba90878acb9a7fe64b1916fefdbba381e479f98419bbe06b0f4f7d3c8308d515ab0f88c97f5d29a299eadbd0d734511e6c1b34
+EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc
+MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343
diff --git a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch b/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch
new file mode 100644
index 000000000000..79549d193683
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch
@@ -0,0 +1,88 @@
+--- 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make
++++ 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make
+@@ -26,9 +26,9 @@
+   DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+   INCLUDES  += -I../../src/host/lua-5.1.4/src
+   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
+-  CFLAGS    += $(CPPFLAGS) -Wall -Os
+-  CXXFLAGS  += $(CPPFLAGS) -Wall -Os
+-  LDFLAGS   += -s -rdynamic
++  CFLAGS    += $(CPPFLAGS) -Wall
++  CXXFLAGS  += $(CPPFLAGS) -Wall
++  LDFLAGS   += -rdynamic
+   LIBS      += -lm -ldl 
+   RESFLAGS  += $(DEFINES) $(INCLUDES) 
+   LDDEPS    += 
+@@ -48,8 +48,8 @@
+   DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+   INCLUDES  += -I../../src/host/lua-5.1.4/src
+   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
+-  CFLAGS    += $(CPPFLAGS) -Wall -g
+-  CXXFLAGS  += $(CPPFLAGS) -Wall -g
++  CFLAGS    += $(CFLAGS) $(CPPFLAGS) -Wall
++  CXXFLAGS  += $(CXXFLAGS) $(CPPFLAGS) -Wall
+   LDFLAGS   += -rdynamic
+   LIBS      += -lm -ldl 
+   RESFLAGS  += $(DEFINES) $(INCLUDES) 
+--- 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua
++++ 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua
+@@ -136,8 +136,6 @@
+ 		if not cfg.flags.Symbols then
+ 			if cfg.system == "macosx" then
+ 				table.insert(result, "-Wl,-x")
+-			else
+-				table.insert(result, "-s")
+ 			end
+ 		end
+ 	
+--- 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile
++++ 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile
+@@ -9,9 +9,9 @@
+ 
+ CXX ?= g++
+ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
+-CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL
+-CXXFLAGS_TEST := -O0 -g -D_DEBUG
++CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
++CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
++CXXFLAGS_TEST := -D_DEBUG
+ LIBS += `pkg-config libxml-2.0 --libs`
+ INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
+ INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
+--- 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh
++++ 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh
+@@ -93,20 +93,8 @@
+ cd js/src
+ 
+ # Clean up data generated by previous builds that could cause problems
+-rm -rf build-debug
+ rm -rf build-release
+ 
+-# We want separate debug/release versions of the library, so we have to change
+-# the LIBRARY_NAME for each build.
+-# (We use perl instead of sed so that it works with MozillaBuild on Windows,
+-# which has an ancient sed.)
+-perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build
+-mkdir -p build-debug
+-cd build-debug
+-CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal
+-${MAKE} ${MAKE_OPTS}
+-cd ..
+-
+ perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build
+ mkdir -p build-release
+ cd build-release
+@@ -161,12 +149,9 @@
+ mkdir -p ${INCLUDE_DIR_DEBUG}
+ mkdir -p ${INCLUDE_DIR_RELEASE}
+ cp -R -L ${FOLDER}/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
+-cp -R -L ${FOLDER}/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/
+ 
+ mkdir -p lib/
+-cp -L ${FOLDER}/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_DST_SUFFIX}
+ cp -L ${FOLDER}/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs38-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-release${LIB_DST_SUFFIX}
+-cp -L ${FOLDER}/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs38-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-debug${DLL_DST_SUFFIX}
+ cp -L ${FOLDER}/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs38-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-release${DLL_DST_SUFFIX}
+ 
+ # On Windows, also copy debugging symbols files
diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
new file mode 100644
index 000000000000..11542ae7c10a
--- /dev/null
+++ b/games-strategy/0ad/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="editor">Include Atlas scenario editor projects</flag>
+		<flag name="lobby">Enable the use of <pkg>net-libs/gloox</pkg>
+			and the multiplayer lobby</flag>
+		<flag name="nvtt">Support for some uncompressed data formats
+			via <pkg>media-gfx/nvidia-texture-tools</pkg>
+			(might be needed for some mods)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">zero-ad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f40c4da18201..2c672c271129 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/asc-2.6.0.0-r2 b/games-strategy/asc-2.6.0.0-r2
deleted file mode 100644
index bcd4289609ca..000000000000
--- a/games-strategy/asc-2.6.0.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=app-arch/bzip2 dev-games/physfs dev-lang/lua:0 dev-libs/boost dev-libs/expat dev-libs/libsigc++:1.2 media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound media-libs/freetype media-libs/xvid x11-libs/wxGTK:3.0[X] app-arch/zip dev-lang/perl virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=turn based strategy game designed in the tradition of the Battle Isle series
-EAPI=6
-HOMEPAGE=http://www.asc-hq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 dev-games/physfs dev-lang/lua:0 dev-libs/boost dev-libs/expat dev-libs/libsigc++:1.2 media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound media-libs/freetype media-libs/xvid x11-libs/wxGTK:3.0[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/asc-hq/asc-2.6.0.0.tar.bz2 http://www.asc-hq.org/music/frontiers.ogg http://www.asc-hq.org/music/time_to_strike.ogg http://www.asc-hq.org/music/machine_wars.ogg
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=877b4d7bfeaea4b33788b8fef621e1d8
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
new file mode 100644
index 000000000000..8e4786acd600
--- /dev/null
+++ b/games-strategy/asc/Manifest
@@ -0,0 +1,8 @@
+AUX asc-2.6.0.0-freetype_pkgconfig.patch 1012 BLAKE2B 8e6619f39c1ac5dfcc9e07c0bfd160ed55300aba75eda17aa9d40620d5be4f1da6a3233699f5cdea7a016580f02a8b456143a5c96f6b62f2ed78591d91d3df1c SHA512 f27e02554711bad885a53929f6049607201ea2090fa686b4d680c47470a0f7fec53c84a3f4657341fa46a3ef0369f204246b4bf2d3b25d588953e288edaa8a19
+AUX asc-2.6.0.0-gcc6-nothrow-in-dtors.patch 741 BLAKE2B f74d9e7529433ee86dd3f0406cc79a52ddcd0cca0880749268f5878f1aaacc7c67fce131af1d568c3f19549dfa21c5c20eed8a7116fc7fccefd689dc8bcf05b8 SHA512 d92086128b2b491a6f0c96d0b92f2e5ae9a7d521070405b7971fafa4ab953e6d4996784a6c5837b8cbf2811a18e043481c0278d960f6fe9804d8da68c8afa32d
+DIST asc-2.6.0.0.tar.bz2 42280527 BLAKE2B a2ab8777f36d64924bb12359226792ea6d76a07f306bfe2f7204f50de5c103d524fbb69eb88106c293312650619cf3683a25a6afa6176941e8efb72edca9424c SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540
+DIST frontiers.ogg 4691844 BLAKE2B 02909247293439b72ca2f94b515abd53ebf931ac4ffbcc7a4d7909cfdcc79cd1411c973f42760e6012197ead5ce2369895d52b8b4fea5107f62e852502f2428d SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af
+DIST machine_wars.ogg 3138308 BLAKE2B 7c1f4e2c652b70dc9e41f313a8428a22844d1f98717b3c59061d462cf6d4a8f30c2ea2f7d2032afd8b6c9d50513286c409d8d21fb78c59bd246bd4cce3255029 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8
+DIST time_to_strike.ogg 3830679 BLAKE2B ced7de55d8f52177ee5fac6a19a4f76df8b50f70f9d62e42b10d6868608ebf88fe5405e072ee7b1cbc2152f54f4ae66fe3e025c13faf9b57b09a6c117a2c3d13 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee
+EBUILD asc-2.6.0.0-r2.ebuild 1777 BLAKE2B 04c24eaf6ed938e37bf6660a91f2ce8ff00ea5b106741436e50c4a6cf26b41c2eb1148903178685849131e51ad02699795d0b581b04cc3d17b0fb840c7426e04 SHA512 5df6fc0a21c2102049456591f00aab405559d9881117eb6bfda6e354c2d66f02d2cdede9598866d3288c3dd7f269880ae9e9c8eb2ffee1f79a2a4c098935268c
+MISC metadata.xml 329 BLAKE2B 0289ce2add055169d9f1b87baa936fe3b1066e11f9cf774fa46c26adfc534c7edc7c16e568000d3ebcb9936849be0c73fa44a2508a6d05c723cda6be1ba05dbd SHA512 1fa38f0da7bfc4cc3f1193758234379a9932c58742b914deebfc2d8101154e6303497b61c018eec7f52d5e8561ea2d7df89ad89f5d1cbe3f8a7732a1c922b051
diff --git a/games-strategy/asc/asc-2.6.0.0-r2.ebuild b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
new file mode 100644
index 000000000000..6f17949ef838
--- /dev/null
+++ b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0
+inherit autotools toolchain-funcs flag-o-matic wxwidgets
+
+DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
+HOMEPAGE="http://www.asc-hq.org/"
+SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
+	http://www.asc-hq.org/music/frontiers.ogg
+	http://www.asc-hq.org/music/time_to_strike.ogg
+	http://www.asc-hq.org/music/machine_wars.ogg"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/bzip2
+	dev-games/physfs
+	dev-lang/lua:0
+	dev-libs/boost
+	dev-libs/expat
+	dev-libs/libsigc++:1.2
+	media-libs/libpng:0
+	media-libs/libsdl[video]
+	media-libs/sdl-image[gif,jpeg,png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-sound
+	media-libs/freetype
+	media-libs/xvid
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+
+DEPEND="${RDEPEND}
+	app-arch/zip
+	dev-lang/perl
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch
+	"${FILESDIR}/"/${P}-freetype_pkgconfig.patch #657998
+)
+
+src_unpack() {
+	local f
+
+	unpack ${P}.tar.bz2
+	for f in ${A}
+	do
+		case ${f} in
+		*ogg)
+			cp "${DISTDIR}/${f}" "${S}/data/music" || die
+			;;
+		esac
+	done
+}
+
+src_prepare() {
+	default
+	# required for freetype_pkgconfig patch
+	eautoreconf
+}
+
+src_configure() {
+	need-wxwidgets unicode
+	# Added --disable-paraguitest for bugs 26402 and 4488
+	# Added --disable-paragui for bug 61154 since it's not really used much
+	# and the case is well documented at http://www.asc-hq.org/
+	if [[ $(gcc-major-version) -eq 4 ]] ; then
+		replace-flags -O3 -O2
+	fi
+	local myeconfargs=(
+		--disable-paraguitest
+		--disable-paragui
+		--datadir="/usr/share"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc -r doc/*
+}
diff --git a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..a07cd2f86274
--- /dev/null
+++ b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/657998
+
+--- asc-2.6.0.0/configure.ac
++++ asc-2.6.0.0/configure.ac
+@@ -401,22 +401,7 @@
+       FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
+       FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`"
+    else
+-      AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
+-      AC_CHECK_HEADER(ft2build.h,have_ft2build=yes)
+-      if test "$have_ft2build" != "yes"; then
+-         have_freetype="no"
+-      elif test "$have_freetype" = "yes"; then
+-         FREETYPE_LIBS="-lfreetype"
+-         ft2inc="no"
+-         AC_MSG_CHECKING(freetype2 include directory)
+-         if test -d /usr/local/include/freetype2; then
+-            ft2inc="/usr/local/include/freetype2"
+-         elif test -d /usr/include/freetype2; then
+-            ft2inc="/usr/include/freetype2"
+-         fi
+-         AC_MSG_RESULT($ft2inc)
+-         FREETYPE_CFLAGS="-I$ft2inc"
+-      fi
++      PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=yes)
+    fi
+ 
+    if test x$have_freetype = xno; then
diff --git a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
new file mode 100644
index 000000000000..e710b22f8c8b
--- /dev/null
+++ b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
@@ -0,0 +1,32 @@
+Bug: https://bugs.gentoo.org/612934
+Upstream Bug: https://sourceforge.net/p/asc-hq/patches/2/
+
+--- a/source/basestrm.cpp
++++ b/source/basestrm.cpp
+@@ -1728,7 +1728,6 @@
+       }
+    } catch ( ... ) {
+       displayLogMessage( 9, ASCString("~tn_c_lzw_filestream : caught exception") );
+-      throw;
+    }
+ }
+ 
+--- a/source/simplestream.cpp
++++ b/source/simplestream.cpp
+@@ -43,6 +43,7 @@
+  #endif
+ #endif
+ 
++#include "util/messaginghub.h"
+ 
+ tnbufstream::tnbufstream (  )
+ {
+@@ -270,7 +271,7 @@
+ 
+    int res = fclose( fp );
+    if ( res != 0 ) 
+-      throw  tfileerror ( getDeviceName() + " : " + strerror(errno));
++      displayLogMessage( 9, ASCString( getDeviceName() + " : " + strerror(errno) ) );
+       
+    _mode = uninitialized;
+ 
diff --git a/games-strategy/asc/metadata.xml b/games-strategy/asc/metadata.xml
new file mode 100644
index 000000000000..33170f2a7547
--- /dev/null
+++ b/games-strategy/asc/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">asc-hq</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/boswars-2.7-r2 b/games-strategy/boswars-2.7-r2
deleted file mode 100644
index bc7c44b06109..000000000000
--- a/games-strategy/boswars-2.7-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-lang/lua:0 media-libs/libogg media-libs/libpng:0 media-libs/libsdl[opengl,sound,video] media-libs/libtheora media-libs/libvorbis virtual/opengl x11-libs/libX11 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Futuristic real-time strategy game
-EAPI=6
-HOMEPAGE=https://www.boswars.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/lua:0 media-libs/libogg media-libs/libpng:0 media-libs/libsdl[opengl,sound,video] media-libs/libtheora media-libs/libvorbis virtual/opengl x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.boswars.org/dist/releases/boswars-2.7-src.tar.gz https://dev.gentoo.org/~hasufell/distfiles/boswars-2.7-fixed-images-for-libpng-1.6.tar.xz mirror://gentoo/bos.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ece430fbc1b56f37ed465b02f58727d
diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest
new file mode 100644
index 000000000000..ba8b15347275
--- /dev/null
+++ b/games-strategy/boswars/Manifest
@@ -0,0 +1,7 @@
+AUX boswars-2.7-gentoo.patch 606 BLAKE2B 0945db9d0b236de84676f31727b9974e0d67b1f8cb9f59e46178e0560166a6e506ecc4b555dc52fd4bd935dd253bbdce0ba243325cb1bc88a044c3de7f2e0aee SHA512 d538c1a5cd794b27c7f33989c5b1d3820cbcd7a4195d7cbd18dd92631aac4e5c2a3ab15447e178dcb2e51bcdcb00e939bf29c2f4b70b74a1ac44f841f52f6e98
+AUX boswars-2.7-scons-blows.patch 944 BLAKE2B 3594599a427660be601f21340a2a1ed992762b345988a3b6daffc766022234e455b166253aab35df7f67b6cd6a023268a5e9246e501e9f50117434ac45dcb288 SHA512 45e723feaa282760644e11a3e61e52726b6fffb388f7a6b5a0a47a97319e88341e238b46d8dbbe94cf178d5d18ea4ba8ebc257cd16dd98d8aa3cd5cff8d0eecd
+DIST bos.png 620 BLAKE2B c1759f8be923d8d1e0465a3a51affdab71276c78ec6f771fbb856bf46551e798ddf018d03b49f3a40fef65ea3b379aa63ee64d25f2e99a392507e4ca13934af1 SHA512 6a15a5c82f9cff3462d498620a1dd1c7a2a460119689078157e61b27e7e5243a8ac2da7f01c1848d614167a3a748ca1f3e03c1f218479ede3a1c2c0ae85b3cc3
+DIST boswars-2.7-fixed-images-for-libpng-1.6.tar.xz 552956 BLAKE2B a719fbd72a5f170281efc98441051b8e8740e0cbdd2b4ed147220cacb934794786cb34dd183863f53ddf5b80bf101857f51bda086408b435ca349475c7c1a2c5 SHA512 794addf06cfd5c5bb0ad0988a90337a3a6332789de7bc942807602c84c4fafe4c4b12da63ae210ca220a1be6dcd9677fa9ddb1ae62a7d26a7748af35b07303dc
+DIST boswars-2.7-src.tar.gz 77280735 BLAKE2B 641632faa07251f66cb2fd05efe79c398ba04a51dcbeecc97b3340346889fc6643da285e3976df2ed0ca50557f96a342ad9cc2d00de8cb65a02db65c2ac6c9e3 SHA512 2573c61684e83f356a80292adcf780cc001a4be2a31abba20e6f93ed6deaa38b8eca87f29935a4fe0edc9b4e0fdc3f78ddd709b8132aaaa048ffbcd6c498ec80
+EBUILD boswars-2.7-r2.ebuild 1535 BLAKE2B bf159bb4e1242c9cfded4cf8b479c6460bb38846b81b4efa8d7da1d1656ed5f12ed44ec07e5d0b08e9b5f761305d0435fde10415890c2413ae63ac9ff6aac341 SHA512 27decbfde53aff821aa3501781bbdbd9c5dd95dd0d7dcdcc69ae71157bcb377ea1aaf51303335d583ce277aa96177bef40eb7cc15172d424763d185d862ef3a8
+MISC metadata.xml 514 BLAKE2B 4f6163ce340262a203c22c2aad0c32973d66e3dcc79015ec4833c1c4dcb5decd182dc0643fee09aff12d123359ef9dcddd2d27771228406e8ca433879744fb19 SHA512 d253904f4c25482960a7815a05eccb8ff0c9acae13491713c47c98c90e012ad0cddc3e964529ab008e6db13602fe6b4d60df76a24ee66aac5f13efa13615440b
diff --git a/games-strategy/boswars/boswars-2.7-r2.ebuild b/games-strategy/boswars/boswars-2.7-r2.ebuild
new file mode 100644
index 000000000000..679d91a6ab3b
--- /dev/null
+++ b/games-strategy/boswars/boswars-2.7-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils scons-utils
+
+DESCRIPTION="Futuristic real-time strategy game"
+HOMEPAGE="https://www.boswars.org"
+SRC_URI="https://www.boswars.org/dist/releases/${P}-src.tar.gz
+	https://dev.gentoo.org/~hasufell/distfiles/${P}-fixed-images-for-libpng-1.6.tar.xz
+	mirror://gentoo/bos.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/lua:0
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/libtheora
+	media-libs/libvorbis
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-scons-blows.patch
+)
+
+src_unpack() {
+	default
+	# bug 475764
+	cp -dRp ${P}-fixed-images-for-libpng-1.6/* ${P}-src/ \
+		|| die "copying fixed images failed!"
+}
+
+src_prepare() {
+	default
+
+	rm -f doc/{README-SDL.txt,guichan-copyright.txt} || die
+
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		engine/include/stratagus.h \
+		|| die
+	sed -i \
+		-e "/-O2/s:-O2.*math:${CXXFLAGS} -Wall:" \
+		SConstruct \
+		|| die
+}
+
+src_compile() {
+	escons || die
+}
+
+src_install() {
+	newbin build/${PN}-release ${PN}
+	insinto /usr/share/${PN}
+	doins -r campaigns graphics intro languages maps patches scripts sounds units
+	newicon "${DISTDIR}"/bos.png ${PN}.png
+	make_desktop_entry ${PN} "Bos Wars"
+	# COPYRIGHT.txt is referenced by the html
+	dodoc CHANGELOG COPYRIGHT.txt README.txt
+	dodoc -r doc/*
+}
diff --git a/games-strategy/boswars/files/boswars-2.7-gentoo.patch b/games-strategy/boswars/files/boswars-2.7-gentoo.patch
new file mode 100644
index 000000000000..a005f6f93ad0
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.7-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ru boswars-2.6.1-src/engine/include/stratagus.h boswars-2.6.1-src/engine/include/stratagus.h
+--- boswars-2.6.1-src/engine/include/stratagus.h	2010-04-11 08:12:18.000000000 -0400
++++ boswars-2.6.1-src/engine/include/stratagus.h	2010-05-22 02:33:50.021377764 -0400
+@@ -133,7 +133,7 @@
+ --  General
+ ----------------------------------------------------------------------------*/
+ #ifndef STRATAGUS_LIB_PATH
+-#define STRATAGUS_LIB_PATH  "."      /// Where to find the data files
++#define STRATAGUS_LIB_PATH  "@GENTOO_DATADIR@"      /// Where to find the data files
+ #endif
+ 
+ #ifndef STRATAGUS_HOME_PATH
diff --git a/games-strategy/boswars/files/boswars-2.7-scons-blows.patch b/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
new file mode 100644
index 000000000000..1d2c04cc4f1b
--- /dev/null
+++ b/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
@@ -0,0 +1,27 @@
+--- a/SConstruct	2010-11-19 21:09:45.724976603 -0500
++++ b/SConstruct	2010-11-19 21:11:05.723197985 -0500
+@@ -22,6 +22,7 @@
+ ##
+ 
+ import os
++import SCons.Util
+ import sys
+ import glob
+ from stat import *
+@@ -50,6 +51,16 @@
+ 
+ opts = DefineOptions("build_options.py", ARGUMENTS)
+ env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work
+ Help(opts.GenerateHelpText(env))
+ mingw = env.Clone()
diff --git a/games-strategy/boswars/metadata.xml b/games-strategy/boswars/metadata.xml
new file mode 100644
index 000000000000..242aa2331bb7
--- /dev/null
+++ b/games-strategy/boswars/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 lang="en">
+Bos Wars is a futuristic real-time strategy game. It is possible to play against
+human opponents over LAN, internet, or against the computer.
+Bos Wars aims to create a completely original and fun open source RTS game.
+</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/colobot-0.1.11 b/games-strategy/colobot-0.1.11
deleted file mode 100644
index 10ec4898119e..000000000000
--- a/games-strategy/colobot-0.1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Colobot is an educational real-time strategy video game featuring 3D graphics
-EAPI=6
-HOMEPAGE=https://colobot.info/
-IUSE=devbuild test tools doc +openal
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
-SLOT=0
-SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-0.1.11.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad783f8a596504d8870d77a3fc106d91
diff --git a/games-strategy/colobot-9999 b/games-strategy/colobot-9999
deleted file mode 100644
index 647a88a0823a..000000000000
--- a/games-strategy/colobot-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Colobot is an educational real-time strategy video game featuring 3D graphics
-EAPI=6
-HOMEPAGE=https://colobot.info/
-IUSE=devbuild test tools doc +openal
-LICENSE=GPL-3
-RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad783f8a596504d8870d77a3fc106d91
diff --git a/games-strategy/colobot-data-0.1.11 b/games-strategy/colobot-data-0.1.11
deleted file mode 100644
index f1aa1bd6e5e9..000000000000
--- a/games-strategy/colobot-data-0.1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/unzip music_flac_convert? ( media-sound/vorbis-tools ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Data package for colobot (Colonize with Bots)
-EAPI=6
-HOMEPAGE=https://colobot.info/
-IUSE=+music music_flac_convert +music_ogg
-KEYWORDS=~amd64
-LICENSE=GPL-3
-REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
-SLOT=0
-SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.11-alpha.zip -> colobot-data-0.1.11.zip music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-flac.tar.gz )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0dc1f38fe33f9015edb6737df4637e04
diff --git a/games-strategy/colobot-data-9999 b/games-strategy/colobot-data-9999
deleted file mode 100644
index 1f270fa61fed..000000000000
--- a/games-strategy/colobot-data-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/unzip music_flac_convert? ( media-sound/vorbis-tools ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Data package for colobot (Colonize with Bots)
-EAPI=6
-HOMEPAGE=https://colobot.info/
-IUSE=+music music_flac_convert +music_ogg
-LICENSE=GPL-3
-REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
-SLOT=0
-SRC_URI=music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_latest.tar.gz -> colobot-data-9999-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_latest.tar.gz -> colobot-data-9999-music-flac.tar.gz )
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5116a6f76451c3520f53b789dfbf9de
diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest
new file mode 100644
index 000000000000..490a1cdd122b
--- /dev/null
+++ b/games-strategy/colobot-data/Manifest
@@ -0,0 +1,8 @@
+DIST colobot-data-0.1.11-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873
+DIST colobot-data-0.1.11-music-ogg.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
+DIST colobot-data-0.1.11.zip 55796087 BLAKE2B 2a1a6fc57bb61423360f89c8bac597754cab872b3154f9b3464bef88555e4dcb9e0296a4b6f85271ef95e71c69d1c31737c8ae3b932a0b64dc8d7cfa8393481b SHA512 2024759af47b4c406325e1d72d119391712ec9d53b4059f3e942e0bd2b3881fdbc9613f79510b9b012cdbc76bebd8a008531da4f94be5d6107887bbcb330417f
+DIST colobot-data-9999-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873
+DIST colobot-data-9999-music-ogg.tar.gz 3686106 BLAKE2B c1565dbcf1aab0e29014623c924ade2ac1b5da9ae9d9231afe3299dfedab0678c3d222e58665fe3ac60291972b7c2d763437246d7816ca7c16e69766a52e9490 SHA512 2ec22944857ccc5276b93d0da4684bfd9d2a80ac712e3396cb01ccbf21a582c22d525e8af9d12828e224ee948173bffb5e31f664cc9333b79b6f3062dd2466ac
+EBUILD colobot-data-0.1.11.ebuild 1417 BLAKE2B e7e337a06bcc0f427ca48686a89b7153b1af7a3a50d20d2dc5c9b7a173d3efd3aa21636af625839673d884431eb8cc46b3425bda2493c2d5b73045f0601c6d52 SHA512 7533d79e52f93510df6c96ff8599d852e8c09b7e6a3f8ecc2d327817d7c3f488314ab797df770a27a558dce480f12c6ef878ade5175d02ce924de25dfbd5763f
+EBUILD colobot-data-9999.ebuild 1298 BLAKE2B 2a719b8b29c7d02b569d452baa874506eff9c1140ee44dd239e5777b7c2f1b240da13de87fce3f3692116d17ec84727999fba6ccd354704986e2b9a3ee6f6731 SHA512 8c580974e4bfb3d5a93540cf08b792aa966f934707edacb5825409d88b3133fa2718fac006bf577b4cceb0717e65f0369eda31e2cf4d3c6689d4ed0a29402805
+MISC metadata.xml 517 BLAKE2B 3f7a70c01e3fedb20ce8ae9ea680b5382ac852ed07684348d506c8c402d18a60ed201b314a3f923ac1974d91498543cd68e89460284148bde6876c303706b8d3 SHA512 abf5513f23d51b18ecc3f7c49148734e90eae4d9e3aaf16e35e0837c245313366ec10e2ada0bd5d5f41e4b297f3bb96d1fcf85c26dd812fd83597db1a9379427
diff --git a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
new file mode 100644
index 000000000000..b60210f63c30
--- /dev/null
+++ b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Data package for colobot (Colonize with Bots)"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="
+	https://github.com/colobot/colobot-data/archive/colobot-gold-${PV}-alpha.zip -> ${P}.zip
+	music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz )
+	music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+music music_flac_convert +music_ogg"
+REQUIRED_USE="
+	music? ( ^^ ( music_flac_convert music_ogg ) )
+	music_flac_convert? ( music )
+	music_ogg? ( music )"
+
+DEPEND="
+	app-arch/unzip
+	music_flac_convert? ( media-sound/vorbis-tools )"
+
+S="${WORKDIR}/${PN}-colobot-gold-${PV}-alpha"
+
+src_unpack() {
+	unpack "${P}.zip"
+
+	cd "${S}" || die
+	if use music; then
+		tar xf "${DISTDIR}/${P}"-music-*.tar.gz -C "${S}/music" || die "Failed to unpack music"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use music; then
+		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMUSIC=$(usex music)
+		-DMUSIC_FLAC=$(usex music_flac_convert)
+		-DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/games-strategy/colobot-data/colobot-data-9999.ebuild b/games-strategy/colobot-data/colobot-data-9999.ebuild
new file mode 100644
index 000000000000..63f52ef31b0f
--- /dev/null
+++ b/games-strategy/colobot-data/colobot-data-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/colobot/colobot-data"
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="Data package for colobot (Colonize with Bots)"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="
+	music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_latest.tar.gz -> ${P}-music-ogg.tar.gz )
+	music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_latest.tar.gz -> ${P}-music-flac.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+music music_flac_convert +music_ogg"
+REQUIRED_USE="
+	music? ( ^^ ( music_flac_convert music_ogg ) )
+	music_flac_convert? ( music )
+	music_ogg? ( music )"
+
+DEPEND="
+	app-arch/unzip
+	music_flac_convert? ( media-sound/vorbis-tools )"
+
+src_unpack() {
+	git-r3_src_unpack
+
+	if use music; then
+		tar xf "${DISTDIR}/${P}"-music-*.tar.gz -C "${S}/music" || die "Failed to unpack music"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use music; then
+		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMUSIC=$(usex music)
+		-DMUSIC_FLAC=$(usex music_flac_convert)
+		-DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/games-strategy/colobot-data/metadata.xml b/games-strategy/colobot-data/metadata.xml
new file mode 100644
index 000000000000..f19541007ed9
--- /dev/null
+++ b/games-strategy/colobot-data/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">colobot/colobot-data</remote-id>
+	</upstream>
+	<use>
+		<flag name="music">Enable music support</flag>
+		<flag name="music_flac_convert">Fetch flac music and convert it to ogg</flag>
+		<flag name="music_ogg">Fetch ogg music</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
new file mode 100644
index 000000000000..24574f7a7939
--- /dev/null
+++ b/games-strategy/colobot/Manifest
@@ -0,0 +1,4 @@
+DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e
+EBUILD colobot-0.1.11.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd
+EBUILD colobot-9999.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd
+MISC metadata.xml 528 BLAKE2B 55374b7caad73e5a5a2a7ecd705dd8631158642fcd6444417d422b1b433d36f92d741ae3fd097748d0cdd80651834bd63281179aece38a8ab6a92bed6fed968b SHA512 112e65009d79a3cee912908358f763c294d2662cd1c8119506c678a9763940f7c323f99bf1cdb8880aecd7fb6df81be9d1ddfb5802a1a87e4a0edc841217e98f
diff --git a/games-strategy/colobot/colobot-0.1.11.ebuild b/games-strategy/colobot/colobot-0.1.11.ebuild
new file mode 100644
index 000000000000..02e4757ef02e
--- /dev/null
+++ b/games-strategy/colobot/colobot-0.1.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
+HOMEPAGE="https://colobot.info/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/colobot/colobot"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="devbuild test tools doc +openal"
+
+DEPEND="
+	dev-games/physfs
+	dev-libs/boost:=
+	media-libs/glew:0
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/libsndfile:=
+	media-libs/libvorbis:=
+	media-libs/sdl2-image
+	media-libs/sdl2-ttf
+	media-sound/vorbis-tools
+	sys-devel/gettext
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
+	games-strategy/colobot-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEV_BUILD=$(usex devbuild)
+		-DTESTS=$(usex test)
+		-DTOOLS=$(usex tools)
+		-DINSTALL_DOCS=$(usex doc)
+		-DOPENAL_SOUND=$(usex openal)
+		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
+		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 256 desktop/colobot.ico
+}
diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
new file mode 100644
index 000000000000..02e4757ef02e
--- /dev/null
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
+HOMEPAGE="https://colobot.info/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/colobot/colobot"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="devbuild test tools doc +openal"
+
+DEPEND="
+	dev-games/physfs
+	dev-libs/boost:=
+	media-libs/glew:0
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/libsndfile:=
+	media-libs/libvorbis:=
+	media-libs/sdl2-image
+	media-libs/sdl2-ttf
+	media-sound/vorbis-tools
+	sys-devel/gettext
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
+	games-strategy/colobot-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEV_BUILD=$(usex devbuild)
+		-DTESTS=$(usex test)
+		-DTOOLS=$(usex tools)
+		-DINSTALL_DOCS=$(usex doc)
+		-DOPENAL_SOUND=$(usex openal)
+		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
+		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 256 desktop/colobot.ico
+}
diff --git a/games-strategy/colobot/metadata.xml b/games-strategy/colobot/metadata.xml
new file mode 100644
index 000000000000..3816bd533efb
--- /dev/null
+++ b/games-strategy/colobot/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">colobot/colobot</remote-id>
+	</upstream>
+	<use>
+		<flag name="devbuild">TODO</flag>
+		<flag name="tools">Build tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-strategy/crimson-0.5.3-r1 b/games-strategy/crimson-0.5.3-r1
deleted file mode 100644
index b8966b5a1ccf..000000000000
--- a/games-strategy/crimson-0.5.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib ) dev-libs/libxslt test? ( app-text/docbook-xml-dtd:4.2 dev-libs/libxml2 )
-DESCRIPTION=Tactical war game in the tradition of Battle Isle
-EAPI=6
-HOMEPAGE=http://crimson.seul.org/
-IUSE=test zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://crimson.seul.org/files/crimson-0.5.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=44f49e27fa1305345c0db056d701f072
diff --git a/games-strategy/crimson/Manifest b/games-strategy/crimson/Manifest
new file mode 100644
index 000000000000..5b018af99190
--- /dev/null
+++ b/games-strategy/crimson/Manifest
@@ -0,0 +1,3 @@
+DIST crimson-0.5.3.tar.bz2 882366 BLAKE2B 6faece818105d29dd2d141b925b332cfd5214dd918f5c07cacd2f6cdfcd6a58c86e6ab1cc2fce396fbf24839f5dded619e92a786f03663e78068926a8d0e6be3 SHA512 9632317c4b258ed5e501ad1d058706ed654fc621b07099f65d93e29fe92e53fc8f6bbffa13c70fc2129f30695d3f10e85174234dc96cc171631b3465d2b7cffc
+EBUILD crimson-0.5.3-r1.ebuild 939 BLAKE2B edc3f30e9e491dd3fe94acd0ef3bafaa153021dd465ca4b63dd4ec8b0b5ee0c25abde13e47b09326eb10f0c0beaad0f019df2744331f02badadadd78e4e1721a SHA512 fe6a679dc47f6297fec3864f2f2f9f6b4abb0bf7a2a2250a4df6b7994fd99dbf2d3838c6e4844f105732950ea4981cd6743675036be7aed675baa047dc0d1e4c
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/crimson/crimson-0.5.3-r1.ebuild b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..ad228438eb35
--- /dev/null
+++ b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Tactical war game in the tradition of Battle Isle"
+HOMEPAGE="http://crimson.seul.org/"
+SRC_URI="http://crimson.seul.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test zlib"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf
+	media-libs/sdl-net
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	test? (
+		app-text/docbook-xml-dtd:4.2
+		dev-libs/libxml2
+	)
+"
+
+src_configure() {
+	econf \
+		--enable-sound \
+		--enable-network \
+		$(use_with zlib) \
+		--enable-cfed \
+		--enable-bi2cf \
+		--enable-comet \
+		--enable-cf2bmp
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		pixmapsdir="/usr/share/pixmaps" \
+		install
+	einstalldocs
+	rm -rf "${ED}/usr/share/applications"
+	make_desktop_entry crimson "Crimson Fields"
+}
diff --git a/games-strategy/crimson/metadata.xml b/games-strategy/crimson/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/crimson/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/darwinia-1.4.0_beta9 b/games-strategy/darwinia-1.4.0_beta9
deleted file mode 100644
index 873870d56527..000000000000
--- a/games-strategy/darwinia-1.4.0_beta9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=the hyped indie game of the year. By the Uplink creators
-EAPI=5
-HOMEPAGE=http://www.darwinia.co.uk/support/linux.html
-IUSE=cdinstall
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Introversion
-PROPERTIES=cdinstall? ( interactive )
-RDEPEND=~virtual/libstdc++-3.3 media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-full-1.4.0b9.sh
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=deadbf88f354f4b99dbc832fc7c54f8a
diff --git a/games-strategy/darwinia-demo-1.3.0-r1 b/games-strategy/darwinia-demo-1.3.0-r1
deleted file mode 100644
index cd30bab4dc13..000000000000
--- a/games-strategy/darwinia-demo-1.3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Darwinia, the hyped indie game of the year. By the Uplink creators
-EAPI=6
-HOMEPAGE=http://www.darwinia.co.uk/downloads/demo_linux.html
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Introversion
-RDEPEND=media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] ~virtual/libstdc++-3.3 virtual/opengl[abi_x86_32(-)]
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-demo2-1.3.0.sh
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0fb1d6a9143f67db07b1a3bdea726d22
diff --git a/games-strategy/darwinia-demo/Manifest b/games-strategy/darwinia-demo/Manifest
new file mode 100644
index 000000000000..ddeecd4498f3
--- /dev/null
+++ b/games-strategy/darwinia-demo/Manifest
@@ -0,0 +1,3 @@
+DIST darwinia-demo2-1.3.0.sh 22470072 BLAKE2B 3169e6de1293eb8e62094e1773dbb871882a5f18d993dd495c27455525c178d02ce21a47425e070da01153eb8d0cdb764f6276da8919d6b0492718701ddf8fb9 SHA512 f561f3e741052888d8a23445f01e0c2a8d2b207b7786b25f297d76d0f4b4ef91bbf7d1ec842e5e2b1051f3f122af12058e2bcb2495478846713e49c2c7d7d92d
+EBUILD darwinia-demo-1.3.0-r1.ebuild 1052 BLAKE2B f645373ccd2f39128d9807cc35553209a7b5e95dd7939f574febd2c303b35766808abe02f1412e1d6b3c5648e445d0a5a80be66003b8a6ff059d8062ea58c6c3 SHA512 656aed9eb59f4a7f372b477d1d344c5e824f5e91c5a7f78f18dae1808ccf74b5722993e31cad597953308a5be815c9cde93ca628fc01a71a5f6140015ada12ee
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..c49c2f6401b3
--- /dev/null
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="Darwinia, the hyped indie game of the year. By the Uplink creators"
+HOMEPAGE="http://www.darwinia.co.uk/downloads/demo_linux.html"
+SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}2-${PV}.sh"
+
+LICENSE="Introversion"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/libvorbis[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	~virtual/libstdc++-3.3
+	virtual/opengl[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir="/opt/${PN}"
+
+src_unpack() {
+	unpack_makeself
+}
+
+src_install() {
+	exeinto "${dir}/lib"
+	insinto "${dir}/lib"
+
+	doexe lib/{darwinia.bin.x86,open-www.sh}
+	doins lib/{sounds,main,language}.dat
+
+	insinto "${dir}"
+	dodoc README
+
+	exeinto "${dir}"
+	doexe bin/Linux/x86/darwinia
+
+	make_wrapper darwinia-demo ./darwinia "${dir}" "${dir}"
+	newicon darwinian.png ${PN}.png
+	make_desktop_entry darwinia-demo "Darwinia (Demo)"
+}
diff --git a/games-strategy/darwinia-demo/metadata.xml b/games-strategy/darwinia-demo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/darwinia-demo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/darwinia/Manifest b/games-strategy/darwinia/Manifest
new file mode 100644
index 000000000000..64b7a5494be5
--- /dev/null
+++ b/games-strategy/darwinia/Manifest
@@ -0,0 +1,3 @@
+DIST darwinia-full-1.4.0b9.sh 4228121 BLAKE2B f1cae61e3ad6802a1e04fc5306bfbb7194ad08df29a82a376dc7f1945ab8f1f99620653800bb2458941f2004488abf441c211bc3f6d7c65e4d3f47cb9155e5f6 SHA512 ed228943d4e70fc5799bbe7566b4fd862f2494f9d02bcd874f0d1b93d7bbc9a2c24a98fb5b8219fed20759bfe2af54d6ea33c60ddd8d8850e591a89822b41bb5
+EBUILD darwinia-1.4.0_beta9.ebuild 1466 BLAKE2B 710ba32f15ec5480f7103d667cca0d21241c486f6355d175706beb017371a7db6efc8ad755f5ef0d213a93bff87251cfbc2bd4b186d6032030d4a823a2b04992 SHA512 095fc06955198e382c49ab81f8e5dec75b736f3c57ce2d30972f40550551f4f82f58f538da8c8b3df8533b038eee1c039a0497b5dc6ebc989107e8258ad5edf1
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
new file mode 100644
index 000000000000..37781bd8245d
--- /dev/null
+++ b/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CDROM_OPTIONAL="yes"
+inherit eutils unpacker cdrom games
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="the hyped indie game of the year. By the Uplink creators"
+HOMEPAGE="http://www.darwinia.co.uk/support/linux.html"
+SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}-full-${MY_PV}.sh"
+
+LICENSE="Introversion"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="
+	~virtual/libstdc++-3.3
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/libvorbis[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${dir:1}/lib/darwinia.bin.x86"
+
+src_unpack() {
+	use cdinstall && cdrom_get_cds gamefiles/main.dat
+	unpack_makeself
+}
+
+src_install() {
+	insinto "${dir}"/lib
+	exeinto "${dir}"/lib
+
+	doins lib/{language,patch}.dat
+	doexe lib/darwinia.bin.x86 lib/open-www.sh
+
+	exeinto "${dir}"
+	doexe bin/Linux/x86/darwinia
+
+	if use cdinstall ; then
+		doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat
+	fi
+
+	dodoc README
+	newicon darwinian.png darwinia.png
+
+	games_make_wrapper darwinia ./darwinia "${dir}" "${dir}"
+	make_desktop_entry darwinia "Darwinia"
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	if ! use cdinstall; then
+		ewarn "To play the game, you need to copy main.dat and sounds.dat"
+		ewarn "from gamefiles/ on the game CD to ${dir}/lib/."
+	fi
+	games_pkg_postinst
+}
diff --git a/games-strategy/darwinia/metadata.xml b/games-strategy/darwinia/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/darwinia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/defcon-demo-1.60-r1 b/games-strategy/defcon-demo-1.60-r1
deleted file mode 100644
index 00ae24d07863..000000000000
--- a/games-strategy/defcon-demo-1.60-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Global thermonuclear war simulation with multiplayer support
-EAPI=6
-HOMEPAGE=http://www.introversion.co.uk/defcon/
-IUSE=+system-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Introversion
-RDEPEND=media-libs/libogg media-libs/libvorbis >=sys-libs/glibc-2.3 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext system-libs? ( media-libs/libsdl[sound,video] )
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_i386.deb ) amd64? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_amd64.deb )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39b1c663606f9fc445deb2f5517879a5
diff --git a/games-strategy/defcon-demo/Manifest b/games-strategy/defcon-demo/Manifest
new file mode 100644
index 000000000000..9390dbfad4c6
--- /dev/null
+++ b/games-strategy/defcon-demo/Manifest
@@ -0,0 +1,5 @@
+AUX defcon 400 BLAKE2B 1258e4b6db8262ecd08cf481799a6a296bb7043af3a03a320a10d17ecb4672e990031ef3d2a8e1e2be915fb8f47696fb755fa4502fc194b0cdb3ca590b031857 SHA512 d417fcf9560a3b3a7232e3c86b4315f0de6ed86ce8263348520910ff6bc1d14e649f31d500f52c70c2be655836261219ca9dce4f8df9a32d5ca2b00421667058
+DIST defcon_1.6-1_amd64.deb 62377900 BLAKE2B ad6047a5f57492facf17da50a9d3003181d4352eebaa08e7185a676b3dcfb8a2c3d1001c96c09ae417d482b3a97894032084ede22f841516b9f67ed014861743 SHA512 b71aacc3cd94eec8f1ea19ee03d8098fcdd96191c12d614f55076826ef0bb44c8ada66dfd3df7d94d042b33bdd8fa5f0f58e69fc980d6213c320ab4ce2d682a9
+DIST defcon_1.6-1_i386.deb 62311684 BLAKE2B 3dddd5495410dc875d4ac9ecaea26cbbf2cb258ccdf0ffe0ddb7234009b7986c1ebcb17bdef93a579db8b41eeefaeecea9ebb09bcdb049bee14c0b6af6df26c7 SHA512 0e60e8fbca2f3046228b656990e3adb471de4f64a99d435c96b1e5a8cc49b1250c48ceeb19a4bcb58354e750398de2559256d26a38b20286dec3c0ce7f97ebb8
+EBUILD defcon-demo-1.60-r1.ebuild 2178 BLAKE2B ac3629eede6f8f96dc1dbd2e0f821682b8e73835b9110ce8259cdc38fb212fd5a5712b7755ea6302a9376ae13abd643930313ba45b81885f9bc47339910e9b5e SHA512 76deacb77ad8d5959a750bc74e71cd30d16b70394065879ea34ad7c0eb39204e7326e5efc777928b9544ad68e50534bb76ddcf605c2263b137dfea9c345f7dae
+MISC metadata.xml 390 BLAKE2B a7ff9a2ca8c3de7f31c7acea1ca630c3d0aa39fa108d6bc515c68d2801402051a863a4f1ff260ed56249cf5eef72d0638d86b746293f0b54c85642f4f569b3bb SHA512 afc01361f043a0267f09fc1a83571ade9a3cb3633744ff18e5b5c5f14ac061b5e9d6876c0b3805664a8321a6572bb6c2c3c1f3f0d9f0762d306b80a1b517ea5b
diff --git a/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild b/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild
new file mode 100644
index 000000000000..486a654236bb
--- /dev/null
+++ b/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs gnome2-utils
+
+MY_PN=defcon
+MY_PV=${PV:0:3}
+MY_PVR=1
+MY_P=defcon_${MY_PV}-${MY_PVR}
+
+DESCRIPTION="Global thermonuclear war simulation with multiplayer support"
+HOMEPAGE="http://www.introversion.co.uk/defcon/"
+SRC_URI="x86? ( http://www.introversion.co.uk/defcon/downloads/${MY_P}_i386.deb )
+	amd64? ( http://www.introversion.co.uk/defcon/downloads/${MY_P}_amd64.deb )"
+
+LICENSE="Introversion"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+system-libs"
+RESTRICT="mirror strip"
+
+# glibc discussion:
+# http://forums.introversion.co.uk/defcon/viewtopic.php?t=4016
+RDEPEND="
+	media-libs/libogg
+	media-libs/libvorbis
+	>=sys-libs/glibc-2.3
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	system-libs? ( media-libs/libsdl[sound,video] )"
+DEPEND=""
+
+QA_PREBUILT="/opt/${PN}/lib/${MY_PN}.bin.x86"
+
+S="${WORKDIR}/usr/local/games/${MY_PN}"
+
+src_unpack() {
+	default
+	unpack ./data.tar.gz
+
+	cd "${S}" || die
+	# maintain compatibility with old installation/script
+	[[ -e lib64 ]] && { mv lib64 lib || die ;}
+	[[ -e ${MY_PN}.bin.x86_64 ]] && { mv ${MY_PN}.bin.x86_64 ${MY_PN}.bin.x86 || die ;}
+}
+
+src_prepare() {
+	default
+
+	# FindPath scripts are ugly and unnecessary
+	if use system-libs ; then
+		rm -f lib/lib*
+	fi
+	sed \
+		-e "s:GAMEDIR:/opt/${PN}:g" \
+		"${FILESDIR}"/${MY_PN} > "${T}"/${MY_PN} || die
+	echo "int chdir(const char *d) { return 0; }" > chdir.c || die
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c"
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c || die
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}/lib"
+	doins *.dat
+
+	exeinto "${dir}"/lib
+	doexe lib/*.so
+	doexe ${MY_PN}.bin.x86
+
+	doicon -s 128 ${MY_PN}.png
+
+	# Can be upgraded to full version, so is not installed as "demo"
+	dobin "${T}"/${MY_PN}
+	make_desktop_entry ${MY_PN} "Defcon"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "Screenshots will appear in ~/.${MY_PN}/lib"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/defcon-demo/files/defcon b/games-strategy/defcon-demo/files/defcon
new file mode 100644
index 000000000000..6e9dd3b5307c
--- /dev/null
+++ b/games-strategy/defcon-demo/files/defcon
@@ -0,0 +1,15 @@
+#!/bin/sh
+if [ -n "GAMEDIR/lib" ] ; then
+	if [ "${LD_LIBRARY_PATH+set}" = "set" ] ; then
+		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:GAMEDIR/lib"
+	else
+		export LD_LIBRARY_PATH="GAMEDIR/lib"
+	fi
+fi
+if [[ ! -e ~/.defcon/lib ]] ; then
+	mkdir -p ~/.defcon/lib \
+	    && cd ~/.defcon/lib \
+	    && ln -s "GAMEDIR"/lib/* .
+fi
+cd ~/.defcon/lib
+LD_PRELOAD="GAMEDIR/lib/chdir.so" exec ./defcon.bin.x86 "$@"
diff --git a/games-strategy/defcon-demo/metadata.xml b/games-strategy/defcon-demo/metadata.xml
new file mode 100644
index 000000000000..6e48df8a7f4f
--- /dev/null
+++ b/games-strategy/defcon-demo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <use>
+    <flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution.</flag>
+  </use>
+</pkgmetadata>
diff --git a/games-strategy/dominions2-2.16 b/games-strategy/dominions2-2.16
deleted file mode 100644
index 90e8a27fe26e..000000000000
--- a/games-strategy/dominions2-2.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Dominions 2: The Ascension Wars is an epic turn-based fantasy strategy game
-EAPI=5
-HOMEPAGE=http://www.illwinter.com/dom2/index.html
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-PROPERTIES=interactive
-RDEPEND=|| ( ppc? ( media-libs/libsdl virtual/opengl virtual/glu ) !ppc? ( media-libs/libsdl[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] ) ) games-misc/games-envd
-RESTRICT=bindist strip
-SLOT=0
-SRC_URI=x86? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) amd64? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) ppc? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_ppc.tgz ) doc? ( http://www.shrapnelgames.com/downloads/DOM2_Walkthrough.pdf http://www.shrapnelgames.com/downloads/manual_addenda.pdf ) mirror://gentoo/dominions2.png
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=adcb6d0af6e0d8ad73a0e105f203a923
diff --git a/games-strategy/dominions2/Manifest b/games-strategy/dominions2/Manifest
new file mode 100644
index 000000000000..a67fa6e3e648
--- /dev/null
+++ b/games-strategy/dominions2/Manifest
@@ -0,0 +1,7 @@
+DIST DOM2_Walkthrough.pdf 549897 BLAKE2B e61df06eae7bf392c4d3f2871d5a6473bba43fc6169617fc56aedd890131a14b2135295fc908bceb9406bb98bfff701d59958776ec0653508ec22e2f57f9ea88 SHA512 cc73bd7e95d8ce1528196f00d91d88a018b88471edade76672feb53b6ff728c9cc5f02e333312533a72842186833669ec290abffa8f51feb15e224b455987b39
+DIST dominions2.png 1135 BLAKE2B 4bfbe3fcdded6eec7a3eea6c9b3dc8b2ae9be2a9f932957d29fedce61cc78f57ae67945903e7d0d5788c37ad76fe053f41c182ef0d0ba38002442e5b99367429 SHA512 1241c64a4acdd4740cc9440ba286b595c2e00a41182c014ef06b7184c3991f2df44e4677f3408b28cd25f928337a60c1e2859486c057ee3bdd393fb99b8d347f
+DIST dompatch216_linux_ppc.tgz 1982323 BLAKE2B 2d56f278fcf188a8e8aa32032872359fa57204d26a37e3b5369367e8297d1f6fb1adc290328ea052be57928efd6c42642294bb62f5b3d209f9028da5c3293bb1 SHA512 6b1ff8b5a041c42193b8f369ee0ff242048fd589ffd9b610628a7bf7a0d159fe6e590b04b914ecbf3b94ef2b94a66a062be84d595777127d8f11311fa92c3ae9
+DIST dompatch216_linux_x86.tgz 1892714 BLAKE2B 72102240b577f696a96ee4ee493180621b5ca65c2fb1394e355210aa3e3ae145e9d8501dff95ffd185344b4259d6df622844504022d9f3475564a6eafc890367 SHA512 9bb2a024235585181f91d8414c07ce8c490fed5ddab9d25817b7ea01618f0f2cf8714fb39a4406abe88e25b354f14ba1ef2db79c39d4c30b4e399d1b60477c2d
+DIST manual_addenda.pdf 192454 BLAKE2B c0fe48855fa8f20cf44c4de3b475494cfa75ba17737f6eab2d537d63fdb7346194a59d3280ad29de1bff1283f3a496a36a8c946841f608a36facb4bbb1719f8b SHA512 ec582e9685edf7164ba8e7c6c99880b30c8a6737d2d339eec2642196abd175857bfef2e1ea3da3ccb0110d441c477c8fad64d47fbb8b1aa39b405484eb548443
+EBUILD dominions2-2.16.ebuild 2650 BLAKE2B a74ba0e758187643a3c69a02825e4adb2c97ae2def4e4f9ceda4a4e71d28a013c40be1881f00e21839fe40568f426db0e9ba9fab89f4051ab110e9b81cef3e01 SHA512 3350412fb2f8679d591441320e6139fd83bde6e74e6ee0ee7c76a6f720b67c30ba59ee85b8bebdb6af7e6c22c53ab71a29eff8461c08f884d150412c08ff6e01
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
new file mode 100644
index 000000000000..eca8acd9d25d
--- /dev/null
+++ b/games-strategy/dominions2/dominions2-2.16.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils cdrom games
+
+DESCRIPTION="Dominions 2: The Ascension Wars is an epic turn-based fantasy strategy game"
+HOMEPAGE="http://www.illwinter.com/dom2/index.html"
+SRC_URI="x86? (
+		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_x86.tgz )
+	amd64? (
+		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_x86.tgz )
+	ppc? (
+		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_ppc.tgz )
+	doc? ( http://www.shrapnelgames.com/downloads/DOM2_Walkthrough.pdf
+		http://www.shrapnelgames.com/downloads/manual_addenda.pdf )
+	mirror://gentoo/${PN}.png"
+
+# I am not sure what license applies to Dominions II and I couldn't find
+# further information on their homepage or on the game CD :(
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+RESTRICT="bindist strip"
+
+RDEPEND="
+	|| (
+		ppc? (
+			media-libs/libsdl
+			virtual/opengl
+			virtual/glu
+		)
+		!ppc? (
+			media-libs/libsdl[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
+			virtual/glu[abi_x86_32(-)]
+		)
+	)"
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+src_unpack() {
+	mkdir -p "${S}"/patch || die
+	cd "${S}"/patch || die
+	if use x86 || use amd64 ; then
+		unpack dompatch${PV/\./}_linux_x86.tgz
+	elif use ppc ; then
+		unpack dompatch${PV/\./}_linux_ppc.tgz
+	fi
+}
+
+src_install() {
+	cdrom_get_cds dom2icon.ico
+	einfo "Copying files to harddisk... this may take a while..."
+
+	exeinto "${dir}"
+	if use amd64 || use x86 ; then
+		doexe "${CDROM_ROOT}"/bin_lin/x86/dom2*
+	elif use ppc ; then
+		doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2*
+	fi
+	insinto "${dir}"
+	doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/*
+	dodoc "${CDROM_ROOT}"/doc/*
+
+	# applying the official patches just means overwriting some important
+	# files with their more recent versions:
+	einfo "Applying patch for version ${PV}..."
+	dodoc "${S}"/patch/doc/*
+	doexe "${S}"/patch/dom2
+	rm -rf "${S}"/patch/doc/ "${S}"/patch/dom2 || die
+	doins -r "${S}"/patch/*
+
+	if use doc; then
+		elog ""
+		elog "Installing extra documentation to '/usr/share/doc/${P}'"
+		elog ""
+		elog "You may want to study 'DOM2_Walkthrough.pdf' carefully if"
+		elog "you are new to Dominions II."
+		elog ""
+		dodoc "${DISTDIR}"/{DOM2_Walkthrough,manual_addenda}.pdf
+	fi
+
+	doicon "${DISTDIR}"/${PN}.png
+
+	# update times
+	find "${D}" -exec touch '{}' \;
+
+	games_make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
+	make_desktop_entry dominions2 "Dominions II" dominions2
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "To play the game run:"
+	elog " dominions2"
+	echo
+}
diff --git a/games-strategy/dominions2/metadata.xml b/games-strategy/dominions2/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/dominions2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/dopewars-1.5.12-r3 b/games-strategy/dopewars-1.5.12-r3
deleted file mode 100644
index 496d1e56b3ff..000000000000
--- a/games-strategy/dopewars-1.5.12-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Re-Write of the game Drug Wars
-EAPI=6
-HOMEPAGE=http://dopewars.sourceforge.net/
-IUSE=nls ncurses gtk gnome sdl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer )
-SLOT=0
-SRC_URI=mirror://sourceforge/dopewars/dopewars-1.5.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=d48af901b202d3bfd667757f70352d6a
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
new file mode 100644
index 000000000000..c469820a201b
--- /dev/null
+++ b/games-strategy/dopewars/Manifest
@@ -0,0 +1,4 @@
+AUX dopewars-1.5.12-CVE-2009-3591.patch 696 BLAKE2B a627b4b714af717942f310411154a069b5ee9a9e98454f325e085354bf1d534528048404cf8c0f78150d5f6af9ca1f8e9aac2d95c90d864e3bea5de51546086d SHA512 3f9476db27f1de31363470688f8a5ec97fa51fda4eb6025da513a1ad1640e5faa802ee7202e0698970eb3bbcb0edadfd304d839f2a3643a64d50e7354c8a049e
+DIST dopewars-1.5.12.tar.gz 1419725 BLAKE2B 930a0406bbf36f874d3bb00c7883c7d47136022e0209ec3993302cd75979d9f80033c973e23d60c4db70a335bfd3b8ff99075af470cb382ded59fc9289ee0edc SHA512 cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a
+EBUILD dopewars-1.5.12-r3.ebuild 1403 BLAKE2B a213900d842e325726df7df70fc7f54b959c15fde83349bd342e9c6cedf441f168eaeb19b02e60cb4cd38729bdae8c7c8e8a2462558c125e98ca1a642e666cd1 SHA512 6892d2e0feb45c180e9430e2718571cfb01c2caa9274c9f1b7f8de1355f8745988aea987604770ec960c523d91141a8c0398beab66eba9f47d08f07c68ef4eb9
+MISC metadata.xml 331 BLAKE2B af8487e0de1082dcc36415bf1216b7fcfdf35a3caf93fe3e5a0f40de32978b442eac43dfc7283a82a5403e5abfc73ff2b48ee6fce3b489a6fbc88529c4db28ab SHA512 26259f05b18c933c638d693805a106d26288c96ba220a719d8ec12d65b28c9abdb1d120694d31c07194282081e92dd83522e936771ab71e2ce86ea12d629d5b4
diff --git a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
new file mode 100644
index 000000000000..4d1c38437619
--- /dev/null
+++ b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Re-Write of the game Drug Wars"
+HOMEPAGE="http://dopewars.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls ncurses gtk gnome sdl"
+
+RDEPEND="
+	ncurses? ( >=sys-libs/ncurses-5.2:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	dev-libs/glib:2
+	nls? ( virtual/libintl )
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-mixer
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}-CVE-2009-3591.patch
+	sed -i \
+		-e "/priv_hiscore/ s:DPDATADIR:\"/var/lib\":" \
+		-e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \
+		-e 's:index.html:html/index.html:' \
+		src/dopewars.c || die
+}
+
+src_configure() {
+	local myservconf
+
+	if ! use gtk ; then
+		myservconf="--disable-gui-client --disable-gui-server --disable-glibtest --disable-gtktest"
+	fi
+
+	econf \
+		$(use_enable ncurses curses-client) \
+		$(use_enable nls) \
+		$(use_with sdl) \
+		--without-esd \
+		--enable-networking \
+		--enable-plugins \
+		${myservconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -r "${ED}"/usr/share/gnome || die
+	rm -rf "${ED}"/usr/share/doc
+	make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png
+	HTML_DOCS="doc/*html" einstalldocs
+}
diff --git a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
new file mode 100644
index 000000000000..3b8b066a81cd
--- /dev/null
+++ b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
@@ -0,0 +1,20 @@
+Patch for CVE-2009-3591 -- bug 288295.
+
+Fetched from upstream SVN:
+http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1033&r2=1032&pathrev=1033
+
+--- trunk/src/serverside.c	2009/03/10 07:18:49	1032
++++ trunk/src/serverside.c	2009/10/05 04:11:32	1033
+@@ -504,6 +504,12 @@
+     break;
+   case C_REQUESTJET:
+     i = atoi(Data);
++    /* Make sure value is within range */
++    if (i < 0 || i >= NumLocation) {
++      dopelog(3, LF_SERVER, _("%s: DENIED jet to invalid location %s"),
++              GetPlayerName(Play), Data);
++      break;
++    }
+     if (Play->EventNum == E_FIGHT || Play->EventNum == E_FIGHTASK) {
+       if (CanRunHere(Play)) {
+         break;
diff --git a/games-strategy/dopewars/metadata.xml b/games-strategy/dopewars/metadata.xml
new file mode 100644
index 000000000000..17b7414b8c0f
--- /dev/null
+++ b/games-strategy/dopewars/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">dopewars</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/dunelegacy-0.96.3 b/games-strategy/dunelegacy-0.96.3
deleted file mode 100644
index d9bc7c1e4b34..000000000000
--- a/games-strategy/dunelegacy-0.96.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,alsa?,sound,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Updated clone of Westood Studios' Dune2
-EAPI=5
-HOMEPAGE=http://dunelegacy.sourceforge.net
-IUSE=+alsa pulseaudio
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,alsa?,sound,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] games-misc/games-envd
-REQUIRED_USE=|| ( alsa pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.3-src.tar.bz2 https://dev.gentoo.org/~hasufell/distfiles/dunelegacy-0.96.3-no-autoreconf.patch.xz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19515a5a8f1045d08f0353d10060a41f
diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
new file mode 100644
index 000000000000..1f0946fbc919
--- /dev/null
+++ b/games-strategy/dunelegacy/Manifest
@@ -0,0 +1,5 @@
+AUX dunelegacy-0.96.3-build.patch 1942 BLAKE2B 8a230ae20884b11b4608437c03466a856b66e49136574ee5c55c5e90de34efbbb0bab7ed4fe90e2653b44fa1f5adb94d002e7d51912732d22bc5e891e593515c SHA512 fa3ffaa26ba1d85bc65d646347ef9c725bfb4f8b7e78c3ca13429356def201bb255d31c6ec684ca99dd0928bf9a3b83af547a7cb865ba1c2475ce03401fa91bb
+DIST dunelegacy-0.96.3-no-autoreconf.patch.xz 8908 BLAKE2B eb1c0a5a155851e199ad2c1f0cbd8f7c583ac148f92e1b2829607c0960bf09a6d8bea8e34749df726f394b3cf796f0c457086d993ace2b3336ce99ed36fb77e1 SHA512 fc17c771a19611057b2990b76eda0eea08e011dcac455bdf7e26bba1f2e2aa6cec120f2dcbce488a2318553f9e58b4a2b5ea24c7e1e27ada9ec5740f2b66ca4c
+DIST dunelegacy-0.96.3-src.tar.bz2 1652302 BLAKE2B 4502300f1364027f1734a0738a648a9ac473a142e8091d08f5c44996fa41a26e91ab030f90d3f961b95b44e7e2bcb72a376915dc014aafee5e3d0dc4f6c8915b SHA512 c84281b44bdac4eec360d90e2f23aa75468cf08c6edd6a5002c539e609312fd39e3284518ef5498201f2b0433d11cf2478cd13a2159af7c6bbef326e680fa241
+EBUILD dunelegacy-0.96.3.ebuild 1392 BLAKE2B 38f15a59aa1cbded27c61a6f5250e494228c2c1591cebe3abfaab5b27ea024d92ed6d9f7b5c0f0f82e71af305a4455cb99cbf35a6b60fa8538b74f81d77e5e32 SHA512 29ec490705192497ca8e4d27a491d70afb56af253e3e73f230a37255dc0f263de3e3acf75b3836931ae96da73f0fa3e061a9d545c6fa9d6851abc0563cbfc240
+MISC metadata.xml 1103 BLAKE2B 0c07587dff0530955a552cf5dee9835ab0c8b3478e994c0b75524ceb6914a4714e02ad13ab52fba10b401a98a068aae9990ea936333014e8c7226c07aef8983c SHA512 de8920f2cb074e969cb3b8310bf2fb111c52c90a2675833fdefc895cafac79091cee0696b52a40065cd81289d80796cb0b0e40bd8db0e349ba92ec180091edcb
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
new file mode 100644
index 000000000000..ee94d40caa60
--- /dev/null
+++ b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# do not use autotools related stuff in stable ebuilds
+# unless you like random breakage: 469796, 469798, 424041
+
+EAPI=5
+inherit eutils gnome2-utils games # STABLE ARCH
+#inherit autotools eutils gnome2-utils games # UNSTABLE ARCH
+
+DESCRIPTION="Updated clone of Westood Studios' Dune2"
+HOMEPAGE="http://dunelegacy.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf.patch.xz" # STABLE ARCH
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+alsa pulseaudio"
+
+RDEPEND="media-libs/libsdl[X,alsa?,sound,pulseaudio?,video]
+	media-libs/sdl-mixer[midi,mp3,vorbis]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# exits on start without libsdl[alsa] or libsdl[pulseaudio]
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+src_prepare() {
+	epatch "${DISTDIR}"/${P}-no-autoreconf.patch.xz # STABLE ARCH
+#	epatch "${FILESDIR}"/${P}-build.patch # UNSTABLE ARCH
+#	eautoreconf # UNSTABLE ARCH
+}
+
+src_install() {
+	default
+
+	doicon -s scalable ${PN}.svg
+	doicon -s 48 ${PN}.png
+	make_desktop_entry ${PN} "Dune Legacy"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
new file mode 100644
index 000000000000..93dd907738bc
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
@@ -0,0 +1,60 @@
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Aug 9 18:57:40 2012 +0200
+
+    respect flags
+    use pkg-config
+    use LDADD instead of LDFLAGS for libs
+
+--- configure.ac
++++ configure.ac
+@@ -16,14 +16,6 @@
+ 
+ AC_SUBST(dunelegacydatadir)
+ 
+-dnl Some flags for gcc
+-CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG"
+-dnl Additional flags: -Wconversion -Wno-sign-conversion
+-
+-dnl Some flags for clang
+-dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter"
+-
+-
+ dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead
+ oldCFLAGS="$CFLAGS"
+ CFLAGS="-ffp-contract=off"
+@@ -33,34 +25,14 @@
+ )
+ CFLAGS="$oldCFLAGS"
+ 
+-case "$target_cpu" in
+-i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";;
+-esac
+-
+-AC_ARG_ENABLE([debug],
+-            [AS_HELP_STRING([--enable-debug],
+-              [compile with debug information @<:@default=disabled@:>@])],
+-            [],
+-            [])
+-
+-if test "$enable_debug" = "yes" ; then
+-	CXXFLAGS="$CXXFLAGS -g"
+-fi
+ 
+ dnl Check for SDL library
+ SDL_VERSION=1.2.0
+-AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
++PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION SDL_mixer])
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+ 
+-dnl Check for SDL_mixer library.
+-AC_CHECK_LIB(SDL_mixer, 
+-       Mix_OpenAudio, 
+-       LIBS="$LIBS -lSDL_mixer", 
+-       AC_MSG_ERROR([*** SDL_mixer library not found!]) 
+-)
+-
+ dnl enet defines
+ AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
+ AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
diff --git a/games-strategy/dunelegacy/metadata.xml b/games-strategy/dunelegacy/metadata.xml
new file mode 100644
index 000000000000..4dc56b2c71f1
--- /dev/null
+++ b/games-strategy/dunelegacy/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="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://sourceforge.net/apps/mediawiki/dunelegacy/index.php?title=Development/Reporting_Bugs</bugs-to>
+		<remote-id type="sourceforge">dunelegacy</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Dune Legacy is an effort by a handful of developers to revitalize
+		the first-ever real-time strategy game. The original game was the
+		basis for the hugely successful Command and Conquer series, and the
+		gameplay has been replicated an extended to a wide variety of
+		storylines and series.
+
+		Lead one of three interplanetary houses, Atreides, Harkonnen or
+		Ordos, in an attempt to harvest the largest amount of spice from
+		the sand dunes. Exchange your spice stockpiles for credits through
+		refinement and build an army capable of thwarting attempts of the
+		other houses to stop your harvesting! 
+	</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/endless-sky-0.9.6 b/games-strategy/endless-sky-0.9.6
deleted file mode 100644
index b2f7ebc80b82..000000000000
--- a/games-strategy/endless-sky-0.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=media-libs/glew:0 media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl >=sys-apps/sed-4 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Space exploration, trading & combat in the tradition of Terminal Velocity
-EAPI=6
-HOMEPAGE=https://endless-sky.github.io
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain
-RDEPEND=media-libs/glew:0 media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.9.6.tar.gz -> endless-sky-0.9.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cbc46f41e551853f1f792f26da8c1a5
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
new file mode 100644
index 000000000000..faeaa83d39e0
--- /dev/null
+++ b/games-strategy/endless-sky/Manifest
@@ -0,0 +1,3 @@
+DIST endless-sky-0.9.6.tar.gz 71119557 BLAKE2B cf4fa6575a701396083815abd55071563f85973dc354b52509dc2fb0f7c803d7c6b44e6ace881bb6103063273f358b525c958e10a3c4ca3ceb3d6f849dd745f9 SHA512 e8dbae856153246f68a3c7ba68fd33a15cf60908f65003f614269df6909ed8d7ad848b4add4ee071b295f58be92c532e6579982d3c20b83d9203b74077f90bae
+EBUILD endless-sky-0.9.6.ebuild 1309 BLAKE2B fbc02bb94f10c278c2fedef310782c70490fe6b5d88da554e7cec5b2fb275ecd34b47738e00325db48ee3ea05df564a087a17b17e7b4b1b883d1ca255b221c6b SHA512 4f3f4763d0c9160043f04a9486c921d9c7eada3258a4da07a61445bcb8c171ce746f9c03881149236e70e66aa96f10f113e1b884a34ae230f75cbf896c1e4e12
+MISC metadata.xml 737 BLAKE2B 0936e186a61932b265cd78766420c6affa33c70415d3a0f5e5089d4813e09b652dbfa5e31fab57e0f44deb04590a7667fa4909b194e389facc9e13f51da0b3ff SHA512 498915ae234ea096b061b14057c2103b6cff7b1fbf0ee1d5076c7b2657a1289fd0d9ab5514e5d459b14dfb23ba967c07a4c052c9854b748fcb45ed6e1c1143c3
diff --git a/games-strategy/endless-sky/endless-sky-0.9.6.ebuild b/games-strategy/endless-sky/endless-sky-0.9.6.ebuild
new file mode 100644
index 000000000000..e01d717396f9
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.9.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils scons-utils
+
+DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity"
+HOMEPAGE="https://endless-sky.github.io"
+SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/glew:0
+	media-libs/libsdl2
+	media-libs/libjpeg-turbo
+	media-libs/libpng:=
+	media-libs/openal
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i 's/\(.*flags += \["\)-O3\("\]\)/\1\2/g' SConstruct || die
+	sed -i 's#env.Install("$DESTDIR$PREFIX/games", sky)#env.Install("$DESTDIR$PREFIX/bin", sky)#g' SConstruct || die
+	eapply_user
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons PREFIX="${D}/usr/" install
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	einfo "Endless Sky provides high-res sprites for high-dpi screens."
+	einfo "If you want to use them, download"
+	einfo
+	einfo "   https://github.com/endless-sky/endless-sky-high-dpi/releases"
+	einfo
+	einfo "and extract it to ~/.local/share/endless-sky/plugins/."
+	einfo
+	einfo "   Enjoy."
+}
diff --git a/games-strategy/endless-sky/metadata.xml b/games-strategy/endless-sky/metadata.xml
new file mode 100644
index 000000000000..5754bfb7b195
--- /dev/null
+++ b/games-strategy/endless-sky/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games</name>
+	</maintainer>
+	<longdescription lang="en">
+		Explore other star systems. Earn money by trading, carrying passengers, or completing missions. Use your earnings to buy a better ship or to upgrade the weapons and engines on your current one. Blow up pirates. Take sides in a civil war. Or leave human space behind and hope to find some friendly aliens whose culture is more civilized than your own...
+	</longdescription>
+	<upstream>
+		<remote-id type="github">endless-sky/endless-sky</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/freeciv-2.5.11 b/games-strategy/freeciv-2.5.11
deleted file mode 100644
index 8a38997b0890..000000000000
--- a/games-strategy/freeciv-2.5.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 ) virtual/pkgconfig !dedicated? ( x11-base/xorg-proto nls? ( sys-devel/gettext ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=multiplayer strategy game (Civilization Clone)
-EAPI=6
-HOMEPAGE=http://www.freeciv.org/
-IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/freeciv/freeciv-2.5.11.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9742b3b8877d0c8836c8bcf4b1d9dce4
diff --git a/games-strategy/freeciv-2.6.0_beta3 b/games-strategy/freeciv-2.6.0_beta3
deleted file mode 100644
index 6c54dcca3bbc..000000000000
--- a/games-strategy/freeciv-2.6.0_beta3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.3 ) virtual/pkgconfig !dedicated? ( x11-base/xorg-proto nls? ( sys-devel/gettext ) ) >=sys-apps/sed-4
-DESCRIPTION=multiplayer strategy game (Civilization Clone)
-EAPI=6
-HOMEPAGE=http://www.freeciv.org/
-IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/freeciv/freeciv-2.6.0-beta3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c64af87fd31ad1da601732a61c93c59d
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
new file mode 100644
index 000000000000..386f97068f47
--- /dev/null
+++ b/games-strategy/freeciv/Manifest
@@ -0,0 +1,6 @@
+AUX freeciv-2.5.11-freetype_pkgconfig.patch 7770 BLAKE2B 89ee785b4db49eebd2a17d24622728933f9a90c813ea7c5c448efc150d6c9fd1f51ade375e549a45190db08efedeca93ec3c287cff54cf3f7b842a9cd84a14ba SHA512 6aac048569b8b42768832292162dbafceb69b93f6f6419c24e6dedd3a60aee9e059624dbfbf843cea19b1a97370c7e8178ff5a10f199f94665dbabe75e3e81b1
+DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
+DIST freeciv-2.6.0-beta3.tar.bz2 51761039 BLAKE2B a01e1df80eaa7ab76416190d8c32941e443481b6f7460155f3180548919270bec5bf6efde698931c44d427e17c6347299c0674ed2fc59b5b3c6a8ee5b97c9cf0 SHA512 c8a49ab77d799a65d181632a565d92cd0f9c2cd9fbaa5ce963eddc9abca29ccb9567bc3f731ad80b3f3593dd807c3d702abbe378824e3adef655edb8100711f5
+EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B 06624aac60d9b6a6ce354f73d22513b429879b15f58d83990abacdb43cece5feff525cd8feaa853867bb0c8038d42b6e00c807c22d998eadd45d455344a63cec SHA512 50ea3f5c7851449554e42485e9b3e45c1483328d9b90c44ee23679a36ba10f7cd2fa84cfc041c2c4aaf9b03f66e53e53dd83d0e89719a3afbd91e221dd369ce3
+EBUILD freeciv-2.6.0_beta3.ebuild 4645 BLAKE2B c9bd80c89361bf855487e92303476fe1d450314baeb860571408a71d87e23c6fde27f6e856da8baccce2f1655007e890a69150e9bf8a227af554004660726648 SHA512 205479dc6f9cc89254e1c1bd80578549a2817d4a3b89b1139469fd5412c81468d8750ce2bd11d43d2bfdbda132d722c2dd49b4b2f2793ff2d17756c31ef2ff53
+MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..b41411c8a164
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
@@ -0,0 +1,229 @@
+From fe3eaf658c256a1ee1aac645c004625e9f345421 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 16 May 2018 20:41:22 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config script no longer gets installed
+by default.
+---
+ m4/freetype2.m4  | 194 -----------------------------------------------
+ m4/sdl-client.m4 |   2 +-
+ 2 files changed, 1 insertion(+), 195 deletions(-)
+ delete mode 100644 m4/freetype2.m4
+
+diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
+deleted file mode 100644
+index 3d0ecb3554..0000000000
+--- a/m4/freetype2.m4
++++ /dev/null
+@@ -1,194 +0,0 @@
+-# Configure paths for FreeType2
+-# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+-#
+-# Copyright 2001, 2003, 2007, 2009 by
+-# David Turner, Robert Wilhelm, and Werner Lemberg.
+-#
+-# This file is part of the FreeType project, and may only be used, modified,
+-# and distributed under the terms of the FreeType project license,
+-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+-# indicate that you have read the license and understand and accept it
+-# fully.
+-#
+-# As a special exception to the FreeType project license, this file may be
+-# distributed as part of a program that contains a configuration script
+-# generated by Autoconf, under the same distribution terms as the rest of
+-# that program.
+-#
+-# serial 3
+-
+-# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
+-# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
+-# FreeType 2.0.4).
+-#
+-AC_DEFUN([AC_CHECK_FT2],
+-  [# Get the cflags and libraries from the freetype-config script
+-   #
+-   AC_ARG_WITH([ft-prefix],
+-     dnl don't quote AS_HELP_STRING!
+-     AS_HELP_STRING([--with-ft-prefix=PREFIX],
+-                    [Prefix where FreeType is installed (optional)]),
+-     [ft_config_prefix="$withval"],
+-     [ft_config_prefix=""])
+-
+-   AC_ARG_WITH([ft-exec-prefix],
+-     dnl don't quote AS_HELP_STRING!
+-     AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
+-                    [Exec prefix where FreeType is installed (optional)]),
+-     [ft_config_exec_prefix="$withval"],
+-     [ft_config_exec_prefix=""])
+-
+-   AC_ARG_ENABLE([freetypetest],
+-     dnl don't quote AS_HELP_STRING!
+-     AS_HELP_STRING([--disable-freetypetest],
+-                    [Do not try to compile and run a test FreeType program]),
+-     [],
+-     [enable_fttest=yes])
+-
+-   if test x$ft_config_exec_prefix != x ; then
+-     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
+-     if test x${FT2_CONFIG+set} != xset ; then
+-       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
+-     fi
+-   fi
+-
+-   if test x$ft_config_prefix != x ; then
+-     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+-     if test x${FT2_CONFIG+set} != xset ; then
+-       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+-     fi
+-   fi
+-
+-   if test "x$FT2_CONFIG" = x ; then
+-     AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
+-   fi
+-
+-   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
+-   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
+-   no_ft=""
+-   if test "$FT2_CONFIG" = "no" ; then
+-     no_ft=yes
+-   else
+-     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+-     FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+-     ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-     ft_min_major_version=`echo $min_ft_version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-     ft_min_minor_version=`echo $min_ft_version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-     ft_min_micro_version=`echo $min_ft_version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-     if test x$enable_fttest = xyes ; then
+-       ft_config_is_lt=""
+-       if test $ft_config_major_version -lt $ft_min_major_version ; then
+-         ft_config_is_lt=yes
+-       else
+-         if test $ft_config_major_version -eq $ft_min_major_version ; then
+-           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
+-             ft_config_is_lt=yes
+-           else
+-             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
+-               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
+-                 ft_config_is_lt=yes
+-               fi
+-             fi
+-           fi
+-         fi
+-       fi
+-       if test x$ft_config_is_lt = xyes ; then
+-         no_ft=yes
+-       else
+-         ac_save_CFLAGS="$CFLAGS"
+-         ac_save_LIBS="$LIBS"
+-         CFLAGS="$CFLAGS $FT2_CFLAGS"
+-         LIBS="$FT2_LIBS $LIBS"
+-
+-         #
+-         # Sanity checks for the results of freetype-config to some extent.
+-         #
+-         AC_RUN_IFELSE([
+-             AC_LANG_SOURCE([[
+-
+-#include <ft2build.h>
+-#include FT_FREETYPE_H
+-#include <stdio.h>
+-#include <stdlib.h>
+-
+-int
+-main()
+-{
+-  FT_Library library;
+-  FT_Error  error;
+-
+-  error = FT_Init_FreeType(&library);
+-
+-  if (error)
+-    return 1;
+-  else
+-  {
+-    FT_Done_FreeType(library);
+-    return 0;
+-  }
+-}
+-
+-             ]])
+-           ],
+-           [],
+-           [no_ft=yes],
+-           [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
+-
+-         CFLAGS="$ac_save_CFLAGS"
+-         LIBS="$ac_save_LIBS"
+-       fi             # test $ft_config_version -lt $ft_min_version
+-     fi               # test x$enable_fttest = xyes
+-   fi                 # test "$FT2_CONFIG" = "no"
+-
+-   if test x$no_ft = x ; then
+-     AC_MSG_RESULT([yes])
+-     m4_if([$2], [], [:], [$2])
+-   else
+-     AC_MSG_RESULT([no])
+-     if test "$FT2_CONFIG" = "no" ; then
+-       AC_MSG_WARN([
+-
+-  The freetype-config script installed by FreeType 2 could not be found.
+-  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
+-  your path, or set the FT2_CONFIG environment variable to the
+-  full path to freetype-config.
+-       ])
+-     else
+-       if test x$ft_config_is_lt = xyes ; then
+-         AC_MSG_WARN([
+-
+-  Your installed version of the FreeType 2 library is too old.
+-  If you have different versions of FreeType 2, make sure that
+-  correct values for --with-ft-prefix or --with-ft-exec-prefix
+-  are used, or set the FT2_CONFIG environment variable to the
+-  full path to freetype-config.
+-         ])
+-       else
+-         AC_MSG_WARN([
+-
+-  The FreeType test program failed to run.  If your system uses
+-  shared libraries and they are installed outside the normal
+-  system library path, make sure the variable LD_LIBRARY_PATH
+-  (or whatever is appropriate for your system) is correctly set.
+-         ])
+-       fi
+-     fi
+-
+-     FT2_CFLAGS=""
+-     FT2_LIBS=""
+-     m4_if([$3], [], [:], [$3])
+-   fi
+-
+-   AC_SUBST([FT2_CFLAGS])
+-   AC_SUBST([FT2_LIBS])])
+-
+-# end of freetype2.m4
+diff --git a/m4/sdl-client.m4 b/m4/sdl-client.m4
+index 095cd0b287..015d948d95 100644
+--- a/m4/sdl-client.m4
++++ b/m4/sdl-client.m4
+@@ -30,7 +30,7 @@ AC_DEFUN([FC_SDL_CLIENT],
+         missing_project="SDL_gfx"
+       fi
+       if test "x$sdl_h_found" = "xyes" ; then
+-        AC_CHECK_FT2([2.1.3], [freetype_found="yes"], [freetype_found="no"])
++        PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [freetype_found="yes"], [freetype_found="no"])
+         if test "$freetype_found" = yes; then
+ 	  gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS"
+ 	  gui_sdl_libs="$gui_sdl_libs $FT2_LIBS"
+-- 
+2.17.0
+
diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild b/games-strategy/freeciv/freeciv-2.5.11.ebuild
new file mode 100644
index 000000000000..149823db3192
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.11.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/"
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	net-misc/curl
+	sys-libs/zlib
+	auth? (
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+	)
+	readline? ( sys-libs/readline:0= )
+	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+	!dedicated? (
+		media-libs/libpng:0
+		gtk? ( x11-libs/gtk+:2 )
+		mapimg? ( media-gfx/imagemagick:= )
+		modpack? ( x11-libs/gtk+:2 )
+		nls? ( virtual/libintl )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		sdl? (
+			media-libs/libsdl[video]
+			media-libs/sdl-gfx
+			media-libs/sdl-image[png]
+			media-libs/sdl-ttf
+		)
+		server? ( aimodules? ( sys-devel/libtool:2 ) )
+		sound? (
+			media-libs/libsdl[sound]
+			media-libs/sdl-mixer[vorbis]
+		)
+		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+	)
+	system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!dedicated? (
+		x11-base/xorg-proto
+		nls? ( sys-devel/gettext )
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.11-freetype_pkgconfig.patch"
+)
+
+pkg_setup() {
+	if use !dedicated && use !server ; then
+		ewarn "Disabling server USE flag will make it impossible"
+		ewarn "to start local games, but you will still be able to"
+		ewarn "join multiplayer games."
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# install the .desktop in /usr/share/applications
+	# install the icons in /usr/share/pixmaps
+	sed -i \
+		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+		client/Makefile.in \
+		server/Makefile.in \
+		tools/Makefile.in \
+		data/icons/Makefile.in || die
+	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
+}
+
+src_configure() {
+	local myclient mydatabase myeconfargs
+
+	if use auth ; then
+		if ! use mysql && ! use sqlite ; then
+			einfo "No database backend chosen, defaulting"
+			einfo "to mysql!"
+			mydatabase=mysql
+		else
+			use mysql && mydatabase+=" mysql"
+			use sqlite && mydatabase+=" sqlite3"
+		fi
+	else
+		mydatabase=no
+	fi
+
+	if use dedicated ; then
+		myclient="no"
+		myeconfargs+=( --enable-server )
+	else
+		if use !sdl && use !gtk && ! use qt5 ; then
+			einfo "No client backend given, defaulting to"
+			einfo "gtk2 client!"
+			myclient="gtk2"
+		else
+			use sdl && myclient+=" sdl"
+			use gtk && myclient+=" gtk2"
+			if use qt5 ; then
+				myclient+=" qt"
+				append-cxxflags -std=c++11
+			fi
+		fi
+		myeconfargs+=( $(use_enable server) --without-ggz-client )
+	fi
+
+	myeconfargs+=(
+		--enable-aimodules="$(usex aimodules "yes" "no")"
+		--enable-client="${myclient}"
+		--enable-fcdb="${mydatabase}"
+		--enable-fcmp="$(usex modpack "gtk2" "no")"
+		# disabling shared libs will break aimodules USE flag
+		--enable-shared
+		--localedir=/usr/share/locale
+		$(use_enable ipv6)
+		$(use_enable mapimg)
+		$(use_enable nls)
+		$(use_enable sound sdl-mixer)
+		$(use_enable system-lua sys-lua)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use dedicated ; then
+		rm -rf "${ED%/}/usr/share/pixmaps"
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+	else
+		if use server ; then
+			# Create and install the html manual. It can't be done for dedicated
+			# servers, because the 'freeciv-manual' tool is then not built. Also
+			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
+			# Note: to have it localized, it should be ran from _postinst, or
+			# something like that, but then it's a PITA to avoid orphan files...
+			./tools/freeciv-manual || die
+			docinto html
+			dodoc manual*.html
+		fi
+		if use sdl ; then
+			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+		else
+			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
+		fi
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
+	fi
+	find "${ED}" -name "freeciv-manual*" -delete
+
+	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
new file mode 100644
index 000000000000..ceb9ae038ec1
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic gnome2-utils ltprune xdg-utils
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/"
+SRC_URI="mirror://sourceforge/freeciv/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+[[ ${PV} != *_beta* ]] || [[ ${PV} != *_rc* ]] || \
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	net-misc/curl
+	sys-libs/zlib
+	auth? (
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+	)
+	readline? ( sys-libs/readline:0= )
+	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+	!dedicated? (
+		media-libs/libpng:0
+		gtk? ( x11-libs/gtk+:2 )
+		mapimg? ( media-gfx/imagemagick:= )
+		modpack? ( x11-libs/gtk+:2 )
+		nls? ( virtual/libintl )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		sdl? (
+			media-libs/libsdl2[video]
+			media-libs/sdl2-gfx
+			media-libs/sdl2-image[png]
+			media-libs/sdl2-ttf
+		)
+		server? ( aimodules? ( sys-devel/libtool:2 ) )
+		sound? (
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[vorbis]
+		)
+		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+	)
+	system-lua? ( >=dev-lang/lua-5.3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!dedicated? (
+		x11-base/xorg-proto
+		nls? ( sys-devel/gettext )
+	)"
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+	if use !dedicated && use !server ; then
+		ewarn "Disabling server USE flag will make it impossible"
+		ewarn "to start local games, but you will still be able to"
+		ewarn "join multiplayer games."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the .desktop in /usr/share/applications
+	# install the icons in /usr/share/pixmaps
+	sed -i \
+		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+		client/Makefile.in \
+		server/Makefile.in \
+		tools/Makefile.in \
+		data/icons/Makefile.in || die
+	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
+}
+
+src_configure() {
+	local myclient mydatabase myeconfargs
+
+	if use auth ; then
+		if ! use mysql && ! use sqlite ; then
+			einfo "No database backend chosen, defaulting"
+			einfo "to mysql!"
+			mydatabase=mysql
+		else
+			use mysql && mydatabase+=" mysql"
+			use sqlite && mydatabase+=" sqlite3"
+		fi
+	else
+		mydatabase=no
+	fi
+
+	if use dedicated ; then
+		myclient="no"
+		myeconfargs+=(
+			--enable-server
+			--enable-freeciv-manual=html
+		)
+	else
+		if use !sdl && use !gtk && ! use qt5 ; then
+			einfo "No client backend given, defaulting to"
+			einfo "gtk2 client!"
+			myclient="gtk2"
+		else
+			use sdl && myclient+=" sdl2"
+			use gtk && myclient+=" gtk2"
+			if use qt5 ; then
+				myclient+=" qt"
+				append-cxxflags -std=c++11
+			fi
+		fi
+		myeconfargs+=(
+			$(use_enable server)
+			$(use_enable server freeciv-manual html )
+		)
+	fi
+
+	myeconfargs+=(
+		--enable-aimodules="$(usex aimodules "yes" "no")"
+		--enable-client="${myclient}"
+		--enable-fcdb="${mydatabase}"
+		--enable-fcmp="$(usex modpack "gtk2" "no")"
+		# disabling shared libs will break aimodules USE flag
+		--enable-shared
+		--localedir=/usr/share/locale
+		$(use_enable ipv6)
+		$(use_enable mapimg)
+		$(use_enable nls)
+		$(use_enable sound sdl-mixer)
+		$(use_enable system-lua sys-lua)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use dedicated ; then
+		rm -rf "${ED%/}/usr/share/pixmaps"
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+	else
+		if use server ; then
+			# Create and install the html manual. It can't be done for dedicated
+			# servers, because the 'freeciv-manual' tool is then not built. Also
+			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
+			# Note: to have it localized, it should be ran from _postinst, or
+			# something like that, but then it's a PITA to avoid orphan files...
+			./tools/freeciv-manual || die
+			docinto html
+			dodoc classic*.html
+		fi
+		if use sdl ; then
+			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+		else
+			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
+		fi
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
+	fi
+	find "${ED}" -name "freeciv-manual*" -delete
+
+	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
new file mode 100644
index 000000000000..6a23f56ccce9
--- /dev/null
+++ b/games-strategy/freeciv/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="aimodules">Support for dynamically loadable AI
+			modules (server-side)</flag>
+		<flag name="auth">Add authentication capability via
+			mysql, postgres or sqlite3</flag>
+		<flag name="mapimg">Additional mag image toolkit
+			via <pkg>media-gfx/imagemagick</pkg></flag>
+		<flag name="modpack">Build the freeciv-modpack-program
+			to download/install mods</flag>
+		<flag name="server">Enable server support. Disabling this
+			will also make it impossible to start local games.</flag>
+		<flag name="sound">Add support for sound provided by
+			<pkg>media-libs/sdl-mixer</pkg></flag>
+		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of
+			the bundled liblua</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">freeciv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/freecol-0.11.6 b/games-strategy/freecol-0.11.6
deleted file mode 100644
index ed5f6161c50d..000000000000
--- a/games-strategy/freecol-0.11.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An open source clone of the game Colonization
-EAPI=5
-HOMEPAGE=http://www.freecol.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/jre-1.8 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/freecol/freecol-0.11.6-src.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=25e048e64cca192c37301c3c19802b42
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
new file mode 100644
index 000000000000..9a9aef337104
--- /dev/null
+++ b/games-strategy/freecol/Manifest
@@ -0,0 +1,4 @@
+AUX freecol-0.11.6-gentoo.patch 1251 BLAKE2B 7de241498bba19c665812236a7898cf8295ffa9be0123a56ff0b65c85e9173dbfb3e458c26c632538230035320d9b93f0ba57b4eb6e8cf606c82b20befcf11ac SHA512 c94fa10fb210547b67b38562faa2d1e39f17264cdfc8819c5b6b856ba068757d88e29ea43bec573400a81b081965f687aea93335b62969b15122d9373290f224
+DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de
+EBUILD freecol-0.11.6.ebuild 1669 BLAKE2B c1250ab2b190f052f838af33c5de61c1f3974e38c8cdd3c9a6b9237b71a60732a1734f1654d6659a25bac29bd54f930641659dfc9d87b8d5af4444a598a4dcb4 SHA512 f17d732be0523537ac0a467da97a54063b16804013525caa2893497c0b03cfebcd536fc6ddc99206962fac6d1f2066ac71146e1c75422036567e439bdad36b34
+MISC metadata.xml 330 BLAKE2B ae0631cafebbd8fdebafaf416d6a8c7ca0152f83915aecca6366b74026523914e60761219eab4034401673fce1e54ea3c548bcbae7a084f301aaf6922569e61b SHA512 a626ad559d71b69d9f074fc7a223d226c3e911f21adecfaea48425f81fd81accf443e7518f16bbbadb1b92854f7c99e3eafda22ba0aa787bae3d44b02f8d71ab
diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
new file mode 100644
index 000000000000..c087193eb8c5
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
@@ -0,0 +1,27 @@
+--- build.xml.orig	2015-12-09 21:10:08.272361404 -0500
++++ build.xml	2015-12-09 21:11:26.189663216 -0500
+@@ -36,12 +36,11 @@
+ 
+     <path id="libraries.classpath">
+         <!-- MigLayout manager -->
+-        <pathelement location="${basedir}/${miglayout-swing.jar}"/>
+-        <pathelement location="${basedir}/${miglayout-core.jar}"/>
++        <pathelement location="${miglayout.jar}"/>
+         <!-- Command line processor -->
+-        <pathelement location="${basedir}/${cli.jar}"/>
++        <pathelement location="${cli.jar}"/>
+         <!-- Cortado Video Applet -->
+-        <pathelement location="${basedir}/${cortado.jar}"/>
++        <pathelement location="${cortado.jar}"/>
+         <!-- JOgg/JOrbis libraries -->
+         <pathelement location="${basedir}/jars/jogg-0.0.17.jar"/>
+         <pathelement location="${basedir}/jars/jorbis-0.0.17.jar"/>
+@@ -162,7 +161,7 @@
+ 
+     <target name="manifest" depends="git-revision"
+             description="Creates the Manifest file.">
+-        <manifestclasspath property="jar.classpath"
++        <manifestclasspath maxParentLevels="50" property="jar.classpath"
+                            jarfile="Freecol.jar">
+             <classpath refid="libraries.classpath" />
+         </manifestclasspath>
diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
new file mode 100644
index 000000000000..8d7df3ab2726
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.11.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils java-pkg-2 java-ant-2 games
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="http://www.freecol.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/jsr173
+	dev-java/wstx:3.2
+	dev-java/commons-cli:1
+	dev-java/cortado
+	dev-java/miglayout"
+DEPEND=">=virtual/jdk-1.8
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.8
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${PN}
+
+java_prepare() {
+	# jorbis isn't in portage yet
+	rm jars/{commons-cli-1.1,cortado-0.6.0,miglayout-core-4.2,miglayout-swing-4.2}.jar || die
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	EANT_BUILD_TARGET=package
+	EANT_EXTRA_ARGS="
+		-Dstax.jar=$(java-pkg_getjars jsr173)
+		-Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
+		-Dcli.jar=$(java-pkg_getjars commons-cli-1)
+		-Dmiglayout.jar=$(java-pkg_getjars miglayout)
+		-Dcortado.jar=$(java-pkg_getjars cortado)
+	"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
+	java-pkg_dojar FreeCol.jar
+	java-pkg_dolauncher ${PN} \
+		-into "${GAMES_PREFIX}" \
+		--pwd "${GAMES_DATADIR}"/${PN} \
+		--jar FreeCol.jar \
+		--java_args -Xmx512M
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data schema
+	doicon data/${PN}.png
+	make_desktop_entry ${PN} FreeCol
+	dodoc README
+	prepgamesdirs
+}
+
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	java-pkg-2_pkg_preinst
+}
diff --git a/games-strategy/freecol/metadata.xml b/games-strategy/freecol/metadata.xml
new file mode 100644
index 000000000000..683a3878d849
--- /dev/null
+++ b/games-strategy/freecol/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">freecol</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/freeorion-0.4.7.1 b/games-strategy/freeorion-0.4.7.1
deleted file mode 100644
index 24d981db40e9..000000000000
--- a/games-strategy/freeorion-0.4.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/boost-1.56[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A free turn-based space empire and galactic conquest game
-EAPI=6
-HOMEPAGE=http://www.freeorion.org
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/boost-1.56[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
-SLOT=0
-SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.7.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d43cb6199a5176536bebf250ecd6879a
diff --git a/games-strategy/freeorion-0.4.7.1-r3 b/games-strategy/freeorion-0.4.7.1-r3
deleted file mode 100644
index 0dc0175a585c..000000000000
--- a/games-strategy/freeorion-0.4.7.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A free turn-based space empire and galactic conquest game
-EAPI=6
-HOMEPAGE=http://www.freeorion.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
-SLOT=0
-SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.7.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56d488ea6924d41b0601cefafe0ea6bc
diff --git a/games-strategy/freeorion-9999 b/games-strategy/freeorion-9999
deleted file mode 100644
index 6f8323823345..000000000000
--- a/games-strategy/freeorion-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A free turn-based space empire and galactic conquest game
-EAPI=6
-HOMEPAGE=http://www.freeorion.org
-IUSE=python_targets_python2_7
-LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56d488ea6924d41b0601cefafe0ea6bc
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
new file mode 100644
index 000000000000..e57fd5ee697f
--- /dev/null
+++ b/games-strategy/freeorion/Manifest
@@ -0,0 +1,6 @@
+AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
+DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
+EBUILD freeorion-0.4.7.1-r3.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
+EBUILD freeorion-0.4.7.1.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b
+EBUILD freeorion-9999.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
+MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/files/freeorion.envd b/games-strategy/freeorion/files/freeorion.envd
new file mode 100644
index 000000000000..182c707cb002
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion.envd
@@ -0,0 +1 @@
+LDPATH="/usr/lib64/freeorion:/usr/lib32/freeorion:/usr/lib/freeorion"
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
new file mode 100644
index 000000000000..8d750687b353
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 gnome2-utils
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
+	media-libs/freealut
+	media-libs/freetype
+	media-libs/glew:=
+	media-libs/libsdl2
+	>=media-libs/libogg-1.1.3
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	>=media-libs/libvorbis-1.1.2
+	media-libs/openal
+	sci-physics/bullet
+	sys-libs/zlib
+	virtual/opengl
+	!dev-games/gigi"
+	# Use bundled gigi as of freeorion-0.4.3
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPEE=Release
+		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog.md
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1.ebuild
new file mode 100644
index 000000000000..1be8614838d4
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.7.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-any-r1 gnome2-utils
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.56[python,threads]
+	media-libs/freealut
+	media-libs/freetype
+	media-libs/glew:*
+	media-libs/libsdl2
+	>=media-libs/libogg-1.1.3
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	>=media-libs/libvorbis-1.1.2
+	media-libs/openal
+	sci-physics/bullet
+	sys-libs/zlib
+	virtual/opengl
+	!dev-games/gigi"
+	# Use bundled gigi as of freeorion-0.4.3
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPEE=Release
+		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog.md
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
new file mode 100644
index 000000000000..8d750687b353
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 gnome2-utils
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
+	media-libs/freealut
+	media-libs/freetype
+	media-libs/glew:=
+	media-libs/libsdl2
+	>=media-libs/libogg-1.1.3
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	>=media-libs/libvorbis-1.1.2
+	media-libs/openal
+	sci-physics/bullet
+	sys-libs/zlib
+	virtual/opengl
+	!dev-games/gigi"
+	# Use bundled gigi as of freeorion-0.4.3
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPEE=Release
+		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog.md
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
new file mode 100644
index 000000000000..ccd88c4f149a
--- /dev/null
+++ b/games-strategy/freeorion/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>NP-Hardass@gentoo.org</email>
+    <name>NP-hardass</name>
+  </maintainer>
+  <longdescription lang="en">
+  FreeOrion is a free, open source, turn-based space empire and
+  galactic conquest (4X) computer game being designed and built by the
+  FreeOrion project. FreeOrion is inspired by the tradition of the
+  Master of Orion games, but is not a clone or remake of that series
+  or any other game.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">freeorion/freeorion</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-strategy/freesynd-0.7.1-r1 b/games-strategy/freesynd-0.7.1-r1
deleted file mode 100644
index 5b5b7fd75274..000000000000
--- a/games-strategy/freesynd-0.7.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=media-libs/libogg media-libs/libpng:0= media-libs/libsdl[X,sound,video] media-libs/libvorbis media-libs/sdl-mixer[mp3,vorbis] media-libs/sdl-image[png] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Portable reimplementation of engine for the classic Bullfrog game, Syndicate
-EAPI=6
-HOMEPAGE=http://freesynd.sourceforge.net/
-IUSE=debug devtools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libogg media-libs/libpng:0= media-libs/libsdl[X,sound,video] media-libs/libvorbis media-libs/sdl-mixer[mp3,vorbis] media-libs/sdl-image[png]
-SLOT=0
-SRC_URI=mirror://sourceforge/freesynd/freesynd-0.7.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4d6d2c2ef904c8369493bdb7412a71e
diff --git a/games-strategy/freesynd/Manifest b/games-strategy/freesynd/Manifest
new file mode 100644
index 000000000000..389db704dbdd
--- /dev/null
+++ b/games-strategy/freesynd/Manifest
@@ -0,0 +1,4 @@
+AUX freesynd-0.7.1-cmake.patch 931 BLAKE2B 0ad1994ad923355fdcae7c472a1440c88a848c409d5cc17b43d4d42e6307eb5c9f362efae5d81227d6ed6a7a4ecd5a7ec3492086e11f2208473190f2713fdd89 SHA512 994d12a2f079582bda03a600888c2d7ed2043468d69ce752e64deb45d156de5a7556edabd00d2635acc2c39882a8074193dc559e423e8e0181e9d4ea9d8b8b6f
+DIST freesynd-0.7.1.tar.gz 2576695 BLAKE2B 11b8f1d25768cdef6cf6894e8141cd13562a133a3253aa5b19034f0c54f114081dd97d41d230c74b5b1aaf66d84ad45d0c09ca5cdc72fb1de00a39ff23ad1272 SHA512 b87e6adaf71206532b4f90cd230ca6be00438fe26f000c5a0bfebf2839fea80d78d98ddc27331a2224874338c3e14ffbfa58b8c5bdbdc53c93bba8d6a9e6b7b4
+EBUILD freesynd-0.7.1-r1.ebuild 1597 BLAKE2B 3d7fadee4f1f1c9c8574b7477972cd781afab7c1f321137bfef5ae84cbb80c6b595ac1b73b165e4878f7a03995899c9a79fd90faddd035c3d10f0fd477f6da03 SHA512 29892a155a86b4a3eda85c5d1e8f987a85f7b63a70ef2b9adc981b509e804bcf2ae4b4b5c28bc19f4fe9499504f8d4a7d6c1e204ce7e9d32cd778394a525c718
+MISC metadata.xml 401 BLAKE2B e83ee7425bd7de156c4ce45903a7fe00a12ad94f9e8bfe8ab0547458d2cf3f883fbbb319494a40bdabbadf2d85e74d0a929c43973d27550a7198bfd2c0e7add7 SHA512 5750ad5bed978d8a906a3cea47f3602257b5390bb87096c1e005d0c2bd1921b9033bdfb87f14506e88e8929268a9c9bb0003c9b343d0a0040b30df2058726152
diff --git a/games-strategy/freesynd/files/freesynd-0.7.1-cmake.patch b/games-strategy/freesynd/files/freesynd-0.7.1-cmake.patch
new file mode 100644
index 000000000000..817cd39dcb4f
--- /dev/null
+++ b/games-strategy/freesynd/files/freesynd-0.7.1-cmake.patch
@@ -0,0 +1,28 @@
+--- freesynd-0.7.1/CMakeLists.txt
++++ freesynd-0.7.1/CMakeLists.txt
+@@ -34,6 +34,13 @@
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS}")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
+ 
++option(BUILD_DEV_TOOLS "Build development tools")
++option(WITH_DEBUG "Enable debug definitions")
++
++if(WITH_DEBUG)
++	add_definitions (-D_DEBUG)
++endif()
++
+ # Set standard definitions for all platforms.
+ add_definitions (-DSYSTEM_SDL)
+ add_definitions (-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\")
+@@ -59,10 +66,7 @@
+ 	message (FATAL_ERROR "Unable to locate PNG")
+ endif ()
+ 
+-if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "debug")
+-	set (BUILD_DEV_TOOLS TRUE)
+-else ()
+-	set (BUILD_DEV_TOOLS FALSE)
++if (CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE STREQUAL "debug")
+ 	# We only define an install target if we're doing a release build.
+ 	# Furthermore, on Mac, the data folder is a part of the app bundle.
+ 	if (NOT APPLE)
diff --git a/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild b/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..08cdeb54329a
--- /dev/null
+++ b/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
+
+DESCRIPTION="Portable reimplementation of engine for the classic Bullfrog game, Syndicate"
+HOMEPAGE="http://freesynd.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug devtools"
+
+RDEPEND="
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl[X,sound,video]
+	media-libs/libvorbis
+	media-libs/sdl-mixer[mp3,vorbis]
+	media-libs/sdl-image[png]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( NEWS README INSTALL AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+DOC_CONTENTS="
+	You have to set \"data_dir = /my/path/to/synd-data\"
+	in \"~/.${PN}/${PN}.ini\".
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed \
+		-e "s:#freesynd_data_dir = /usr/share/freesynd/data:freesynd_data_dir = /usr/share/${PN}/data:" \
+		-i ${PN}.ini || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DEBUG=$(usex debug)
+		-DBUILD_DEV_TOOLS=$(usex devtools)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin src/${PN}
+	use devtools && newbin src/dump ${PN}-dump
+	insinto /usr/share/${PN}
+	doins -r data
+	newicon -s 128 icon/sword.png ${PN}.png
+	make_desktop_entry ${PN}
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	if use debug ; then
+		ewarn "Debug build is not meant for regular playing,"
+		ewarn "game speed is higher."
+	fi
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freesynd/metadata.xml b/games-strategy/freesynd/metadata.xml
new file mode 100644
index 000000000000..2ba784f8d996
--- /dev/null
+++ b/games-strategy/freesynd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="devtools">Build development tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">freesynd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/galaxyhack-1.74-r1 b/games-strategy/galaxyhack-1.74-r1
deleted file mode 100644
index f19ad89dda14..000000000000
--- a/games-strategy/galaxyhack-1.74-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Multiplayer AI script based strategy game
-EAPI=6
-HOMEPAGE=http://galaxyhack.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 galaxyhack
-SLOT=0
-SRC_URI=mirror://sourceforge/galaxyhack/galaxyhack-1.74.tar.bz2 mirror://gentoo/galaxyhack.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a55687f7b06c1ad126b5116cc553b86
diff --git a/games-strategy/galaxyhack/Manifest b/games-strategy/galaxyhack/Manifest
new file mode 100644
index 000000000000..c3dd85d53b68
--- /dev/null
+++ b/games-strategy/galaxyhack/Manifest
@@ -0,0 +1,10 @@
+AUX galaxyhack-1.74-boost-1.50.patch 3206 BLAKE2B c97b67ac602a440eb90ae481e0ef5837e64cf9ad3c07e722899b7e1c6701536df1af3dca5e7e645dc13bd3622b8bf7e1a274c0c0de24cb9f39287f1af2e5e14f SHA512 ce441bd44c44000b28520bba3c76b4e3d37fef5b424ddae1be4ee2e0675859ce22090c9e79a7fca37f46b16312b581201eb413d89cdddab3d6169c97ec0d6304
+AUX galaxyhack-1.74-boost.patch 245 BLAKE2B afb356c6fb7d2f5243466f84d5605e1cc13da00b842c2bc554d791f20de6c37ab6b563e3320b3f0f6ca242987c75ffe6fbaba5ba236bd833a3bc86361be689b9 SHA512 19a6ef4ee430edab619d60d4410d318e07ba3dd75b48036331029ff0de11ad5ccc73970825708764a7da9870d9ae8a7708a22176aa6698fdd4c2837bf3a91885
+AUX galaxyhack-1.74-destdirs.patch 390 BLAKE2B 5c807a22493528f472e3d5e9366ab4b8bacfb7d3a7c31291a3a1e8cf872fcd2cf9c3e373e53bffa9d92af68bf9549c6ebf44a6aaa8d6cd10f6afcfd6e6906690 SHA512 d154eb0b0116fa1e067bae12db82cef5eb3bf882683f624becb54244ffa744a3bdc7ebe77fe6e87c634f42f649cc8dd0fb7067aa5d2cb5b8a72cf50cdbfe7702
+AUX galaxyhack-1.74-format.patch 1768 BLAKE2B 5a0ee8e935c557ac25b470e1914f242da093352321ba34c067ca3997e3892aff3f6330b827bc7d08c7541cc1e9e0cb2e0b4e0d938ddd1f9cfd21916b11f978e3 SHA512 e38280f9a06426a77abea3a10de6ce23868dd2d4df0c398832856bfa5e39c329cf39b39bd4ff766c54fd72813933c502ca9a63750b7a4160e536a40a08bc0ba3
+AUX galaxyhack-1.74-gcc43.patch 309 BLAKE2B f8af1b8b2d4d50bb37eb13237915638d746a79daa621d81958bf99d7071178d3402989fa0fbeb9d67abffea4a15a97d1da263855b5ac17b1caf96213ebddcb31 SHA512 21169edbaf8f4c0d8f4fcd44a494e0121fb332b42cf14ba09818cf871cfdb792e4bbe00c7ae1b9ddc9094c96edda785f2763c76a70dcf92ec7ea163e3248aaa0
+AUX galaxyhack-1.74-gentoo.patch 992 BLAKE2B 63ca6fee15f9f088e2c8a73566d5a7579ed4636d8048771ee01aa40a6f8edd1013e1d6a710d45caa951311709c19ed3d670014bfd1513982c317d6ea5d1b4d34 SHA512 e268019e57c95caf6f24331e0c1f6bb0f47507940e8621cf5307f5cdd24cdd9ab49307208f6914558df35bedd725db38374c04b4f887c89814896ce9902f7b0a
+DIST galaxyhack-1.74.tar.bz2 9948336 BLAKE2B 2029e4a27e2995ebd8bb4f7e9192fc353b22a0246e5bca5294a9a09ee936c0050682dcff52a233b87d659a6a4e98f56fcd4b563fb1159b52f6f596a5413a687b SHA512 d708494b1ad572c0243da9e7168b4707112ec3c99a09498b87f8e0cb2e4e5bc9df8dc4631e3fb4d3cd7517ec4b17e937798dec3fcf770de9d0fc1b5e29a0bd58
+DIST galaxyhack.png 819 BLAKE2B c19a6c05313eedfd118de0b02b688e98dc011a760da10c5edc6ee15eea3668e7dbf19fcbc7546807221b3b727056c5d5075c91cae699300c6d7b19c939b0f2b6 SHA512 b8ab4dd1c18c079ec3f60b3d04843fbb7a892feb8f872d498c20eb3142e7de26bff90c93b308656e1afe5ee77074fcb3f78542dfd175c27a9b865a512e0b0200
+EBUILD galaxyhack-1.74-r1.ebuild 1592 BLAKE2B afde825de3df81f6b18cce5376f30059763dfeab87c154a8b3f7fa9c4a7d011a66cd53b2a3df165bd3c05eb858317c1f9ee20545b10295fb76eca3691a5c265d SHA512 abd828bf419949722c7261439c6bb386b9f6813da6bd6c68c91d8084ae4a0d04f2b6f6660116a8cc969a742ed62ce05bec3306fa58bca93d79186af3d00c4072
+MISC metadata.xml 1383 BLAKE2B b358635bd0e1f15560dc84368bc32eb1de4a487ca377924d82f3d2b28912ec702a07fa34565fea4fdf77280599403187b670a103d3d158e0c5ccfa3265257725 SHA512 1857f21b7f01d16e5eaa7fd6f3b653c820837d5b47022bf47c02af44c5bb00f0010c36c722aa1225d0cf0cdec8d85c4f6f14e5c7c0785da8706ea9886a72b285
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
new file mode 100644
index 000000000000..ed8ff748aa98
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
@@ -0,0 +1,77 @@
+--- a/ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
++++ b/ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
+@@ -1596,15 +1596,15 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {
+ 		if (is_directory(*iter)) {
+-			fs::create_directory(destPath.string() + "/" + iter->leaf());
+-			DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf());
++			fs::create_directory(destPath.string() + "/" + iter->path().filename().string());
++			DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());
+ 			continue;
+ 		}
+ 		string destFile;
+-		if (iter->leaf() == sideName + ".dat")
++		if (iter->path().filename() == sideName + ".dat")
+ 			destFile = theInput + ".dat";
+ 		else	
+-			destFile = iter->leaf();
++			destFile = iter->path().filename().string();
+ 		
+ 		fs::copy_file(*iter, destPath.string() + "/" + destFile);
+ 	}
+--- a/Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
++++ b/Main.cpp	2012-08-20 17:50:51.000000000 +0200
+@@ -339,12 +339,6 @@
+ 
+ void GameInit(char* argv[]) {
+ 	namespace fs = boost::filesystem;
+-	//boost is really quite stupid
+-	#ifndef WIN32
+-		fs::path::default_name_check(fs::windows_name);
+-	#else
+-		fs::path::default_name_check(fs::native);
+-	#endif
+ 	
+ 	FindHomePath();
+ 	LoadSettings(argv);
+--- a/Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
++++ b/Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
+@@ -206,7 +206,7 @@
+ 
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {
+-		string filename = iter->leaf();
++		string filename = iter->path().filename().string();
+ 
+ 		if (filename.find('.') == filename.npos)
+ 			continue;
+@@ -237,7 +237,7 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {
+ 		if (fs::is_directory(*iter)) {
+-			string fleetName = iter->leaf();
++			string fleetName = iter->path().filename().string();
+ 
+ 			if (CheckFleetExists(fleetName)) {
+ 				tempItem.desc = fleetName;
+@@ -261,7 +261,7 @@
+ 	fs::path iterPath(GetFleetDir(whichSide));
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {
+-		string filename = iter->leaf();
++		string filename = iter->path().filename().string();
+ 
+ 		if (filename.find('.') == filename.npos)
+ 			continue;
+--- a/Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
++++ b/Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
+@@ -657,7 +657,7 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end
+ 	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {
+ 		if (fs::is_directory(*iter) && !fs::is_empty(*iter))
+-			RemoveDirectory(iter->string());
++			RemoveDirectory(iter->path().string());
+ 		else
+ 			fs::remove(*iter);
+ 	}
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
new file mode 100644
index 000000000000..c7fd49135dee
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
@@ -0,0 +1,11 @@
+--- src/SetupBattle.cpp
++++ src/SetupBattle.cpp
+@@ -18,7 +18,7 @@
+ #include "PreBattle.h"
+ 
+ #include <sstream>
+-#include <boost/filesystem/exception.hpp>
++#include <boost/filesystem.hpp>
+ 
+ using std::stringstream;
+ using std::getline;
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
new file mode 100644
index 000000000000..7c60c4efa624
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
@@ -0,0 +1,11 @@
+--- a/Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
++++ b/Main.cpp	2006-07-28 00:08:28.000000000 +0200
+@@ -184,7 +184,7 @@
+ #ifndef WIN32
+ 	string settingsPath = userHomePath + "settings.dat";
+ 	if (!DoesFileExist(settingsPath))
+-		settingsPath = "settings.dat";
++		settingsPath = "@GAMES_DATADIR@/galaxyhack/settings.dat";
+ #else
+ 	string settingsPath = "settings.dat";
+ #endif
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
new file mode 100644
index 000000000000..478e58001c73
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
@@ -0,0 +1,64 @@
+--- a/JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
++++ b/JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
+@@ -47,14 +47,14 @@
+ 	if (!globalSettings.batch) {
+ 		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {
+ 			char output[120];
+-			sprintf(output, SDL_GetError());
++			strcpy(output, SDL_GetError());
+ 			throw runtime_error(output);
+ 		}
+ 		
+ 		if (!globalSettings.disableSound) {
+ 			if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) {
+ 				char error[120];
+-				sprintf(error, SDL_GetError());
++				strcpy(error, SDL_GetError());
+ 				string errorStr = error;
+ 				errorStr += ", continuing without initialising sound.";
+ 				WriteLog(errorStr);
+@@ -81,7 +81,7 @@
+ 		//4096 is rather a large chunksize, should be smaller if I add sound effects
+ 		if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096) == -1) {
+ 			char output[100];
+-			sprintf(output, Mix_GetError());
++			strcpy(output, Mix_GetError());
+ 			throw runtime_error(output);
+ 		}
+ 	}
+@@ -101,7 +101,7 @@
+ 	if (screen == NULL) {
+ 		SDL_Quit();
+ 		char output[120];
+-		sprintf(output, SDL_GetError());
++		strcpy(output, SDL_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
+@@ -114,7 +114,7 @@
+ 
+ 	if (loadingSurface == NULL) {
+ 		char output[100];
+-		sprintf(output, IMG_GetError());
++		strcpy(output, IMG_GetError());
+ 		throw runtime_error(output);
+ 	}
+ 
+@@ -308,7 +308,7 @@
+ 
+ 	if (!theMusic) {
+ 		char output[100];
+-		sprintf(output, Mix_GetError());
++		strcpy(output, Mix_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
+@@ -319,7 +319,7 @@
+ 
+ 	if (Mix_PlayMusic(theMusic, -1) == -1) {
+ 		char output[100];
+-		sprintf(output, Mix_GetError());
++		strcpy(output, Mix_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
new file mode 100644
index 000000000000..eeb64d12e587
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
@@ -0,0 +1,12 @@
+diff -aur src.old/JSDL.cpp src/JSDL.cpp
+--- src.old/JSDL.cpp	2008-07-17 18:31:38.000000000 +0200
++++ src/JSDL.cpp	2008-07-17 19:19:39.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include <cstdlib>
+ #include <fstream>
+ #include <stdexcept>
+-
++#include <cstring>
+ using std::runtime_error;
+ using std::memcpy;
+ 
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
new file mode 100644
index 000000000000..9e55c941bfeb
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.old	2009-02-11 22:21:26.000000000 +0100
++++ b/Makefile	2009-02-11 22:20:58.000000000 +0100
+@@ -6,12 +6,11 @@
+ # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
+ #
+ 
+-INSTALL_DIR=/usr/local/share
+-INSTALL_BIN_DIR=/usr/local/bin
++INSTALL_DIR="${GAMES_DATADIR}"
++INSTALL_BIN_DIR="${GAMES_BINDIR}"
+ 
+-CXX = g++
+-CXXFLAGS = $(shell sdl-config --cflags) -O3
+-LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
++CXXFLAGS += $(shell sdl-config --cflags)
++LDLIBS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -lboost_system -lm
+ 
+ OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \
+ 	ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o GFX.o Globals.o \
+@@ -40,7 +39,7 @@
+ 	install $(TARGET) $(INSTALL_BIN_DIR)
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ %.o: %.cpp
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
new file mode 100644
index 000000000000..aead3e7b9481
--- /dev/null
+++ b/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Multiplayer AI script based strategy game"
+HOMEPAGE="http://galaxyhack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2 galaxyhack"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod,vorbis]
+	>=dev-libs/boost-1.34
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}/src"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Settings will default to those found in
+/usr/share/galaxyhack/settings.dat
+Per user settings can be specified by creating
+~/.galaxyhack/settings.dat
+
+Additional user submitted fleets can be downloaded from
+http://galaxyhack.sourceforge.net/viewfleets.php
+"
+
+src_prepare() {
+	default
+	edos2unix Makefile
+	eapply \
+		"${FILESDIR}"/${P}-destdirs.patch \
+		"${FILESDIR}"/${P}-boost.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-boost-1.50.patch \
+		"${FILESDIR}"/${P}-format.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+	sed -i "s:@GAMES_DATADIR@:/usr/share:" \
+		Main.cpp || die
+	sed -i "/Base data path/s:pwd:/usr/share/${PN}:" \
+		../settings.dat || die
+}
+
+src_install() {
+	dobin "${PN}"
+	cd ..
+	insinto /usr/share/${PN}
+	doins -r fleets gamedata graphics music standardpictures \
+		settings.dat
+	dodoc readme.txt
+	readme.gentoo_create_doc
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} GalaxyHack
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-strategy/galaxyhack/metadata.xml b/games-strategy/galaxyhack/metadata.xml
new file mode 100644
index 000000000000..9dbded1c3212
--- /dev/null
+++ b/games-strategy/galaxyhack/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription lang="en">
+GalaxyHack allows you to design a fleet of spaceships which can then be tested
+in AI script based battles against fleets designed by other players. Though
+battles take place in real time, the strategy comes before hand, both in
+writing short AI scripts in a simple scripting language, and also in the set up
+and selection of your fleet. You don't actually have any control over your
+units at all mid-battle, but rather use the time to see where the set up of
+your fleets is working, where your fleets' weaknesses lie and changes are
+needed, and perhaps also to learn from the strategy of your opponent.
+
+The game revolves around very large capital ships, from which smaller ships are
+launched, but which are not designed for attacking themselves, and which cannot
+be moved mid-battle. To win a battle you must destroy of all of your opponent's
+capital ships before they destroy yours.
+
+There can be hundreds of units in any one battle, but there is no harvesting,
+resource management or base building.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">galaxyhack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/glob2-0.9.4.4-r2 b/games-strategy/glob2-0.9.4.4-r2
deleted file mode 100644
index ab7a9d2feb3d..000000000000
--- a/games-strategy/glob2-0.9.4.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=>=dev-libs/boost-1.34[threads] dev-libs/fribidi media-libs/libsdl[opengl] media-libs/libvorbis media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf media-libs/speex virtual/glu virtual/opengl >=sys-apps/sed-4 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Real Time Strategy (RTS) game involving a brave army of globs
-EAPI=6
-HOMEPAGE=http://globulation2.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.34[threads] dev-libs/fribidi media-libs/libsdl[opengl] media-libs/libvorbis media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf media-libs/speex virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=mirror://nongnu/glob2/0.9.4/glob2-0.9.4.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8505071d77f09a50d453605a933e3376
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
new file mode 100644
index 000000000000..8cfd63e1a78b
--- /dev/null
+++ b/games-strategy/glob2/Manifest
@@ -0,0 +1,8 @@
+AUX glob2-0.9.4.4-gcc44.patch 188 BLAKE2B bd6fc1a3ad79eb29e070d53099079c403553add1e8fcf513d8c5cf58902120ff0735ad0cc78d396329ababf64d94355c21b9e2269046467b8a68069cee0afdc4 SHA512 c341e484311fa508f9a034d216729fa7a8251e6fb710fe6417bd0a000b89a870cf5a24850e6126a704f160fee064fa7211973da8f3720dbd9a96df86adcd67fd
+AUX glob2-0.9.4.4-gcc49.patch 907 BLAKE2B f7ad515c19660af0713ca8c79c40a4c225372da85d17dfa58bc4a31e65bdced9a24ae9ff3f8f57f623da0011b24d841618bfc8fe09000703db94bc9e89a66971 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac
+AUX glob2-0.9.4.4-gcc6.patch 1767 BLAKE2B 41716842d1d0552e4ea05e4ae189b92ea600ca5e31604bf19e5659ca6690c7e394d25f11baf3fee07b9bdfcba6a748586b152a0141312daad89ab76946ea4d82 SHA512 d2eddfe657f81a1ec085298f09aafb904d22a80d601aca6405d92d6f17b28d0f3f3b5b445a9423988b7bc8869ca41698783e4139928f9f2ba33093ded6a3cb02
+AUX glob2-0.9.4.4-scons-blows.patch 908 BLAKE2B 6d677c0588dbad9f44307579549946c8979b956331be3ef667fb4bbcd6fdf3e9889b22cd4c9458a76f487b12bc73ae73dfba03e0c1f86fb228e1934b1d4e67cc SHA512 0d805014200c76ca571ecc97c284b9168f280df0e88060c880b284b8e3d5490c1512708857bb22a0b2a4e4b78716d98ae26ae552531f661bb38f6dd75af474d3
+AUX glob2-0.9.4.4-underlinking.patch 672 BLAKE2B 59fbd0afacd468cc6a2e6e18336c524653697f42404124d9b2347246130ba390a202cb2b88fa223bd80063e6555211a5065cbf08dd4d113b7dadd2e0ad9a3f41 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21
+DIST glob2-0.9.4.4.tar.gz 11338986 BLAKE2B 047f27385c9b819c6ca2614406d340ff2cb7dcc26c8a20a205b11dce234af4ea52cb4eb04b7ed5b695382b17b34b5dd50387d61cfecaced16ee61b3c69c2921f SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca
+EBUILD glob2-0.9.4.4-r2.ebuild 1251 BLAKE2B 41c2a82cecb07b7e544d457519af07829702584b083990933ac2f2a64024cc10e3a5bd9546dcf9712fa762560efbae6bf3ffdd3d53d45ffc3259d3d145947f39 SHA512 aff57e535f19cae25e86dd0f85edbcccec499951d5e12c2c718bc83f70f061de9b6b5f705a4da86e0d2dee51f815383e73f6495e0644a9eb5fed9c4396876e36
+MISC metadata.xml 637 BLAKE2B 405198c067618ace05cf22e6b790a356eb643cddf921f07a37516cc661f37706adab72edde18639abaa5b23ebfe771877ced14f1eacb3d9da83ed5c9e32213f5 SHA512 af021418808275511478f34bcbd4a3fadd193a583c7e94c676e94d39d10fb23c8d2de7b3ef5c8da81f2f6291a3bf9d0cc09448aea1b16959e7c811ba38d64e66
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
new file mode 100644
index 000000000000..8d2da78cee23
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
@@ -0,0 +1,12 @@
+--- a/libgag/include/StreamBackend.h.old
++++ b/libgag/include/StreamBackend.h
+@@ -28,6 +28,9 @@
+ #ifdef putc
+ #undef putc
+ #endif
++#ifdef getc
++#undef getc
++#endif
+ 
+ namespace GAGCore
+ {
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
new file mode 100644
index 000000000000..fca1efb5891a
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
@@ -0,0 +1,35 @@
+From https://bugs.gentoo.org/show_bug.cgi?id=538580
+
+Works around this build failure:
+
+In file included from src/AICastor.cpp:26:0:
+src/Game.h: In member function 'void AICastor::computeBuildingNeighbourMap(int, int)':
+src/Game.h:152:9: error: 'struct Game::BuildProject' is private
+  struct BuildProject
+         ^
+src/AICastor.cpp:2296:23: error: within this context
+  for (std::list<Game::BuildProject>::iterator bpi=game->buildProjects.begin(); bpi!=game->buildProjects.end(); bpi++)
+                       ^
+scons: *** [src/AICastor.o] Error 1
+scons: building terminated because of errors.
+
+patch submitted by zimous
+
+--- glob2-0.9.4.4.orig/src/Game.h
++++ glob2-0.9.4.4/src/Game.h
+@@ -149,6 +149,7 @@
+ 		BOTTOM_TO_TOP
+ 	};
+ 	
++public:
+ 	struct BuildProject
+ 	{
+ 		int posX;
+@@ -159,6 +160,7 @@
+ 		int unitWorkingFuture;
+ 	};
+ 	
++private:
+ 	///Initiates Game
+ 	void init(GameGUI *gui, MapEdit* edit);
+ 
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
new file mode 100644
index 000000000000..f1152c3ba1cc
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
@@ -0,0 +1,49 @@
+Bug: https://bugs.gentoo.org/610382
+Upstream commit: https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
+
+# HG changeset patch
+# User Jonathan Wakely <jwakely@redhat.com>
+# Date 1485875296 0
+# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
+# Parent  c4da01699846179d8bf21e8dae2b973158ec0775
+Fix last argument to ChooseMapScreen constructor
+
+Since C++14 'false' is not a valid null pointer constant, so cannot be passed
+to functions expecting pointer arguments.
+
+diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp
+--- a/src/EditorMainMenu.cpp
++++ b/src/EditorMainMenu.cpp
+@@ -90,7 +90,7 @@
+ 		}
+ 		else if (par1==LOADMAP)
+ 		{
+-			ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false);
++			ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL);
+ 			int rc=chooseMapScreen.execute(globalContainer->gfx, 40);
+ 			if (rc==ChooseMapScreen::OK)
+ 			{
+diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp
+--- a/src/LANMenuScreen.cpp
++++ b/src/LANMenuScreen.cpp
+@@ -62,7 +62,7 @@
+ 		}
+ 		else if(par1 == HOST)
+ 		{
+-			ChooseMapScreen cms("maps", "map", false, "games", "game", false);
++			ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
+ 			int rc = cms.execute(globalContainer->gfx, 40);
+ 			if(rc == ChooseMapScreen::OK)
+ 			{
+diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp
+--- a/src/YOGClientLobbyScreen.cpp
++++ b/src/YOGClientLobbyScreen.cpp
+@@ -326,7 +326,7 @@
+ 
+ void YOGClientLobbyScreen::hostGame()
+ {
+-	ChooseMapScreen cms("maps", "map", false, "games", "game", false);
++	ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
+ 	int rc = cms.execute(globalContainer->gfx, 40);
+ 	if(rc == ChooseMapScreen::OK)
+ 	{
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
new file mode 100644
index 000000000000..b3e6e86eb485
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
@@ -0,0 +1,26 @@
+--- a/SConstruct.orig
++++ b/SConstruct
+@@ -1,6 +1,7 @@
+ EnsureSConsVersion(0, 96, 92)
+ import sys
+ import os
++import SCons.Util
+ import glob
+ sys.path.append( os.path.abspath("scons") )
+ import bundle
+@@ -268,6 +269,15 @@
+     env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
+     env["TARFLAGS"] = "-c -z"
+     env.Alias("dist", env["TARFILE"])
++    # Using suggestions for https://dev.gentoo.org/~vapier/scons-blows.txt
++    if os.environ.has_key('CC'):
++           env['CC'] = os.environ['CC']
++    if os.environ.has_key('CXX'):
++           env['CXX'] = os.environ['CXX']
++    if os.environ.has_key('CXXFLAGS'):
++           env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++    if os.environ.has_key('LDFLAGS'):
++           env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+     def PackTar(target, source):
+         if "dist" in COMMAND_LINE_TARGETS:
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
new file mode 100644
index 000000000000..65eba48717db
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
@@ -0,0 +1,19 @@
+--- glob2-0.9.4.4.orig/SConstruct
++++ glob2-0.9.4.4/SConstruct
+@@ -110,6 +110,16 @@
+             print "Could not find libz or zlib1.dll"
+             missing.append("zlib")
+ 
++    boost_system = ''
++    if conf.CheckLib("boost_system"):
++        boost_system="boost_system"
++    elif conf.CheckLib("boost_system-mt"):
++        boost_system="boost_system-mt"
++    else:
++        print "Could not find libboost_system or libboost_system-mt"
++        missing.append("libboost_system")
++    env.Append(LIBS=[boost_system])
++
+     boost_thread = ''
+     if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"):
+         boost_thread="boost_thread"
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
new file mode 100644
index 000000000000..fe7cdc7b1729
--- /dev/null
+++ b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2-utils scons-utils
+
+DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
+HOMEPAGE="http://globulation2.org/"
+SRC_URI="mirror://nongnu/glob2/${PV:0:5}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.34[threads]
+	dev-libs/fribidi
+	media-libs/libsdl[opengl]
+	media-libs/libvorbis
+	media-libs/sdl-image[png]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	media-libs/speex
+	virtual/glu
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch )
+
+src_configure() {
+	myesconsargs=(
+		INSTALLDIR=/usr/share/${PN}
+		DATADIR=/usr/share/${PN}
+	)
+	escons data
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	dobin src/${PN}
+	insinto /usr/share/${PN}
+	doins -r campaigns data maps scripts
+	find "${ED}"/usr/share/${PN} -name SConscript -exec rm -f '{}' +
+	newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png
+	make_desktop_entry glob2 "Globulation 2"
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/glob2/metadata.xml b/games-strategy/glob2/metadata.xml
new file mode 100644
index 000000000000..181fc4eec533
--- /dev/null
+++ b/games-strategy/glob2/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>
+Globulation2 is an innovative high quality Real-Time Strategy [RTS], 
+which minimizes micro-management by automatically assigning tasks to 
+the units. The player has to choose the number of units he wants for 
+the different tasks, and the units will do their best to satisfy the 
+requests. This allows to manage more units and to focus on strategies.
+</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/gorky17-demo-1.0.1.0.1-r1 b/games-strategy/gorky17-demo-1.0.1.0.1-r1
deleted file mode 100644
index ef7b77107da7..000000000000
--- a/games-strategy/gorky17-demo-1.0.1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Horror conspiracy game mixing elements of strategy and role-playing
-EAPI=5
-HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=gorky17
-KEYWORDS=~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=http://demofiles.linuxgamepublishing.com/gorky17/gorky17_demo.run http://updatefiles.linuxgamepublishing.com/gorky17-demo/gorky17-demo-1.0-1.0.1-x86.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c09c1c4db7aa604298ab9d4751f2113b
diff --git a/games-strategy/gorky17-demo/Manifest b/games-strategy/gorky17-demo/Manifest
new file mode 100644
index 000000000000..cf26ab12cdc6
--- /dev/null
+++ b/games-strategy/gorky17-demo/Manifest
@@ -0,0 +1,4 @@
+DIST gorky17-demo-1.0-1.0.1-x86.run 955547 BLAKE2B 702f4ce40b7a272ee39f8b1e59a0bd559bc4c8520a7406f6d0d4f5a153f4610e54fa628289634c848d30dfe67e56ac59da0678c143f02208847e71b94454b647 SHA512 ffd054aa1b169de5cca3c85d58ce2cba127f0caca533f8d4f0046ce63e5505a0ea25c3bbea9a2dde863a8fecefb7f8d322968f90ab3f688dee70a2f0d44826ba
+DIST gorky17_demo.run 158781516 BLAKE2B 7ccb91362bc9d4463a15ad7f47a2c3af9670d0b80655d4a97ec7ab9d7eb861e42dcd39b30fb381b013cb87b853ead8fc3751c1c5d769f8b2bc9465f352339266 SHA512 7e7bf2a6a9f815381381ef5c50135232db7c6ec734300b807794107ab1b902d659f55569ea03c7d68c3e6dbf98e366de8bca4fd13dac3c688ba48d2f244e9f00
+EBUILD gorky17-demo-1.0.1.0.1-r1.ebuild 1842 BLAKE2B 9c20bdfe15f7110e28e0cac1234109346d29cb4e841871f619824c47681e0184e7d8410c41f17d51b69a1e7ea702ac15c4e9a1d02d3c0a06a85f70739cba77cf SHA512 bfa408ffe721ce04e2df65e4a02c9bc981a0ca796b93b12affc63ba4d75fce7f1b88110af0b7be73bc84fef1cd1f2656ec8aa06343837f525a70a60e8163aed7
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild b/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild
new file mode 100644
index 000000000000..5a65f2538872
--- /dev/null
+++ b/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils unpacker versionator games
+
+MY_PN="gorky17"
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Horror conspiracy game mixing elements of strategy and role-playing"
+HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=gorky17"
+SRC_URI="http://demofiles.linuxgamepublishing.com/${MY_PN}/${MY_PN}_demo.run
+	http://updatefiles.linuxgamepublishing.com/gorky17-demo/${PN}-${MY_PV}-x86.run"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+RESTRICT="mirror bindist strip"
+
+RDEPEND="
+	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+QA_EXECSTACK="${dir:1}/gorky17_demo ${dir:1}/gorky17_demo.dynamic"
+
+src_unpack() {
+	unpack_makeself ${MY_PN}_demo.run
+	unpack ./data/data.tar.gz
+
+	mkdir patch_dir
+	cd patch_dir
+	unpack_makeself ${PN}-${MY_PV}-x86.run
+	cd "${S}"
+
+	# Apply patch
+	mv bin/Linux/x86/* .
+	mv patch_dir/*.sh .
+	./patch_dir/bin/Linux/x86/loki_patch patch_dir/patch.dat . || die
+
+	rm -r update.sh *patch.sh data lgp_* patch_dir setup* bin
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r *
+	rm "${Ddir}"/${MY_PN}*
+
+	exeinto "${dir}"
+	doexe ${MY_PN}*
+
+	games_make_wrapper ${PN} ./${MY_PN}_demo "${dir}" "${dir}"
+	newicon icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Gorky 17 (Demo)" ${PN}
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "The instruction manual is available as:"
+	elog "   http://demofiles.linuxgamepublishing.com/gorky17/manual.pdf"
+	echo
+}
diff --git a/games-strategy/gorky17-demo/metadata.xml b/games-strategy/gorky17-demo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/gorky17-demo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/gwp-0.4.0-r3 b/games-strategy/gwp-0.4.0-r3
deleted file mode 100644
index f52dddb2393d..000000000000
--- a/games-strategy/gwp-0.4.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME client for the classic PBEM strategy game VGA Planets 3
-EAPI=5
-HOMEPAGE=http://gwp.lunix.com.ar/
-IUSE=nls opengl python debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://gwp.lunix.com.ar/releases/gwp-0.4.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5217357bd04fef53dc924b1f2f69427b
diff --git a/games-strategy/gwp/Manifest b/games-strategy/gwp/Manifest
new file mode 100644
index 000000000000..e00be7db2e04
--- /dev/null
+++ b/games-strategy/gwp/Manifest
@@ -0,0 +1,5 @@
+AUX gwp-0.4.0-exec-stack.patch 2842 BLAKE2B 7ab54e843e6b19768f433cae2898e7d9df7380996dc1e2afab8d9d3cf3ce081beef247d12234622e23fe6508aef21f3aecda5f4bc9744be6e9051eabc2aa8751 SHA512 b6845071c5639e4d240742e7470de4723e534814b670e8b98b1971c6e1ae2a64a8d4b8ffaf86ef28bdf3ad6d861dfeee5e2c5e46c43ea955614999fbed46da96
+AUX gwp-0.4.0-gcc41.patch 4100 BLAKE2B 656a9a6b514bd78e61b48a0f43e4230e8164107939c790d599398a0be213383f4f367e9c109cb3935b4a6a150034306f453a72356a2ea408e15e70ffc96ca16b SHA512 0e3acd8978f3a6f1585ad45c2d04c97282daa9173b6d67807d473d79bbc665be4a3471537139e9d710832afeff5e6aa4a3064c3cc36cfe3beba012f330530f31
+DIST gwp-0.4.0.tar.gz 2294453 BLAKE2B 75a688a00b3411c577e6eaae500d15963efb1c96edd82a50863239225fba2d653b52becda8ae71dbe5b88910382d1c64456fc13899e559d3aefefb6bed1e7da5 SHA512 dcb23bb49929bc01129ab5f02b56edb7f775feb0c37bd7613277af8aa0f4b47667f95413725f74a2b83b60159555a50fcabdc8736094aad0684b03cd150b4957
+EBUILD gwp-0.4.0-r3.ebuild 1312 BLAKE2B 7d64a2d61eb2e6359710ea46d8a9e43f08892407cdf9ee8ac6d62681ee29e7d66b11b0aaf0c4c7a78857a6c0e6e46cf16448b7c57f8043246d68d2f084f65cb4 SHA512 6df424a66ea2d011eeeb4b80373f0aeb343f1a12ae56c3a1896d33e16ee4861516ddbf6861878587edf274570bed0555044a6126cf3620e6063571ceab2d24e1
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch b/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch
new file mode 100644
index 000000000000..1458b7ba1dfd
--- /dev/null
+++ b/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch
@@ -0,0 +1,89 @@
+--- src/starchart.c
++++ src/starchart.c
+@@ -3187,10 +3187,16 @@
+ /**
+  * Initializes starchart constellations.
+  */
++static GSList *planets;
++
++static void add_item (gpointer key, gpointer value, gpointer user_data) {
++  /*    GSList *p_list = (GSList *)user_data; */
++  planets = g_slist_append (planets, value);
++}
++
+ static void 
+ init_starchart_constellations (void)
+ {
+-  GSList *planets = NULL;
+   GSList *ppq[TOTAL_QUADS];
+   GSList *list_nearby = NULL;
+   GwpPlanet *planet_a, *planet_b;
+@@ -3199,10 +3205,6 @@
+   gdouble wx, wy;
+   gdouble ax, ay, bx, by, zoom;
+ 
+-  static void add_item (gpointer key, gpointer value, gpointer user_data) {
+-    /*    GSList *p_list = (GSList *)user_data; */
+-    planets = g_slist_append (planets, value);
+-  }
+ 
+   g_hash_table_foreach (planet_list, (GHFunc)add_item, NULL);
+   
+--- src/vcr.c
++++ src/vcr.c
+@@ -2687,12 +2687,29 @@
+   return( retval );
+ }
+ 
++static gchar *name;
++
++static void foreach_func( gpointer key, gpointer value, gpointer user_data )
++{
++  GwpShip *ship = GWP_SHIP( value );
++  GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) );
++  gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
++  gint curr = idlist[0];
++
++  if( gwp_ship_is_mine( ship ) )
++  {
++    curr++;
++    idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) );
++    idlist[0]++;
++    g_sprintf( name, "%03d: ", idlist[curr] );
++    strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 );
++    gtk_combo_box_append_text( box, name );
++  }
++}
+ 
+ void vcr_populate_ship_a_list( GtkWidget *widget, gpointer user_data )
+ {
+-  gchar *name;
+   gint *idlist;
+-  static void foreach_func( gpointer key, gpointer value, gpointer user_data );
+ 
+   /* test if list is already populated */
+   idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
+@@ -2708,23 +2725,7 @@
+   GtkWidget *combox = lookup_widget("vcr_comboboxentry_sel_ext_shp_a");
+   g_object_set_data(G_OBJECT(combox), "shipidlist", idlist );
+ 
+-  void foreach_func( gpointer key, gpointer value, gpointer user_data )
+-  {
+-    GwpShip *ship = GWP_SHIP( value );
+-    GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) );
+-    gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
+-    gint curr = idlist[0];
+ 
+-    if( gwp_ship_is_mine( ship ) )
+-    {
+-      curr++;
+-      idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) );
+-      idlist[0]++;
+-      g_sprintf( name, "%03d: ", idlist[curr] );
+-      strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 );
+-      gtk_combo_box_append_text( box, name );
+-    }
+-  }
+ 
+   g_hash_table_foreach( ship_list, (GHFunc) foreach_func, user_data );
+ 
diff --git a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
new file mode 100644
index 000000000000..fa7ee5c5443c
--- /dev/null
+++ b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
@@ -0,0 +1,107 @@
+--- src/gwp-game-state.c.old	2006-03-05 00:56:48.000000000 +0900
++++ src/gwp-game-state.c	2006-03-05 00:57:38.000000000 +0900
+@@ -749,7 +749,7 @@
+   /* Connect to interesting signals */
+   /**********************************/
+   /* Selected planets */
+-  static void planet_conn (gpointer key, gpointer value, gpointer self) {
++  void planet_conn (gpointer key, gpointer value, gpointer self) {
+     g_signal_connect (GWP_PLANET(value),
+ 		      "selected",
+ 		      G_CALLBACK(selected_planet_notification),
+@@ -757,7 +757,7 @@
+   }
+   g_hash_table_foreach (planet_list, (GHFunc) planet_conn, self);
+   /* Selected ships */
+-  static void ship_conn (gpointer key, gpointer value, gpointer self) {
++  void ship_conn (gpointer key, gpointer value, gpointer self) {
+     g_signal_connect (GWP_SHIP(value),
+ 		      "selected",
+ 		      G_CALLBACK(selected_ship_notification),
+--- src/starchart.c.old	2006-03-05 01:13:39.000000000 +0900
++++ src/starchart.c	2006-03-05 01:18:04.000000000 +0900
+@@ -2111,7 +2111,7 @@
+   /*******************/
+   /* Planets signals */
+   /*******************/
+-  static void planet_conn (gpointer key, gpointer value, gpointer data) {
++  void planet_conn (gpointer key, gpointer value, gpointer data) {
+     g_signal_connect (GWP_PLANET(value),
+ 		      "property-changed",
+ 		      G_CALLBACK(update_planet_notification),
+--- src/vp_utils.c.old	2006-03-05 01:18:14.000000000 +0900
++++ src/vp_utils.c	2006-03-05 01:18:52.000000000 +0900
+@@ -2590,7 +2590,7 @@
+ 	  gwp_planet_set_colonists (planet, atoi(p_clans));
+       
+ 	  /* Compare func */
+-	  static gint compare_race (gconstpointer race, gconstpointer adj) {
++	  gint compare_race (gconstpointer race, gconstpointer adj) {
+ 	       gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
+ 	       if (strncmp(race_str, adj, strlen(adj)) == 0) 
+ 		    return 0;
+@@ -2639,7 +2639,7 @@
+ 	  /* Assign known planet values */
+ 	  gwp_planet_set_is_known (planet, TRUE);
+ 	  /* Compare func */
+-	  static gint compare_race (gconstpointer race, gconstpointer adj) {
++	  gint compare_race (gconstpointer race, gconstpointer adj) {
+ 	       gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
+ 	       if (strncmp(race_str, adj, strlen(adj)) == 0) 
+ 		    return 0;
+--- src/gwp-py-mappings.c.old	2006-03-05 01:28:39.000000000 +0900
++++ src/gwp-py-mappings.c	2006-03-05 01:29:30.000000000 +0900
+@@ -8657,7 +8657,7 @@
+ {
+   PyObject *ret = PyDict_New();
+ 
+-  static void add_ship (gpointer key, gpointer value, gpointer user_data) {
++  void add_ship (gpointer key, gpointer value, gpointer user_data) {
+     PyObject *dict = (PyObject *)user_data;
+     GwpShip *ship = GWP_SHIP(value);
+ 
+@@ -8679,7 +8679,7 @@
+ {
+   PyObject *ret = PyDict_New();
+ 
+-  static void add_planet (gpointer key, gpointer value, gpointer user_data) {
++  void add_planet (gpointer key, gpointer value, gpointer user_data) {
+     PyObject *dict = (PyObject *)user_data;
+     GwpPlanet *planet = GWP_PLANET(value);
+ 
+@@ -8701,7 +8701,7 @@
+ {
+   PyObject *ret = PyDict_New();
+ 
+-  static void add_hullspec (gpointer value, gpointer user_data) {
++  void add_hullspec (gpointer value, gpointer user_data) {
+     PyObject *dict = (PyObject *)user_data;
+     GwpHullSpec *hullspec = GWP_HULLSPEC(value);
+ 
+@@ -8723,7 +8723,7 @@
+ {
+   PyObject *ret = PyDict_New();
+ 
+-  static void add_engspec (gpointer value, gpointer user_data) {
++  void add_engspec (gpointer value, gpointer user_data) {
+     PyObject *dict = (PyObject *)user_data;
+     GwpEngSpec *engspec = GWP_ENGSPEC(value);
+ 
+@@ -8745,7 +8745,7 @@
+ {
+   PyObject *ret = PyDict_New();
+ 
+-  static void add_beamspec (gpointer value, gpointer user_data) {
++  void add_beamspec (gpointer value, gpointer user_data) {
+     PyObject *dict = (PyObject *)user_data;
+     GwpBeamSpec *beamspec = GWP_BEAMSPEC(value);
+ 
+@@ -8767,7 +8767,7 @@
+ {
+   PyObject *ret = PyDict_New();
+ 
+-  static void add_torpspec (gpointer value, gpointer user_data) {
++  void add_torpspec (gpointer value, gpointer user_data) {
+     PyObject *dict = (PyObject *)user_data;
+     GwpTorpSpec *torpspec = GWP_TORPSPEC(value);
+ 
diff --git a/games-strategy/gwp/gwp-0.4.0-r3.ebuild b/games-strategy/gwp/gwp-0.4.0-r3.ebuild
new file mode 100644
index 000000000000..f9a4fa227439
--- /dev/null
+++ b/games-strategy/gwp/gwp-0.4.0-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic gnome2 python-single-r1
+
+DESCRIPTION="GNOME client for the classic PBEM strategy game VGA Planets 3"
+HOMEPAGE="http://gwp.lunix.com.ar/"
+SRC_URI="http://gwp.lunix.com.ar/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libgnomeui
+	gnome-base/libglade
+	app-text/rarian
+	dev-libs/libpcre
+	nls? ( virtual/libintl )
+	opengl? ( x11-libs/gtkglext )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pygtk[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	append-libs -lm
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-exec-stack.patch
+	sed -i \
+		-e '/ -O1/d' \
+		-e '/ -g$/d' \
+		src/Makefile.in || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable nls) \
+		$(use_enable opengl gtkglext) \
+		$(use_enable python)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog CHANGES README TODO" \
+	gnome2_src_install
+	rm -rf "${D}"/usr/share/doc/gwp
+}
diff --git a/games-strategy/gwp/metadata.xml b/games-strategy/gwp/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/gwp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/hedgewars-0.9.24.1 b/games-strategy/hedgewars-0.9.24.1
deleted file mode 100644
index 16652d91a6d4..000000000000
--- a/games-strategy/hedgewars-0.9.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib:= libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) >=dev-lang/fpc-2.4 dev-qt/linguist-tools:5 server? ( >=dev-lang/ghc-6.10 dev-haskell/entropy dev-haskell/hslogger >=dev-haskell/mtl-2 >=dev-haskell/network-2.3 dev-haskell/random dev-haskell/regex-tdfa dev-haskell/sandi dev-haskell/sha dev-haskell/vector dev-haskell/utf8-string >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A turn-based strategy, artillery, action and comedy game
-EAPI=6
-HOMEPAGE=https://www.hedgewars.org/
-IUSE=libav server
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 Apache-2.0 FDL-1.3
-RDEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib:= libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) app-arch/xz-utils >=media-fonts/dejavu-2.28 media-fonts/wqy-zenhei
-SLOT=0
-SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-0.9.24.1.tar.bz2 mirror://debian/pool/main/h/hedgewars/hedgewars_0.9.23-dfsg-2.debian.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3bcd50f1a8718040d8a8793d96668c7
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
new file mode 100644
index 000000000000..fa8bc20c4461
--- /dev/null
+++ b/games-strategy/hedgewars/Manifest
@@ -0,0 +1,5 @@
+AUX hedgewars-0.9.22-rpath-fix.patch 677 BLAKE2B 361eac896d7c7e9b6b3fa5daf4c24214e868b2098db96445b612f5ac0a9ce3f09ec88ec7feaaa62e75be5e2f61e62e6ecae68417519b907f54e6eac051d320c4 SHA512 d4511d1d3d6da4d30e33cc12b7c12feb6cf25d1fcdaab4b09a7c4f7a2a5282826190a152e6c1609d2afab71ac001557d2a757c232382f5cd471753f8a4cee8ee
+DIST hedgewars-src-0.9.24.1.tar.bz2 175069915 BLAKE2B 5c49b91b9a77a110a7bc8667f9621c92d638950071c8db7493b7797c2e504a214052fad6ae8554d844146eecabd794529891aebf4e54ee73f8a447ab11c6c7da SHA512 b0b166c807e0d08a763e5e88e178d6e629baa420685bbfe381db7b5ecf003175892f8c2e3b75f1f6d7663335bd5b417d1a2afdc89b9d56b348b056ee3490ed2f
+DIST hedgewars_0.9.23-dfsg-2.debian.tar.xz 77488 BLAKE2B 5de6fa2ad91f1346f679d07b3b445bd119d2cdd3c715ace20fc36abe726330ccf9a9b69ec56c58cfca4cc6256ff248b0cc0b0e27caf2a79df0f1662ea7727e8e SHA512 03680446930279178ddff85a87fc27b7c26ad6d850c8f26571517ebbd6dff296db216da6b56d4bd55c659786bc5c76e2b67a63052ee38e150655e60c08f7c491
+EBUILD hedgewars-0.9.24.1.ebuild 2693 BLAKE2B ea23fac741436c809f3642818833f23ccefe362b14b4576b0f26dc156e85e2e56b1d94d87002475c7788e645f9d676a343f0abb9f741c98313fb81ba10fc4dae SHA512 710ef2dec6586ae25603552cc5a02213bcb8ff4aa5a0b3037608c9ddb39f83d6e68c90097063757e8cc69bb9fa853f7fa88fae33fad394cdee57aa08c45f7d09
+MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
new file mode 100644
index 000000000000..881c0d3217d6
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
@@ -0,0 +1,9 @@
+--- a/cmake_modules/paths.cmake	2015-12-02 15:02:38.000000000 +0100
++++ b/cmake_modules/paths.cmake	2015-12-02 15:15:24.729980850 +0100
+@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF
+     # - the third one is the full path of the system dir
+     #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
+     #skip this if the install prefix is the standard one
+-    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
++    #set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
+ endif(APPLE)
diff --git a/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
new file mode 100644
index 000000000000..3e592af7ebfa
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils desktop xdg-utils
+
+MY_P=${PN}-src-${PV}
+DEB_PATCH_VER=2
+
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="https://www.hedgewars.org/"
+SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
+	mirror://debian/pool/main/h/${PN}/${PN}_0.9.23-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav server"
+
+QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
+QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
+
+# qtcore:5= - depends on private header
+CDEPEND="
+	>=dev-games/physfs-3.0.1
+	dev-lang/lua:0=
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/sdl2-image:=
+	media-libs/sdl2-mixer:=[vorbis]
+	media-libs/sdl2-net:=
+	media-libs/sdl2-ttf:=
+	sys-libs/zlib:=
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:= )"
+DEPEND="${CDEPEND}
+	>=dev-lang/fpc-2.4
+	dev-qt/linguist-tools:5
+	server? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/entropy
+		dev-haskell/hslogger
+		>=dev-haskell/mtl-2
+		>=dev-haskell/network-2.3
+		dev-haskell/random
+		dev-haskell/regex-tdfa
+		dev-haskell/sandi
+		dev-haskell/sha
+		dev-haskell/vector
+		dev-haskell/utf8-string
+		>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
+	)"
+RDEPEND="${CDEPEND}
+	app-arch/xz-utils
+	>=media-fonts/dejavu-2.28
+	media-fonts/wqy-zenhei"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
+		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
+		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
+		-DNOSERVER=$(usex server FALSE TRUE)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DPHYSFS_SYSTEM=ON
+		# Need to tell the build system where the fonts are located
+		# as it uses PhysFS' symbolic link protection mode which
+		# prevents us from symlinking the fonts into the right directory
+		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
+		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
+		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
+		# upstream sets RPATH that leads to weird breakage
+		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman man/${PN}.6
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-strategy/hedgewars/metadata.xml b/games-strategy/hedgewars/metadata.xml
new file mode 100644
index 000000000000..c8b942447c41
--- /dev/null
+++ b/games-strategy/hedgewars/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<use>
+	<flag name="server">Enable local server</flag>
+</use>
+</pkgmetadata>
diff --git a/games-strategy/heroes3-1.3.1a-r2 b/games-strategy/heroes3-1.3.1a-r2
deleted file mode 100644
index c1ccfcd28392..000000000000
--- a/games-strategy/heroes3-1.3.1a-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND==dev-util/xdelta-1* games-util/loki_patch
-DESCRIPTION=Heroes of Might and Magic III: The Restoration of Erathia
-EAPI=5
-HOMEPAGE=http://www.lokigames.com/products/heroes3/
-IUSE=nocd maps music sounds videos
-KEYWORDS=~amd64 ~x86
-LICENSE=LOKI-EULA
-PROPERTIES=interactive
-RDEPEND=!ppc? ( sys-libs/lib-compat-loki ) games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) amd64? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) ppc? ( mirror://lokigames/heroes3/heroes3-1.3.1a-ppc.run )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=491f821945f5c93f12ff0187b305461d
diff --git a/games-strategy/heroes3-demo-1.3.1a b/games-strategy/heroes3-demo-1.3.1a
deleted file mode 100644
index 35d98b231cce..000000000000
--- a/games-strategy/heroes3-demo-1.3.1a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=games-util/loki_patch
-DESCRIPTION=turn-based 2D medieval combat
-EAPI=5
-HOMEPAGE=http://www.lokigames.com/products/heroes3/
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=sys-libs/lib-compat-loki-0.2 || ( ppc? ( x11-libs/libX11 ) !ppc? ( x11-libs/libX11[abi_x86_32(-)] ) ) games-misc/games-envd
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=mirror://lokigames/loki_demos/heroes3-demo.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=097d6450540d903a28c950519ef41070
diff --git a/games-strategy/heroes3-demo/Manifest b/games-strategy/heroes3-demo/Manifest
new file mode 100644
index 000000000000..fefb12231eec
--- /dev/null
+++ b/games-strategy/heroes3-demo/Manifest
@@ -0,0 +1,3 @@
+DIST heroes3-demo.run 99026773 BLAKE2B 48963111c1f076acc2eb3f34a3b86d64943777ea76e8fba09f883bdfe4b89c4daa07e9e5dc584f2a11adda957869728c0806726ef21c6ff82843605e32e34ab7 SHA512 a3f60f12f7ce8ea0f160ec211e1f077693ff2f5e4b8b85ae0e31f1230a910b4df7c8c6a340762d4f09c9845d6141d235307f933305557a75fc63f409e077ac71
+EBUILD heroes3-demo-1.3.1a.ebuild 1438 BLAKE2B bfa532c2791435d8ce9be9f2cf92d68e770c512f1fd8c3da49c13fb80c4f776f2b63a7e7a6af7f139959821c954a1256773232ca1b43951d6ebf0bf360f7329b SHA512 a5dd6d09ba5d48b505bf610fdddcefd537c1263d33f5de8d7076529c841910711bbdfd5579c7bfa0574a9d8c23afd4bf2decf0d349ac9a33903f635ed11ee00c
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
new file mode 100644
index 000000000000..d20f909b2cb3
--- /dev/null
+++ b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils unpacker games
+
+MY_PN=${PN%-demo}
+
+DESCRIPTION="turn-based 2D medieval combat"
+HOMEPAGE="http://www.lokigames.com/products/heroes3/"
+SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+# Should also work on ppc
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror bindist strip"
+
+DEPEND="games-util/loki_patch"
+RDEPEND=">=sys-libs/lib-compat-loki-0.2
+	|| (
+		ppc? (
+			x11-libs/libX11
+		)
+		!ppc? (
+			x11-libs/libX11[abi_x86_32(-)]
+		)
+	)"
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${dir:1}/*"
+
+S=${WORKDIR}
+
+src_install() {
+	# Apply patch
+	loki_patch patch.dat data/ || die
+
+	local demo="data/demos/${MY_PN}_demo"
+
+	local exe_stub="${MY_PN}_demo"
+	if use ppc ; then
+		exe="${exe_stub}.ppc"
+	else
+		exe="${exe_stub}.x86"
+	fi
+
+	insinto "${dir}"
+	exeinto "${dir}"
+	doins -r "${demo}"/*
+	rm "${D}/${dir}"/{${exe_stub}*,*.sh} || die
+	doexe "${demo}/${exe}"
+
+	einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
+	dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
+	dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
+	dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
+
+	games_make_wrapper ${PN} "./${exe}" "${dir}"
+	newicon "${demo}/icon.xpm" ${PN}.png
+	make_desktop_entry ${PN} "Heroes of Might and Magic III (Demo)" ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-strategy/heroes3-demo/metadata.xml b/games-strategy/heroes3-demo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/heroes3-demo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
new file mode 100644
index 000000000000..bf69810036c1
--- /dev/null
+++ b/games-strategy/heroes3/Manifest
@@ -0,0 +1,5 @@
+AUX heroes3-wrapper.sh 195 BLAKE2B 8c588f523487201cc7323f49e0912c32dee2699d04ed4ac9bea55aa588918fc797c93d2fbeb04aa5a726ebce01e0862d5e21a80d477f1e32f535f5c5c9d771ef SHA512 ac1871676ffb0c818ddd9dcadad031d3e296982a989dcc91241b2630eb773e341058e1d4406374a21bcc0f6c8caba94398541ddbc540e7c140660838ef3ed0c8
+DIST heroes3-1.3.1a-cdrom-x86.run 3012188 BLAKE2B 9a76fef81737fd4d0bd6d6c75a5c845a8fef00e739463737996b2065cc9be0c773c198d76310ceafb25cd60b01ded7862cc3ef906eebbe91d50d5f34d454a23a SHA512 d0cb902386361b17009aece0d0508a0c19683c71acf3abe11a7f50ec2d4710a89cda3f5f9da326b58e9b945da5f62533dea54457e141ce71ebc3e9945dca814d
+DIST heroes3-1.3.1a-ppc.run 2643068 BLAKE2B bb975aca97d5b753badb6f0511f2bc88f3ace3488f82a1d70ddd5cadf78f8ab57c4472f6d3d3e9f69728d1008d51ab31a816660611e421873f7b773bf76fb23e SHA512 3578dbed0ed9fd47f67e6abaec4b4d66628160509e68dc3bea7b5288230e344b5b8f9d380c6a35ffc9d084d0e2a54ce84df72b13bfb609fa4d7edd1456264276
+EBUILD heroes3-1.3.1a-r2.ebuild 5478 BLAKE2B 6b13ab2a5bf911b39b36d73cdb702f6f643cdb993ed9a2130799eb8f16427b54dbb66bedbc1fba5b8ebc85c7bc4213b0fd2bb6f59b6adb6804dc8013325372c0 SHA512 56678d9f57e964d89f93fa61a11c2cb3c2b476bbe982a1b861b01859655de51a579e34114b210d2fba412506ffe2db3693a035b854acd0e7e4ba1142596595c9
+MISC metadata.xml 451 BLAKE2B ea23bfe60a36d79f73d5ec04c4b58fe66241baff684458e6121f0f247ee8516767f372551e8b17933cbdb4271d3e99f6028c9a99136daa6e8b558e7a918acf2a SHA512 d4b4f5dd75aec49703e77221d3811c20f72405f45f5ac7990e46a8cf8d639f3c53c5bfae13e6615c0a0ac16ee57073c8e92de355f7e1ac934d9be6b90bce6990
diff --git a/games-strategy/heroes3/files/heroes3-wrapper.sh b/games-strategy/heroes3/files/heroes3-wrapper.sh
new file mode 100644
index 000000000000..3847c539ed76
--- /dev/null
+++ b/games-strategy/heroes3/files/heroes3-wrapper.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+DIR="${HOME}/.loki/heroes3"
+
+if [ ! -d "${DIR}" ]; then
+    echo "* Creating '${DIR}'"
+    mkdir -p ${DIR}
+fi
+
+# fixes bug #93604
+cd ${DIR}
+
+exec GAMES_PREFIX_OPT/heroes3/heroes3 ${@}
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
new file mode 100644
index 000000000000..a08da4b3256a
--- /dev/null
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#	[x] Base Install Required (+4 MB)
+#	[x] Scenarios (+7 MB)
+#	[x] Sounds and Graphics (+118 MB)
+#	[x] Music (+65 MB)
+#	[x] Videos (+147 MB)
+#	--------------------
+#	Total 341 MB
+
+EAPI=5
+LANGS="de es pl"
+LANGPACKPREFIX="${PN}-lang"
+LANGPACKBASE="http://babelize.org/download/"
+LANGPACKPATHPREFIX="${LANGPACKBASE}/${LANGPACKPREFIX}"
+LANGPACKVERSION=1.0.4
+
+inherit eutils unpacker cdrom games
+
+DESCRIPTION="Heroes of Might and Magic III: The Restoration of Erathia"
+HOMEPAGE="http://www.lokigames.com/products/heroes3/"
+
+# Since I do not have a PPC machine to test with, I will leave the PPC stuff in
+# here so someone else can stabilize loki_setupdb and loki_patch for PPC and
+# then KEYWORD this appropriately.
+SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
+	amd64? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
+	ppc? ( mirror://lokigames/${PN}/${P}-ppc.run )"
+# This is commented because the server is unreachable.
+#	linguas_es? ( ${LANGPACKPATHPREFIX}-es.tar.gz )
+#	linguas_de? ( ${LANGPACKPATHPREFIX}-de.tar.gz )
+#	linguas_pl? ( ${LANGPACKPATHPREFIX}-pl.tar.gz )"
+
+#		${LANGPACKBASE}/${PN}-localize-${LANGPACKVERSION}.run
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+IUSE="nocd maps music sounds videos"
+#linguas_en linguas_es linguas_pl linguas_de"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+DEPEND="=dev-util/xdelta-1*
+	games-util/loki_patch"
+RDEPEND="!ppc? ( sys-libs/lib-compat-loki )"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	games_pkg_setup
+#	strip-linguas en ${LANGS}
+
+	use nocd && fullinstall=1
+	use sounds && use videos && use maps && fullinstall=1
+
+	[[ ${fullinstall} -eq 1 ]] \
+		&& ewarn "The full installation takes about 341 MB of space!"
+
+#	if [[ -n "${fullinstall}" ]]
+#	then
+#		langcount=0
+#		for i in ${LINGUAS}
+#		do
+#			i="${i/_/-}"
+#			if [[ ${i} != "en" ]]
+#			then
+#				let $((++langcount))
+#				if [[ $langcount = 2 ]]
+#				then
+#					eerror "Heroes3 only supports one localization at once!"
+#					die "Localization is only supported when Heroes3 is in a single language!"
+#				fi
+#			fi
+#		done
+#	else
+#		for i in ${LINGUAS}
+#		do
+#			i="${i/_/-}"
+#			if [[ ${i} != "en" ]]
+#			then
+#				eerror "Full installation (nocd flag or data + video + maps flags) is needed for ${i} language!"
+#				die "Localization is only supported when Heroes3 is fully locally installed!"
+#			fi
+#		done
+#	fi
+}
+
+src_unpack() {
+	cdrom_get_cds hiscore.tar.gz
+	(use x86 || use amd64) && unpack_makeself ${P}-cdrom-x86.run
+	use ppc && unpack_makeself ${P}-ppc.run
+
+#	for i in ${LINGUAS}
+#	do
+#		i="${i/_/-}"
+#		if [[ ${i} != "en" ]]
+#		then
+#			mkdir localize
+#			cd localize
+##			unpack_makeself ${PN}-localize-${LANGPACKVERSION}.run
+#			unpack ${LANGPACKPREFIX}-${i}.tar.gz
+#			break
+#		fi
+#	done
+}
+
+src_install() {
+	exeinto "${dir}"
+	insinto "${dir}"
+	einfo "Copying files... this may take a while..."
+	doexe "${CDROM_ROOT}"/bin/x86/${PN}
+	doins "${CDROM_ROOT}"/{Heroes_III_Tutorial.pdf,README,icon.{bmp,xpm}}
+
+	if use nocd
+	then
+		doins -r "${CDROM_ROOT}"/{data,maps,mp3}
+	else
+		if use maps
+		then
+			doins -r "${CDROM_ROOT}"/maps
+		fi
+		if use music
+		then
+			doins -r "${CDROM_ROOT}"/mp3
+		fi
+		if use sounds
+		then
+			insinto "${dir}"/data
+			doins "${CDROM_ROOT}"/data/{*.lod,*.snd}
+		fi
+		if use videos
+		then
+			doins -r "${CDROM_ROOT}"/data/video
+		fi
+	fi
+
+#	if [[ -n "${fullinstall}" ]]
+#	then
+#		for i in ${LINGUAS}
+#		do
+#			i="${i/_/-}"
+#			if [[ ${i} != "en" ]]
+#			then
+#				find "${S}/localize/${i}" -type f | while read xfile
+#				do
+#					local file=$(echo "${xfile}" | \
+#						sed "s#^${S}/localize/${i}/##;s#\.xdelta\$##")
+#					ebegin "Localizing ${file}"
+#					xdelta patch "${xfile}" "${Ddir}/${file}" "${Ddir}/${file}.xdp"
+#					local retval=$?
+#					if [[ $retval = 0 ]]
+#					then
+#						mv -f  "${Ddir}/${file}.xdp" "${Ddir}/${file}"
+#					else
+#						rm -f "${Ddir}/${file}.xdp"
+#					fi
+#					eend $retval "File $file could not be localized/patched! Original english version untouched..."
+#				done
+#				break
+#			fi
+#		done
+#	fi
+
+	tar zxf "${CDROM_ROOT}"/hiscore.tar.gz -C "${Ddir}" || die
+
+	cd "${S}"
+	loki_patch --verify patch.dat
+	loki_patch patch.dat "${Ddir}" >& /dev/null || die
+
+	# now, since these files are coming off a cd, the times/sizes/md5sums wont
+	# be different ... that means portage will try to unmerge some files (!)
+	# we run touch on ${D} so as to make sure portage doesnt do any such thing
+	find "${Ddir}" -exec touch '{}' \;
+
+	newicon "${CDROM_ROOT}"/icon.xpm heroes3.xpm
+
+	prepgamesdirs
+	make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3"
+
+	if ! use ppc
+	then
+		einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
+		dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
+		dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
+		dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
+	fi
+
+	elog "Changing 'hiscore.dat' to be writeable for group 'games'."
+	fperms g+w "${dir}/data/hiscore.dat"
+
+	# in order to play campaign games, put this wrapper in place.
+	# it changes CWD to a user-writeable directory before executing heroes3.
+	# (fixes bug #93604)
+	einfo "Preparing wrapper."
+	cp "${FILESDIR}"/heroes3-wrapper.sh "${T}"/heroes3 || die
+	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${T}"/heroes3 || die
+	dogamesbin "${T}"/heroes3
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "To play the game run:"
+	elog " heroes3"
+}
diff --git a/games-strategy/heroes3/metadata.xml b/games-strategy/heroes3/metadata.xml
new file mode 100644
index 000000000000..5ae90d93661b
--- /dev/null
+++ b/games-strategy/heroes3/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <use>
+    <flag name="maps">Installs optional map data</flag>
+    <flag name="music">Installs optional music data</flag>
+    <flag name="sounds">Installs optional sound data</flag>
+  </use>
+</pkgmetadata>
diff --git a/games-strategy/ja2-stracciatella-0.12.1_p7072 b/games-strategy/ja2-stracciatella-0.12.1_p7072
deleted file mode 100644
index e05755dc9295..000000000000
--- a/games-strategy/ja2-stracciatella-0.12.1_p7072
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,sound,video] zlib? ( sys-libs/zlib )
-DESCRIPTION=A port of Jagged Alliance 2 to SDL
-EAPI=5
-HOMEPAGE=https://ja2-stracciatella.github.io/
-IUSE=cdinstall editor ru-gold zlib l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru
-KEYWORDS=~amd64 ~x86
-LICENSE=SFI-SCLA
-RDEPEND=media-libs/libsdl[X,sound,video] zlib? ( sys-libs/zlib ) cdinstall? ( games-strategy/ja2-stracciatella-data ) games-misc/games-envd
-REQUIRED_USE=^^ ( l10n_de l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/ja2-stracciatella-0.12.1_p7072.tar.xz http://tron.homeunix.org/ja2/editor.slf.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=086b7aaf5ca83848d553811f45b09f84
diff --git a/games-strategy/ja2-stracciatella-data-1 b/games-strategy/ja2-stracciatella-data-1
deleted file mode 100644
index d69e038b7719..000000000000
--- a/games-strategy/ja2-stracciatella-data-1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=app-arch/unshield
-DESCRIPTION=A port of Jagged Alliance 2 to SDL (data files)
-EAPI=5
-HOMEPAGE=http://tron.homeunix.org/ja2/
-KEYWORDS=~amd64 ~x86
-LICENSE=SIR-TECH
-PROPERTIES=interactive
-RDEPEND=games-misc/games-envd
-SLOT=0
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a78ea64451dfed10553aef455e664bb1
diff --git a/games-strategy/ja2-stracciatella-data/Manifest b/games-strategy/ja2-stracciatella-data/Manifest
new file mode 100644
index 000000000000..df17ad7cc8a7
--- /dev/null
+++ b/games-strategy/ja2-stracciatella-data/Manifest
@@ -0,0 +1,2 @@
+EBUILD ja2-stracciatella-data-1.ebuild 1313 BLAKE2B cecb581bcd57959652149938e091f4baf50923b22587fe27718d8350cd2288f316b20dcb7303fb9dcced26210d2680483f17aafec019af243b263c5801a16bcc SHA512 3718d75c55421e216a72d4a04d296b6ebb7567d7532fd189e7da0a125a8ae1947f132ac3779088ce2778e3878321d4921241917048b34ed53b7eda1d9e7ee6f0
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
new file mode 100644
index 000000000000..f25285d68939
--- /dev/null
+++ b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cdrom check-reqs games
+
+DESCRIPTION="A port of Jagged Alliance 2 to SDL (data files)"
+HOMEPAGE="http://tron.homeunix.org/ja2/"
+SRC_URI=""
+
+LICENSE="SIR-TECH"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unshield"
+
+S=${WORKDIR}
+
+CHECKREQS_DISK_BUILD="3G"
+CHECKREQS_DISK_USR="1G"
+
+src_unpack() {
+	export CDROM_NAME="INSTALL_CD"
+
+	cdrom_get_cds INSTALL/data1.cab
+
+	# this makes some serious overhead
+	unshield x "${CDROM_ROOT}"/INSTALL/data1.cab || die "unpacking failed"
+}
+
+src_prepare() {
+	cd "${S}"/Ja2_Files/Data || die
+	local lower i
+
+	# convert to lowercase
+	find . \( -iname "*.jsd" -o -iname "*.wav" -o -iname "*.sti" -o -iname "*.slf" \) \
+		-exec sh -c 'echo "${1}"
+	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
+	[ -d `dirname "${lower}"` ] || mkdir `dirname ${lower}`
+	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
+
+	# remove possible leftover
+	rm -r ./TILECACHE ./STSOUNDS
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/ja2/data
+	doins -r "${S}"/Ja2_Files/Data/*
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "This is just the data portion of the game. You will need to install"
+	elog "games-strategy/ja2-stracciatella to play the game."
+}
diff --git a/games-strategy/ja2-stracciatella-data/metadata.xml b/games-strategy/ja2-stracciatella-data/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-strategy/ja2-stracciatella-data/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
new file mode 100644
index 000000000000..c5c81c574245
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -0,0 +1,7 @@
+AUX ja2-convert.sh 411 BLAKE2B 5b6f0682475d1cdacd914f9b0656e35608631e814ac54be81f19cfa39565e9d334499ec658095d3071fa2eb7c9200a81fe5650e4eea16a2077c86dd3edae2261 SHA512 478a8e94c10d69c18812a42fdc6766b77ef743793df38665677e9a878743a770a5565fed1a487e992ce0609d0fa371fb027ee55a9e01c32c283ad75f8a62c09d
+AUX ja2-stracciatella-0.12.1_p7072-gcc6.patch 526 BLAKE2B 22567919e68d467447befb3bb3a42bd64a80df24166375f0925d8d7237bb4471daa1a7a617a193ed9b3320c4fa1ae2bfd37116bc91aae0cb41fd5ca56abfa7f4 SHA512 15aabca2fc0e9d7cab0b4c7ed471eda8029e073250959f038a714eccbddddc1a0dc0aab54e7f45dd988347b52346386e90e75c29025698c9d7814c3fb10a5b1f
+AUX ja2-stracciatella-0.12.1_p7072-makefile.patch 3666 BLAKE2B 11c110649dce7650a315511edbff12036ad2a257d7d4c3d4da5a14a7d3ae0e9949fc2c8b5f435789a3090cf2a200f4b1d9e2175a1fa94466eaa6e1c209bfcee7 SHA512 07cd2f1367bd9dbad9bc6ec3d633fc77bf337dddf69d69da7c297722c1684c9c80e88b918b89dc2e02e83160b224cf7b22f6e21fce2de525ee480a513c64cd99
+DIST editor.slf.gz 134265 BLAKE2B 0a379a2340ad717b2be913eb7368a73232a231e7cf2753f2569bfe3027f51e5e4b8aac8cb15982b6d46161529054c3f15ae11849faae42ed34c8d4dbb4aa52c3 SHA512 243e3bf5e7298c3a71b330985f5c4d4df3e4cb43df32c823d835353d6309a64f62679c3d0634ca162f6484f7cbf366627e57b1d967188c13940db8933a5f03f2
+DIST ja2-stracciatella-0.12.1_p7072.tar.xz 2118832 BLAKE2B 229cd30891216ba305f8b81764b57edf4179bb09a783d2619242c6e3cbeb29f131cb1901934364d952b54796c8398985a54cbf465d36f737c438958c145dcdb1 SHA512 9269c9e2e179d705b6d83dfac56c604eaefbe5bffe5c16e3f26c1209d3842bbac22db19362e51acf0c6602d64a283d2ec4fa19b0f37d1cddfb013f686c936411
+EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2109 BLAKE2B 184b1753465260dcdd0d175f0b9b6c1af01ff3486111cd4f6fb2f1d08ec000a231feee8ca62c65f66f0fed2e67e9e8eab6892d78c753d046d5ea19bb597cbfd2 SHA512 3974587fbc679732a92cab1b7418fb90f4cbf9d7aa8f0e8c28c4bfae106379bc13c8184fa0680c604af3af1dfd83c8af9b630416c3267c61da0de1013f756d11
+MISC metadata.xml 402 BLAKE2B 4329f4f00399517a6c54e94930d5ecaebd78d2321fb479f3de4faf42783ea8c3e081fca8b16e129d6351fc6e2d5e47b17273198ea1da851578dfa59091900736 SHA512 7f56ace0297b3af4c5d4f386428d9341bb7ca462370abf4c8b4814fce550b724f40f97d876b350ab8b1dd8f0c6916e20ca90a32de07d400739bfa40e004d1dbf
diff --git a/games-strategy/ja2-stracciatella/files/ja2-convert.sh b/games-strategy/ja2-stracciatella/files/ja2-convert.sh
new file mode 100644
index 000000000000..4f337ca75351
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/files/ja2-convert.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Convert names of data-files to lower-case
+
+# location of the data-files
+GAMES_DATADIR=@GAMES_DATADIR@
+
+cd "${GAMES_DATADIR}" || exit 1
+
+# convert to lowercase
+find . -exec sh -c 'echo "${1}"
+lower="`echo "${1}" | tr [:upper:] [:lower:]`"
+[ -d `dirname "${lower}"` ] || mkdir `dirname ${lower}`
+[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
+
+# remove leftover
+rm -r ./TILECACHE ./STSOUNDS
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
new file mode 100644
index 000000000000..2661b19d6c77
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/600082
+
+--- a/Build/Laptop/BobbyRGuns.cc
++++ b/Build/Laptop/BobbyRGuns.cc
+@@ -700,7 +700,7 @@
+ 	//center picture in frame
+ 	ETRLEObject const& pTrav   = uiImage->SubregionProperties(0);
+ 	UINT32      const  usWidth = pTrav.usWidth;
+-	INT16       const  sCenX   = PosX + abs(BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
++	INT16       const  sCenX   = PosX + (BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
+ 	INT16       const  sCenY   = PosY + 8;
+ 
+ 	//blt the shadow of the item
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
new file mode 100644
index 000000000000..0475773bd361
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
@@ -0,0 +1,179 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue May  8 19:16:08 UTC 2012
+Subject: build system
+
+--- Makefile
++++ Makefile
+@@ -16,106 +16,94 @@
+ MANPREFIX ?= $(PREFIX)
+ 
+ INSTALL         ?= install
+-INSTALL_PROGRAM ?= $(INSTALL) -m 555 -s
+-INSTALL_MAN     ?= $(INSTALL) -m 444
+-INSTALL_DATA    ?= $(INSTALL) -m 444
++INSTALL_PROGRAM ?= $(INSTALL) -m 755
++INSTALL_MAN     ?= $(INSTALL) -m 644
++INSTALL_DATA    ?= $(INSTALL) -m 644
+ 
++# compiler CFLAGS
++CFLAGS += -std=gnu99
+ 
++# sdl-flags
+ SDL_CONFIG  ?= sdl-config
+ ifndef CFLAGS_SDL
+ CFLAGS_SDL  := $(shell $(SDL_CONFIG) --cflags)
+ endif
+ ifndef LDFLAGS_SDL
+-LDFLAGS_SDL := $(shell $(SDL_CONFIG) --libs)
++LIBS_SDL := $(shell $(SDL_CONFIG) --libs)
+ endif
+ 
++# LIBS
++LIBS += $(LIBS_SDL)
++LIBS += -lm
++
++ifdef WITH_ZLIB
++LIBS += -lz
++endif
+ 
+-CFLAGS += $(CFLAGS_SDL)
+-CFLAGS += -I Build
+-CFLAGS += -I Build/Tactical
+-CFLAGS += -I Build/Strategic
+-CFLAGS += -I Build/Editor
+-CFLAGS += -I Build/Res
+-CFLAGS += -I Build/Laptop
+-CFLAGS += -I Build/Utils
+-CFLAGS += -I Build/TileEngine
+-CFLAGS += -I Build/TacticalAI
+-CFLAGS += -I sgp
+-
+-#CFLAGS += -Wall
+-#CFLAGS += -W
+-CFLAGS += -Wpointer-arith
+-CFLAGS += -Wreturn-type
+-CFLAGS += -Wunused-label
+-CFLAGS += -Wunused-variable
+-CFLAGS += -Wwrite-strings
+ 
+-CFLAGS += -DJA2
++# preprocessor flags
++CPPFLAGS += $(CFLAGS_SDL)
++CPPFLAGS += -I Build
++CPPFLAGS += -I Build/Tactical
++CPPFLAGS += -I Build/Strategic
++CPPFLAGS += -I Build/Editor
++CPPFLAGS += -I Build/Res
++CPPFLAGS += -I Build/Laptop
++CPPFLAGS += -I Build/Utils
++CPPFLAGS += -I Build/TileEngine
++CPPFLAGS += -I Build/TacticalAI
++CPPFLAGS += -I sgp
+ 
++CPPFLAGS += -DJA2
+ 
+ ifdef WITH_DEMO
+-  CFLAGS += -DJA2DEMO
++  CPPFLAGS += -DJA2DEMO
+ endif
+ 
+ ifdef WITH_DEMO_ADS
+   ifndef WITH_DEMO
+     $(error WITH_DEMO_ADS needs WITH_DEMO)
+   endif
+-  CFLAGS += -DJA2DEMOADS
++  CPPFLAGS += -DJA2DEMOADS
+ endif
+ 
+ ifdef WITH_FIXMES
+-  CFLAGS += -DWITH_FIXMES
++  CPPFLAGS += -DWITH_FIXMES
+ endif
+ 
+ ifdef WITH_MAEMO
+-  CFLAGS += -DWITH_MAEMO
++  CPPFLAGS += -DWITH_MAEMO
+ endif
+ 
+ ifdef WITH_SOUND_DEBUG
+-  CFLAGS += -DWITH_SOUND_DEBUG
++  CPPFLAGS += -DWITH_SOUND_DEBUG
+ endif
+ 
+ ifdef _DEBUG
+-  CFLAGS += -D_DEBUG
++  CPPFLAGS += -D_DEBUG
+   ifndef JA2TESTVERSION
+     JA2TESTVERSION := yes
+   endif
+ endif
+ 
+ ifdef JA2TESTVERSION
+-  CFLAGS += -DJA2TESTVERSION
++  CPPFLAGS += -DJA2TESTVERSION
+   ifndef JA2BETAVERSION
+   	JA2BETAVERSION := yes
+   endif
+ endif
+ 
+ ifdef JA2BETAVERSION
+-CFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
++CPPFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
+ endif
+ 
+ ifdef JA2EDITOR
+-CFLAGS += -DJA2EDITOR
++CPPFLAGS += -DJA2EDITOR
+ endif
+ 
+-CFLAGS += -D$(LNG)
+-
+-CFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
+-
+-CCFLAGS += $(CFLAGS)
+-CCFLAGS += -std=gnu99
+-CCFLAGS += -Werror-implicit-function-declaration
+-CCFLAGS += -Wimplicit-int
+-CCFLAGS += -Wmissing-prototypes
++CPPFLAGS += -D$(LNG)
++CPPFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
+ 
+-CXXFLAGS += $(CFLAGS)
+-
+-LDFLAGS += $(LDFLAGS_SDL)
+-LDFLAGS += -lm
+-
+-ifdef WITH_ZLIB
+-LDFLAGS += -lz
+-endif
+ 
+ SRCS :=
+ SRCS += Build/AniViewScreen.cc
+@@ -468,7 +456,7 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .cc .d .o
+ 
+-Q ?= @
++Q = 
+ 
+ all: $(BINARY)
+ 
+@@ -476,15 +464,15 @@
+ 
+ $(BINARY): $(OBJS)
+ 	@echo '===> LD $@'
+-	$(Q)$(CXX) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@
++	$(Q)$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $@ $(LIBS)
+ 
+ .c.o:
+ 	@echo '===> CC $<'
+-	$(Q)$(CC) $(CCFLAGS) -c -MMD -o $@ $<
++	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
+ 
+ .cc.o:
+ 	@echo '===> CXX $<'
+-	$(Q)$(CXX) $(CXXFLAGS) -c -MMD -o $@ $<
++	$(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
+ 
+ clean distclean:
+ 	@echo '===> CLEAN'
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
new file mode 100644
index 000000000000..4da66d2c406f
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A port of Jagged Alliance 2 to SDL"
+HOMEPAGE="https://ja2-stracciatella.github.io/"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
+	http://tron.homeunix.org/ja2/editor.slf.gz"
+
+LICENSE="SFI-SCLA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdinstall editor ru-gold zlib"
+
+DEPEND="media-libs/libsdl[X,sound,video]
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	cdinstall? ( games-strategy/ja2-stracciatella-data )"
+
+LANGS="l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru"
+IUSE="$IUSE $LANGS"
+REQUIRED_USE="^^ ( ${LANGS//+/} )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+
+	sed \
+		-e "s:/some/place/where/the/data/is:${GAMES_DATADIR}/ja2:" \
+		-i sgp/FileMan.cc || die
+
+	sed \
+		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}/ja2/data:" \
+		"${FILESDIR}"/ja2-convert.sh > "${T}"/ja2-convert || die
+}
+
+src_compile() {
+	local myconf
+
+	case ${L10N} in
+		de) myconf="LNG=GERMAN" ;;
+		nl) myconf="LNG=DUTCH" ;;
+		fr) myconf="LNG=FRENCH" ;;
+		it) myconf="LNG=ITALIAN" ;;
+		pl) myconf="LNG=POLISH" ;;
+		ru) myconf="LNG=$(usex ru-gold RUSSIAN_GOLD RUSSIAN)" ;;
+		en) myconf="LNG=ENGLISH" ;;
+		*) die "wat" ;;
+	esac
+	elog "Chosen language is ${myconf#LNG=}"
+
+	use editor && myconf+=" JA2EDITOR=yes JA2BETAVERSION=yes"
+	use zlib && myconf+=" WITH_ZLIB=yes"
+
+	emake ${myconf}
+}
+
+src_install() {
+	dogamesbin ja2 "${T}"/ja2-convert
+
+	if use editor; then
+		insinto "${GAMES_DATADIR}"/ja2/data
+		doins "${WORKDIR}"/editor.slf
+	fi
+
+	make_desktop_entry ja2 ${PN}
+	doman ja2.6
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "You need ja2 in the chosen language, otherwise set it in package.use!"
+
+	if ! use cdinstall ; then
+		elog "You need to copy all files from the Data directory of"
+		elog "Jagged Alliance 2 installation to"
+		elog "${GAMES_DATADIR}/ja2/data "
+		elog "Make sure the filenames are lowercase. You may want to run the"
+		elog "script":
+		elog "${GAMES_BINDIR}/ja2-convert"
+	fi
+}
diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml
new file mode 100644
index 000000000000..3db7ad1de988
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="editor">Adds necessary file to run the editor</flag>
+		<flag name="ru-gold">Support for russian gold ja2 version</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-strategy/knights-demo-1.32-r2 b/games-strategy/knights-demo-1.32-r2
deleted file mode 100644
index 19f5ae12e5f8..000000000000
--- a/games-strategy/knights-demo-1.32-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Anglo-Saxon medieval army battles and resource management
-EAPI=6
-HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=knights
-KEYWORDS=~amd64 ~x86
-LICENSE=knights-demo
-RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/knights-demo-1.32.run
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e865f9a5641587ca9e9f71ba3bfdcd37
diff --git a/games-strategy/knights-demo/Manifest b/games-strategy/knights-demo/Manifest
new file mode 100644
index 000000000000..152c63cfe4f3
--- /dev/null
+++ b/games-strategy/knights-demo/Manifest
@@ -0,0 +1,3 @@
+DIST knights-demo-1.32.run 31667235 BLAKE2B ee9c63a261aaea93122b790ef3d4df21b30b53d8f47e2f1549c3e6aaf7a09f04b5f7985e6d26e395266176fa9135cb7257bfc5c6f5eba7524da19758ab241715 SHA512 f53cf9524811b4a83ec2531f62ea251fc5a939cb09445ab850c7bbac85301e8b8275dda12a8dc991e4412eb4358d7597d0c007bd9263fd875289b039b941ed9c
+EBUILD knights-demo-1.32-r2.ebuild 1183 BLAKE2B 7474ab747a641cb6913a5aa26d4fcaf1e0fd319b5db9e50d133ba05af9828a6caf76318f66d627ce23b19880c92fc2e2ef27e12b3511e298d57995844a4005ce SHA512 213b7a7f8fe80e919077ad35fa68ed7d7c111ef408917e55ab307afade34ea4843bf6a0f2d6ac4a01f2d10768fd57d8bd670c04f3a20389e8d6a2485a8a8b231
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
new file mode 100644
index 000000000000..d314a019ee7c
--- /dev/null
+++ b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
+HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
+# Unversioned upstream filename
+SRC_URI="mirror://gentoo/${P}.run"
+
+LICENSE="knights-demo"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="
+	sys-libs/glibc
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_makeself ${P}.run
+	mv -f data{,-temp}
+	unpack ./data-temp/data.tar.gz
+	rm -rf data-temp lgp_* setup*
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	exeinto "${dir}"
+	doexe bin/Linux/x86/${PN}{,.dynamic}
+
+	insinto "${dir}"
+	doins -r data
+	doins EULA icon.xpm README{,.licenses}
+
+	# We don't support the dynamic version, even though we install it.
+	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	newicon icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Knights and Merchants (Demo)" ${PN}
+}
diff --git a/games-strategy/knights-demo/metadata.xml b/games-strategy/knights-demo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/knights-demo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/lgeneral-1.3.1-r2 b/games-strategy/lgeneral-1.3.1-r2
deleted file mode 100644
index 864c3858e868..000000000000
--- a/games-strategy/lgeneral-1.3.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A Panzer General clone written in SDL
-EAPI=6
-HOMEPAGE=http://lgames.sourceforge.net/LGeneral/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.3.1.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5df6697890cec4d2135348e51d8aacc4
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
new file mode 100644
index 000000000000..a4304e1f2633
--- /dev/null
+++ b/games-strategy/lgeneral/Manifest
@@ -0,0 +1,4 @@
+DIST lgeneral-1.3.1.tar.gz 1678892 BLAKE2B 701b22a8967c037e2385a1f1bbb2e91703cbffc7fff6383f3d593fab07dc01fa352f9ec3ee25dfbbdd5172c4e8cd804bd7f9fa2a84a3c6a22f581884c8d7d9d9 SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5
+DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516
+EBUILD lgeneral-1.3.1-r2.ebuild 1922 BLAKE2B 743229424c55bc5581c30bcccf727efe5720294f8449e58113acf4a3b83a4a5c101430aad7ac12c0a1fbea35a053e93b5f05138b3a5d36ab22d9a662d2a86ee2 SHA512 5edbe0077b8fcca017235986c57c481ac88798494830015feaf57efee555614562fab26f17a51b9cd65621846e906ccac8e8657956af76db3e48c0ddefd10585
+MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb
diff --git a/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..bc431e1c2933
--- /dev/null
+++ b/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop gnome2-utils
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/beta-}"
+DESCRIPTION="A Panzer General clone written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/LGeneral/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	mirror://sourceforge/${PN}/pg-data.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/desktop_DATA/d' \
+		-e '/icon_DATA/d' \
+		Makefile.am || die
+
+	cp /usr/share/gettext/config.rpath .
+	rm -f missing
+	mv configure.in configure.ac
+	eautoreconf
+
+	# Build a temporary lgc-pg that knows about ${WORKDIR}:
+	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:/usr/share:" \
+		-e "s:@D@::" \
+		{lgc-pg,src}/misc.c || die
+
+	cd "${WORKDIR}"/tmp-build || die
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:/usr/share:" \
+		-e "s:@D@:${D}:" \
+		{lgc-pg,src}/misc.c || die
+}
+
+src_configure() {
+	econf $(use_enable nls)
+
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}"/tmp-build || die
+	econf \
+		--disable-nls \
+		--datadir="${D}/usr/share"
+}
+
+src_compile() {
+	emake
+
+	# Build the temporary lgc-pg:
+	cd "${WORKDIR}"/tmp-build || die
+	emake
+}
+
+src_install() {
+	default
+	keepdir /usr/share/${PN}/{ai_modules,music,terrain}
+
+	# Generate scenario data:
+	dodir /usr/share/${PN}/gfx/{flags,units,terrain} #413901
+	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg --separate-bridges \
+		-s "${WORKDIR}"/pg-data \
+		-d "${D}"/usr/share/${PN} || die
+
+	doicon -s 48 lgeneral.png
+	make_desktop_entry ${PN} LGeneral
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/lgeneral/metadata.xml b/games-strategy/lgeneral/metadata.xml
new file mode 100644
index 000000000000..a7f8ed3d65fa
--- /dev/null
+++ b/games-strategy/lgeneral/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">lgeneral</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/lightyears-1.4-r2 b/games-strategy/lightyears-1.4-r2
deleted file mode 100644
index ceceac9ac563..000000000000
--- a/games-strategy/lightyears-1.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=A single-player game with a science-fiction theme
-EAPI=6
-HOMEPAGE=http://www.jwhitham.org/20kly/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.jwhitham.org/20kly/lightyears-1.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3a7ba127431dfbda4252b303d54a45f8
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
new file mode 100644
index 000000000000..7cf7cebecb57
--- /dev/null
+++ b/games-strategy/lightyears/Manifest
@@ -0,0 +1,4 @@
+AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
+DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
+EBUILD lightyears-1.4-r2.ebuild 1020 BLAKE2B d692c8e1087689b67a62a8785869d5c66511bdfd8114e9b27378ab0c3b35418b733eb8c4d37bfcfa25a2943a035207648d0e39eb39b3ec3b318f4c3197491e9e SHA512 1721d4023d7a275d67f691e867d857200d7c9e71b871b4b7fec34302707324ebf8d88c47d03d0331e149ca9ace89daceece333415c45225f690220574cdae087
+MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13
diff --git a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
new file mode 100644
index 000000000000..325c4365ded4
--- /dev/null
+++ b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
@@ -0,0 +1,45 @@
+--- a/lightyears
++++ b/lightyears
+@@ -1,7 +1,6 @@
+ #!/usr/bin/python
+ 
+ # Set the location of the LightYears files here:
+-LIGHTYEARS_DIR = "."
+ # LIGHTYEARS_DIR = "/usr/share/games/lightyears" # (for Debian)
+ 
+ # Save games and configuration files are stored in the user's
+@@ -10,31 +9,6 @@
+ import sys, os
+ 
+ if __name__ == "__main__":
+-    # Path to data/code dir can be overridden by environment variable
+-    LIGHTYEARS_DIR = os.environ.get("LIGHTYEARS_DIR", LIGHTYEARS_DIR)
+-
+-    # Path does not exist? Try current directory.
+-    if ((LIGHTYEARS_DIR == None)
+-    or (not os.path.isdir(LIGHTYEARS_DIR))
+-    or (not os.path.isfile(os.path.join(LIGHTYEARS_DIR, 
+-                            'code', 'startup.py')))):
+-        LIGHTYEARS_DIR = os.getcwd()
+-
+-    # Paths obtained
+-    sys.path.insert(0, os.path.join(LIGHTYEARS_DIR, 'code'))
+-    data_dir = os.path.join(LIGHTYEARS_DIR, 'data')
+-
+-    # Go
+-    try:
+-        import startup
+-        assert os.path.isdir(data_dir)
+-    except:
+-        print "Unable to find LightYears code & data in:"
+-        for p in sys.path:
+-            print '  ', p
+-
+-        sys.exit(1)
+-
+-    startup.Main(data_dir)
+-    
+-
++    sys.path.insert(0, "@GENTOO_LIBDIR@")
++    import startup
++    startup.Main("@GENTOO_DATADIR@/data")
diff --git a/games-strategy/lightyears/lightyears-1.4-r2.ebuild b/games-strategy/lightyears/lightyears-1.4-r2.ebuild
new file mode 100644
index 000000000000..7e7344951fc2
--- /dev/null
+++ b/games-strategy/lightyears/lightyears-1.4-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="A single-player game with a science-fiction theme"
+HOMEPAGE="http://www.jwhitham.org/20kly/"
+SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${P}"-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		${PN} || die
+	python_fix_shebang .
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/"$(get_libdir)/${PN}"
+	doins code/*.py
+
+	einstalldocs
+
+	insinto "/usr/share/${PN}"
+	doins -r audio data manual
+
+	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
+
+	newicon data/32.png ${PN}.png
+	make_desktop_entry ${PN} "Light Years Into Space"
+}
diff --git a/games-strategy/lightyears/metadata.xml b/games-strategy/lightyears/metadata.xml
new file mode 100644
index 000000000000..c314eef5e089
--- /dev/null
+++ b/games-strategy/lightyears/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 lang="en">
+"20,000 Light Years Into Space" was written for Pyweek (March 2006) by Jack
+Whitham. It is a single-player real-time strategy game with a science-fiction
+theme.
+</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/liquidwar-5.6.4-r2 b/games-strategy/liquidwar-5.6.4-r2
deleted file mode 100644
index ecf54bf2b426..000000000000
--- a/games-strategy/liquidwar-5.6.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=media-libs/allegro-4.2:0[X]
-DESCRIPTION=Unique multiplayer wargame
-EAPI=6
-HOMEPAGE=http://www.ufoot.org/liquidwar/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/allegro-4.2:0[X]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/liquidwar/liquidwar-5.6.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=b96bac4be5d2f69f910c3f9fdc066195
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
new file mode 100644
index 000000000000..9ac03e77fc48
--- /dev/null
+++ b/games-strategy/liquidwar/Manifest
@@ -0,0 +1,6 @@
+AUX liquidwar-5.6.4-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a
+AUX liquidwar-5.6.4-ovflfix.patch 700 BLAKE2B d0a46b244008d78eaa67cba8f8a39a710c8b75d64876a9e7eae86b168c94f8111326739795b061a2209c70fbb05399291cfdfa6f580c3439e7a68768e9049def SHA512 0d242ff7ba17af4b5d61e040b37fbf363d5c4bec615af21e2b2ea77f7cef4633f66a870196e40b590c6609ed15c90208172154b4e613b6ea0d4fe0f2189bb294
+AUX liquidwar-5.6.4-underlink.patch 442 BLAKE2B bfd7beea85546fca013de4229bbd0b1a658f87a608d1340e2463304c72b1d6e82917a95052488f53be40e3bfcafcf23b13007d8f86d541c8236e6dbaeec1c948 SHA512 3835cad62e8141774c5675d1dbc22103cb41a6af0d4a0a70b23e96d88fe72f49b872823bfb9f35294b8d1bec5d6e89942b37928ee92bb53ecb177a560fe8559d
+DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
+EBUILD liquidwar-5.6.4-r2.ebuild 1650 BLAKE2B 92597eae770aa2a1063101a383eb406922c969b9adf8187b812fa98ae04d6135b29dcb90440190c0a02d2637d3f06752894c7a122aac3c88a62a3a67fa08558f SHA512 4adc6c05c0f9c319ba75c3720679040bdf5e2b2e269ed1208cf155a44b26b14d015943b5520233adcb86156f007b16840f8696d1d150933b1e8cc1b89f5c86c9
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
new file mode 100644
index 000000000000..a1e93c9b738c
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
@@ -0,0 +1,27 @@
+--- a/src/glouglou.s
++++ b/src/glouglou.s
+@@ -240,3 +240,6 @@
+ 
+    ret
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/monster.s
++++ b/src/monster.s
+@@ -972,3 +972,6 @@
+    ret                              # retour au c
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/spread.s
++++ b/src/spread.s
+@@ -957,3 +957,6 @@
+ 
+ 
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
new file mode 100644
index 000000000000..c092f02beabe
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
@@ -0,0 +1,18 @@
+--- a/src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
++++ b/src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
+@@ -100,12 +100,12 @@
+ 
+   data->privacy = privacy;
+   data->log = log;
+-  strncpy (data->metaserver, metaserver, URL_SIZE);
++  strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
+   data->port = port;
+   data->busy_players = busy_players;
+   data->max_players = max_players;
+-  strncpy (data->password, password, URL_SIZE);
+-  strncpy (data->comment, comment, URL_SIZE);
++  strncpy (data->password, password, sizeof(data->password));
++  strncpy (data->comment, comment, sizeof(data->comment));
+ }
+ 
+ /*------------------------------------------------------------------*/
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
new file mode 100644
index 000000000000..d80e349bf1b1
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
++++ b/src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
+@@ -223,7 +223,7 @@
+     EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
+ else
+     LINK_OPTIONS = 
+-    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
++    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
+ endif
+ 
+ CONFIG_OPTIONS = \
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
new file mode 100644
index 000000000000..8899b512aa19
--- /dev/null
+++ b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Unique multiplayer wargame"
+HOMEPAGE="http://www.ufoot.org/liquidwar/"
+SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=media-libs/allegro-4.2:0[X]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-ovflfix.patch
+	sed -i \
+		-e 's:/games::' \
+		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
+		-e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
+		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
+		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
+		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
+		-e '/install/s:-s ::' \
+		-e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
+		-e 's:$(GMAKE):$(MAKE):' \
+		-e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
+		|| die 'sed Makefile.in failed'
+	sed -i \
+		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
+		-e 's:/games::' src/Makefile.in \
+		|| die "sed src/Makefile.in failed"
+	eapply "${FILESDIR}"/${P}-underlink.patch
+}
+
+src_configure() {
+	econf \
+		--disable-doc-ps \
+		--disable-doc-pdf \
+		--disable-target-opt \
+		$(use_enable x86 asm)
+}
+
+src_compile() {
+	# skip build_doc target wrt bug 460344
+	emake build_bin build_data
+}
+
+src_install() {
+	emake DESTDIR="${D}" install_nolink
+	einstalldocs
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+	# Provided desktop file is completely obsolete
+	rm -f "${ED}"/usr/share/applications/liquidwar.desktop
+	make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
+}
diff --git a/games-strategy/liquidwar/metadata.xml b/games-strategy/liquidwar/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/liquidwar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/liquidwar6-0.4.3681-r1 b/games-strategy/liquidwar6-0.4.3681-r1
deleted file mode 100644
index 41724b444900..000000000000
--- a/games-strategy/liquidwar6-0.4.3681-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) dev-lang/perl nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Unique multiplayer wargame between liquids
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/liquidwar6/
-IUSE=doc gles2 gtk libcaca +maps nls +ogg openmp readline test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-0.4.3681.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-extra-maps-0.4.3681.tar.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fe6bf574519c5cb06ed930c4c6dcb20
diff --git a/games-strategy/liquidwar6/Manifest b/games-strategy/liquidwar6/Manifest
new file mode 100644
index 000000000000..f510733c8b7f
--- /dev/null
+++ b/games-strategy/liquidwar6/Manifest
@@ -0,0 +1,7 @@
+AUX liquidwar6-0.4.3681-check-headers.patch 3579 BLAKE2B 11772008f512e5a54af6e94979b22f46c02f3b76276393dbcb0c44cc10e4c554e0153daee013c021f3678f3d3a201b0a9754677a3fd2a1e3cb58055260110498 SHA512 43429430fe1d447bd70a8b7a6b1da0023a9f17d6b96e2edd7079e199c25e8e28df9ffadbca6c94ee4fdb397022d89f0246cf4da3468255fd204ae4e51fe53e9f
+AUX liquidwar6-0.4.3681-ldconfig.patch 717 BLAKE2B 6275696534deda1daca800b033c8c9fffbeeb802df5ea13a7cc443e5f45cb4c56c113bf2b51915b45883d3a6521199f7c4fd89e5d8cc9209c9b5465a29a9611e SHA512 8dfb058210de219c6f27564988ba92c4bcbae2e74b3c42636fccf3e8c039e1aae8df724bc59d40484dd40151eb46c168a2eba929af15f54ee029b5a600559c2b
+AUX liquidwar6-0.4.3681-paths.patch 788 BLAKE2B a12e9a5de06c465b89832b918c35a460919f0521462e33afe1768a232f0a400748e864d689d156f94c7130dc82930f7b1fda5d1b0dbc37f387420d0f5be1f1aa SHA512 6e89453c4c5ff08f99d41c1ab92ed6552c41b4f08eb09b2e7c5ca10147eeb02b000eb68bc1eb4b4b29f27e15ed7e7d380999c13a16804665a937e5facb67f365
+DIST liquidwar6-0.4.3681.tar.gz 26531646 BLAKE2B c6043931f634dd9769c822b18d243fd32cf0457e6974ec3fee5a8098f4864a7de09d343fd729b2cd9b8c966f92279d972636bb82bc40065f1635b4f5d41ce36f SHA512 4154c8d3c2ceb128cf2d27a4682c89a30d3610f695b2e05f8d4e33c13fb54aaab3bb4a2b5c6dbcc43ff5d24991ea57a521716c94e15d8dd05dc384c22a37f52a
+DIST liquidwar6-extra-maps-0.4.3681.tar.gz 16191302 BLAKE2B 178d9ca86b0ede86d2dec61b92033ea86c01b18d1bbded79d7ffa1643e6fa6e4665a989bc6295923aed55f4e663090e907852581be23c86c9f5220bdc3ca557d SHA512 e767adc4402f803824145fd12f79eb2cbf9b34aea12065123a558dfb6704bd7ab1861b453e794f7a612d4fa75d0f6024ef410b2700eea08a279d6857b9dc2ba7
+EBUILD liquidwar6-0.4.3681-r1.ebuild 2618 BLAKE2B 28140feeafe20351f10b8ae49bee685f949818bc9c5ded2789447b8cba09812825f46cd6b5c6ebdad698e5131ce771fb7268b13c60515fe0a1806088672e77d3 SHA512 c4d79e05d6e34f324892828ce107e9d0a30773f56610e4009aaada084ca49e11bb20150a10bab215b8842dbbcd68cb8d7e2e96f76566525b92d7d7c04835699a
+MISC metadata.xml 1468 BLAKE2B 8c62f766b9ec5a31ae289746600d37bf94e519f5d238d37f3e93c548d4b03340a0b7743e5979536f88dafcbbffa306651b85df3f7f0f6f0431bd551db3ee0bab SHA512 e7c970ad9f7f0798ec2968ba703fd42fd1e7b49a075f84b6e4ff1109d2bc5ef5daa2b9b41e342c754e5dd4d804ddde4d7d7b2fbcc22ca4dad10dad21b5b33eb4
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch
new file mode 100644
index 000000000000..34dd76b48ea0
--- /dev/null
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch
@@ -0,0 +1,70 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Jun  4 16:01:18 UTC 2014
+Subject: fix header checks
+
+	our multilib wrapped headers are broken shit
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@
+ AC_SUBST(LW6_VERSION_MINOR)
+ 
+ dnl Headers, some are optional
+-AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
++AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
+ 
+ dnl GNULIB stuff, http://www.gnu.org/software/gnulib/
+ gl_00GNULIB
+@@ -477,40 +477,42 @@
+ fi
+ SDL_EXTRA="${SDL_EXTRA_CFLAGS} ${SDL_EXTRA_LIBS}"
+ 
++CFLAGS="$CFLAGS $SDL_EXTRA_CFLAGS"
++
+ AC_CHECK_HEADER(SDL/SDL.h, HAVE_SDL_H=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL (http://www.libsdl.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(SDL, SDL_Init, HAVE_LIBSDL=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL (http://www.libsdl.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(GL/gl.h, HAVE_GL_GL_H=1,AC_MSG_WARN([
+ *** Liquid War 6 needs Mesa (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(GL, glBegin, HAVE_LIBGL=1, AC_MSG_WARN([
+ *** Liquid War 6 needs Mesa (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(GL/glu.h, HAVE_GL_GLU_H=1,AC_MSG_WARN([
+ *** Liquid War 6 needs GLU (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(GLU, gluBeginCurve, HAVE_LIBGLU=1, AC_MSG_WARN([
+ *** Liquid War 6 needs GLU (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(SDL/SDL_image.h, HAVE_SDL_IMAGE_H=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(SDL_image, IMG_Load, HAVE_LIBSDL_IMAGE=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(SDL/SDL_ttf.h, HAVE_SDL_TTF_H=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(SDL_ttf, TTF_Init, HAVE_LIBSDL_TTF=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_ARG_ENABLE([mod-gl1], AS_HELP_STRING([--enable-mod-gl1],[compile mod-gl1 default=yes]), [enable_mod_gl1=$enableval], [enable_mod_gl1=yes])
+ 
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch
new file mode 100644
index 000000000000..dd5e702b6144
--- /dev/null
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch
@@ -0,0 +1,16 @@
+commit 1bd3596545912f2e47b8848df3fb5d99195d299a
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jan 8 17:21:09 2014 +0100
+
+    don't run ldconfig
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -65,7 +65,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u
+ SUBDIRS = lib
+ 
+ install-exec-local:
+-	if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root
+ 	if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@LW6_VERSION_BASE@; ln -s @PACKAGE_TARNAME@-@LW6_VERSION_BASE@ $(DESTDIR)$(bindir)/liquidwar6; fi
+ 
+ uninstall-local:
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch
new file mode 100644
index 000000000000..3ac69032471e
--- /dev/null
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch
@@ -0,0 +1,27 @@
+commit b121fe3d9fb7e5fc52f592482e02b6a28430435f
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jan 8 17:23:56 2014 +0100
+
+    respect datarootdir
+
+--- a/data/icon/Makefile.am
++++ b/data/icon/Makefile.am
+@@ -19,6 +19,6 @@
+ # Contact author        : ufoot@ufoot.org
+ 
+ pkgdata_DATA = liquidwar6.png liquidwar6.xpm
+-pkgdatadir = $(datadir)/pixmaps
++pkgdatadir = $(datarootdir)/pixmaps
+ EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns
+ 
+--- a/pkg/Makefile.am
++++ b/pkg/Makefile.am
+@@ -19,7 +19,7 @@
+ # Contact author        : ufoot@ufoot.org
+ 
+ pkgdata_DATA = liquidwar6.desktop
+-pkgdatadir = $(datadir)/applications
++pkgdatadir = $(datarootdir)/applications
+ EXTRA_DIST =  $(pkgdata_DATA) liquidwar6.spec liquidwar6d 406FFCAB.gnupg.txt FD409E94.gnupg.txt
+ 
+ distclean-local:
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
new file mode 100644
index 000000000000..c5881059e602
--- /dev/null
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs games
+
+MY_PV=${PV/_beta/beta}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Unique multiplayer wargame between liquids"
+HOMEPAGE="https://www.gnu.org/software/liquidwar6/"
+SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
+	maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
+
+# yes, cunit is rdep
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-scheme/guile:12
+	dev-util/cunit
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/libsdl[X,opengl,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-ttf
+	net-misc/curl
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	libcaca? ( media-libs/libcaca )
+	gles2? ( media-libs/mesa[gles2] )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl
+		virtual/libiconv )
+	ogg? (
+		media-libs/libsdl[X,sound,opengl,video]
+		media-libs/sdl-mixer[vorbis]
+	)
+	readline? ( sys-libs/ncurses:0
+		sys-libs/readline:0 )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV}
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+	fi
+	games_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-{ldconfig,paths}.patch \
+		"${FILESDIR}"/${P}-check-headers.patch
+
+	sed -i \
+		-e 's/-Werror//' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# configure fails with cunit disabled
+	egamesconf \
+		$(use_enable nls) \
+		--enable-cunit \
+		$(use_enable gtk) \
+		--enable-mod-gl1 \
+		$(use_enable gles2 mod-gles2) \
+		$(use_enable libcaca mod-caca) \
+		$(use_enable openmp) \
+		$(use_enable ogg mod-ogg) \
+		$(use_enable !ogg silent) \
+		$(use_enable readline console) \
+		--disable-static \
+		--datarootdir=/usr/share \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+
+	if use maps; then
+		cd "${S_MAPS}" || die
+		egamesconf
+	fi
+}
+
+src_compile() {
+	default
+	use doc && emake html
+	use maps && emake -C "${S_MAPS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install
+	prune_libtool_files --all
+	prepgamesdirs
+}
diff --git a/games-strategy/liquidwar6/metadata.xml b/games-strategy/liquidwar6/metadata.xml
new file mode 100644
index 000000000000..5f504d57eb1c
--- /dev/null
+++ b/games-strategy/liquidwar6/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>
+	<use>
+		<flag name="doc">Convert the info pages to html</flag>
+		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+		<flag name="gtk">Used to display error/critical messages</flag>
+		<flag name="maps">Install extra maps</flag>
+		<flag name="ogg">Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg> (currently the only sound provider)</flag>
+		<flag name="readline">Enable interactive script shell for hacking</flag>
+	</use>
+	<longdescription lang="en">
+		FEATURES:
+		* Fast-paced tactical action. Control the movement of all your forces at the same time
+		* Simple yet original game mechanics, discovered by Thomas Colcombet
+		* 10 different teams, each with their own charactaristics and special attacks
+		* 13 levels, each one twisting the gameplay in a new direction
+		* 100+ more levels if you download the bonus pack
+		* Levels can be created using simple image files
+		* Lots of level design options: walls, edge wraparound, bridges, different speed, special areas such as glue or danger and varied army size and fighter behavior
+		* Internationalization support, interface translated in French, Norwegian and Russian
+		* Free Software, part of the GNU project (licence: GNU GPL v3+)
+	</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/majesty-demo-1.0.0-r1 b/games-strategy/majesty-demo-1.0.0-r1
deleted file mode 100644
index f7419e183440..000000000000
--- a/games-strategy/majesty-demo-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Control your own kingdom in this simulation
-EAPI=6
-HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=8&
-KEYWORDS=~amd64 ~x86
-LICENSE=MAJESTY-DEMO
-RDEPEND=sys-libs/glibc x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)]
-RESTRICT=bindist strip
-SLOT=0
-SRC_URI=http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a9382baab126fb0b086b8348a4266dc
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
new file mode 100644
index 000000000000..fb21a2c32ed9
--- /dev/null
+++ b/games-strategy/majesty-demo/Manifest
@@ -0,0 +1,3 @@
+DIST majesty_demo.run 36582366 BLAKE2B f972f5d98eb0a907d7b34dd09c8a1eabb67ded08287e147f08125a6b6e833e4e7c18f8374873b532f765a6c121a6885a46f06645eddb4245db93e801f5a67328 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79
+EBUILD majesty-demo-1.0.0-r1.ebuild 1029 BLAKE2B 129421df38286b45c02fdafbbc4dac32b8f23ce76ee1c7c8a57fbe9383687f15341c2187ee9ec95259b4b550ac3f97ade3ea10a663af2509c89e65221d87b378 SHA512 e6c950304ea53be9627c53fbfbe37bfe57d4a3338375ee675cf5c4a5bc53cb9cd1c5f378f121ba102ba2d98d35370f0e50cf76c1ac9e7378ac880bb1be27d8c2
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..7a9bb85b31a9
--- /dev/null
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="Control your own kingdom in this simulation"
+HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=8&"
+SRC_URI="http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run"
+
+LICENSE="MAJESTY-DEMO"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist strip"
+
+RDEPEND="
+	sys-libs/glibc
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+"
+DEPEND=""
+
+S="${WORKDIR}"
+
+dir="/opt/${PN}"
+Ddir="${D}/${dir}"
+QA_PREBUILT="${dir:1}/maj_demo"
+
+src_install() {
+	einstalldocs
+	insinto "${dir}"
+	exeinto "${dir}"
+	doins -r data quests
+	doins majesty.{bmp,xpm} majestysite.url
+	newicon majesty.xpm majesty-demo.xpm
+	# only installing the static version for now
+	doexe bin/Linux/x86/maj_demo
+	make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
+	make_desktop_entry maj_demo "Majesty (Demo)"
+}
diff --git a/games-strategy/majesty-demo/metadata.xml b/games-strategy/majesty-demo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/majesty-demo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/maxr-0.2.9 b/games-strategy/maxr-0.2.9
deleted file mode 100644
index 4a29fe004be5..000000000000
--- a/games-strategy/maxr-0.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Mechanized Assault and Exploration Reloaded
-EAPI=6
-HOMEPAGE=https://www.maxr.org
-IUSE=dedicated
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FDL-1.2+
-RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net
-SLOT=0
-SRC_URI=https://www.maxr.org/downloads/maxr-0.2.9.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0324bab7ca4c53fedc341b08fc4e51f2
diff --git a/games-strategy/maxr/Manifest b/games-strategy/maxr/Manifest
new file mode 100644
index 000000000000..8bf86d8a34b4
--- /dev/null
+++ b/games-strategy/maxr/Manifest
@@ -0,0 +1,3 @@
+DIST maxr-0.2.9.tar.gz 14847180 BLAKE2B eac99b06f84a2559a6ba601396a43b98014ccea2339bd5f7b8327d000d5a5ddf032c2a1fd1c0bec9e3be16e95e170acf93bc99438400d92eb637c2fa68ebcfed SHA512 8c92d85edf152b1730a8b9e1047d41687cfac816ea854e1ec0b5068a650d399cd3cfc4c47593a2eb83604fd649a05ba649763251104fd70d49bb1cb33d4f58fc
+EBUILD maxr-0.2.9.ebuild 906 BLAKE2B 8a9d82045a516ff1ff6fcce2b65e56740fed45a327e9723b910efcf262c45c6790ba932ba0d114bb8fca9dee85b2a5d90816ce6798d10b309160981eecff2617 SHA512 cb51b58e53d9286e77628ff866f63109843c6daf64592bf3c1cdbdee284d627ab3988caa566f17c6a4db7be99ef4d39cbec3f1ae5b5a2b601887cb32b7556d65
+MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
diff --git a/games-strategy/maxr/maxr-0.2.9.ebuild b/games-strategy/maxr/maxr-0.2.9.ebuild
new file mode 100644
index 000000000000..4e1287280ad5
--- /dev/null
+++ b/games-strategy/maxr/maxr-0.2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils
+
+DESCRIPTION="Mechanized Assault and Exploration Reloaded"
+HOMEPAGE="https://www.maxr.org"
+SRC_URI="https://www.maxr.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated"
+
+RDEPEND="media-libs/libsdl2[video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DMAXR_BUILD_DEDICATED_SERVER=$(usex dedicated)
+		-DCMAKE_BUILD_TYPE=Release
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 128 data/${PN}.png
+	make_desktop_entry ${PN} "Mechanized Assault and Exploration Reloaded"
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-strategy/maxr/metadata.xml b/games-strategy/maxr/metadata.xml
new file mode 100644
index 000000000000..c040f7c7d3e0
--- /dev/null
+++ b/games-strategy/maxr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/games-strategy/megaglest-3.11.1-r1 b/games-strategy/megaglest-3.11.1-r1
deleted file mode 100644
index 699dad28c367..000000000000
--- a/games-strategy/megaglest-3.11.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=~games-strategy/megaglest-data-3.11.1 >=dev-lang/lua-5.1:0 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:3.0[X,opengl] ) fribidi? ( dev-libs/fribidi ) model-viewer? ( x11-libs/wxGTK:3.0[X] ) !static? ( dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew media-libs/libpng:0 net-libs/libircclient >=net-libs/miniupnpc-1.8 net-misc/curl virtual/jpeg:0 ) videos? ( media-video/vlc ) sys-apps/help2man virtual/pkgconfig editor? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) model-viewer? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) static? ( dev-libs/icu[static-libs] dev-libs/xerces-c[icu,static-libs] media-libs/ftgl[static-libs] media-libs/glew[static-libs] media-libs/libpng:0[static-libs] net-libs/libircclient[static-libs] net-libs/miniupnpc[static-libs] net-misc/curl[static-libs] virtual/jpeg:0[static-libs] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Cross-platform 3D realtime strategy game
-EAPI=5
-HOMEPAGE=http://www.megaglest.org/
-IUSE=debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 BitstreamVera
-RDEPEND=~games-strategy/megaglest-data-3.11.1 >=dev-lang/lua-5.1:0 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:3.0[X,opengl] ) fribidi? ( dev-libs/fribidi ) model-viewer? ( x11-libs/wxGTK:3.0[X] ) !static? ( dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew media-libs/libpng:0 net-libs/libircclient >=net-libs/miniupnpc-1.8 net-misc/curl virtual/jpeg:0 ) videos? ( media-video/vlc ) games-misc/games-envd
-SLOT=0
-SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a9fa18949dad32219e0e443ff699bc4
diff --git a/games-strategy/megaglest-data-3.11.1 b/games-strategy/megaglest-data-3.11.1
deleted file mode 100644
index 0fe60cff9f26..000000000000
--- a/games-strategy/megaglest-data-3.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Data files for the cross-platform 3D realtime strategy game MegaGlest
-EAPI=5
-HOMEPAGE=http://www.megaglest.org/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=https://github.com/MegaGlest/megaglest-data/releases/download/3.11.1/megaglest-data-3.11.1.tar.xz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=63917303de23782c56b645fd7128c9a8
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
new file mode 100644
index 000000000000..d4668c5ba765
--- /dev/null
+++ b/games-strategy/megaglest-data/Manifest
@@ -0,0 +1,3 @@
+DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
+EBUILD megaglest-data-3.11.1.ebuild 976 BLAKE2B 0c2891e67a8bf8c464b40edddf0a4982813d51b7be94395fbdd5730236dad55b97182608ddc7dadf09df382214d2b17e518d6b7bccbf796fefea7de89337649f SHA512 cbc1bd54a07b22776d0f49388ec43f2cb94fc8d47b04ded079c511d5c87c3f0fd8f38a37cae2ba32652085c6716610084125309a12e24297c22c6b1443a2a7b1
+MISC metadata.xml 342 BLAKE2B 3e1f532ee136e71fe0c923694e49cedfdce563f052f0e1a48bad9086fa511ffdef728107969738251cb13fe8df360270df227d1b7dec383110564f5cad54ab1e SHA512 6ae571607c0fefd0ff846ea1f9946d1e5de8a208494b71474f2c46495beb4d306edc37d7ed754305c6e325e7b7306f13f3e78010235bef1c97873cf01de519fe
diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
new file mode 100644
index 000000000000..c10fa689e223
--- /dev/null
+++ b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils games
+
+MY_PN="megaglest"
+DESCRIPTION="Data files for the cross-platform 3D realtime strategy game MegaGlest"
+HOMEPAGE="http://www.megaglest.org/"
+SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
+		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${MY_PN}"
+		-DMEGAGLEST_ICON_INSTALL_PATH="/usr/share/pixmaps"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS="docs/glest_factions/"
+	cmake-utils_src_install
+	prepgamesdirs
+}
diff --git a/games-strategy/megaglest-data/metadata.xml b/games-strategy/megaglest-data/metadata.xml
new file mode 100644
index 000000000000..860fcccb60df
--- /dev/null
+++ b/games-strategy/megaglest-data/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">MegaGlest/megaglest-data</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
new file mode 100644
index 000000000000..dc77bd19f530
--- /dev/null
+++ b/games-strategy/megaglest/Manifest
@@ -0,0 +1,6 @@
+AUX megaglest-3.11.1-cmake.patch 897 BLAKE2B 3076a11cbb18263aabfabdaadb4e201d26b7db6e55e32278c0f37ebd938ae8a41cccb906bcf30ff99a32f6ecb35d77512fd3904610443847d1e3bb3212122902 SHA512 f49580a2b87fbc1e9aa3bec7313bdff36f78404aa97ac9f0cef790202c7d92439ad3fd8a9bdc991540048adb771e22f36c946f44a967cacae5157ef98b41c6cc
+AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385d9adc5066873e2ff220eed0344752405019abb13a7dfd0ade027dedd7064e65cf4d6e0509b44986aa5692d7af73b701f7f SHA512 62bf0ff8fa167cecae9f7bf65e5295d609afcdb9fdcb3bf502366eb775fa8d3d39c12001d320a9dc42e12075004c86b7d118eb517d6a57473e03aa26944f8bd4
+AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5
+DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
+EBUILD megaglest-3.11.1-r1.ebuild 4505 BLAKE2B 4740e92ac4cc3159ee3e52500a089cad5ebfa530196989737711bdd0fbd86a6fcede17a59190f02450a3b834f502f8b3f263af0325c1ad0d47c091a2dce7735e SHA512 7df2fe631b17a88fead0cd758bcbd8cc7b4f94bf5f5cd4bc541ab527d204c3e769929e573c4ee586a614ff4ccc90ca99cf1bccc73a7b512c7fe119ee93455a87
+MISC metadata.xml 1649 BLAKE2B 92291055582673bdb4c067a42b6f6c599e205e9f8e98a00311d603921a64ce94f2c7b58a2cfbb0b0c9cd7214fd9f3aab3f6d4f9464b77133287638d743ec55a6 SHA512 65e705850828566bafc3b87638613574245039d91da5a39b7d79296c2eeb8701ef04c3bd520686c2dc73d65baa58f1ecb61ee2ce188204a5e704bf15261d34c3
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
new file mode 100644
index 000000000000..527671246e98
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
@@ -0,0 +1,28 @@
+From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 13 May 2015 04:22:45 +1000
+Subject: [PATCH] Fix build with >=cmake-3.2.
+
+The FindOpenGL module no longer pulls in X11 libraries.
+---
+ source/shared_lib/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
+index 3da563e..e5a06fc 100644
+--- a/source/shared_lib/CMakeLists.txt
++++ b/source/shared_lib/CMakeLists.txt
+@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
+ 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
+ 	ENDIF()
+ 
++        IF(UNIX)
++		FIND_PACKAGE(X11 REQUIRED)
++		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
++        ENDIF()
+ 
+         IF(WANT_XERCES)
+ 	        FIND_PACKAGE(XercesC REQUIRED)
+-- 
+2.3.6
+
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
new file mode 100644
index 000000000000..112e734c6efb
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
@@ -0,0 +1,21 @@
+diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
+index a5d4b92..cb8ceb4 100644
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) {
+ 		const char *upnp_minissdpdsock = NULL;
+ 		int upnp_sameport = 0;
+ 		int upnp_ipv6 = 0;
++		unsigned char upnp_ttl = 2;
+ 		int upnp_error = 0;
+ 
+-#ifndef MINIUPNPC_VERSION_PRE1_6
++#if (MINIUPNPC_API_VERSION >= 14)
++		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
++
++		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
++		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
++#elif (MINIUPNPC_API_VERSION >= 8)
+ 		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+ 
+ 		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
new file mode 100644
index 000000000000..2586a561956b
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
@@ -0,0 +1,63 @@
+commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a
+Author: hasufell <hasufell@gentoo.org>
+Date:   Mon Nov 18 21:54:54 2013 +0100
+
+    fix static build
+
+diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake
+index 2a026cc..8ca8a23 100644
+--- a/mk/cmake/Modules/FindOGG.cmake
++++ b/mk/cmake/Modules/FindOGG.cmake
+@@ -19,11 +19,11 @@
+ 
+ FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
+ 
+-#IF (OGG_STATIC AND NOT OGG_LIBRARY)
+-#	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
+-#ELSE()
+-	FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
+-#ENDIF()
++IF (OGG_STATIC AND NOT OGG_LIBRARY)
++	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a)
++ELSE()
++	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so)
++ENDIF()
+ 
+ #IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
+ #	FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
+--- a/mk/cmake/Modules/FindXercesC.cmake
++++ b/mk/cmake/Modules/FindXercesC.cmake
+@@ -83,6 +83,9 @@
+ 	 /usr/lib
+ 	 /usr/local/lib
+ 	)
++	
++	FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a)
++	FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a)
+ 
+ 	IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
+                 MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]")
+@@ -90,7 +93,7 @@
+ 
+ 		IF(UNIX AND NOT APPLE)
+ 			#SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata")
+-			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}")
++			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY}  ${ICUDATA_LIBRARY}")
+ 		ENDIF()
+ 	ENDIF()
+ ENDIF()
+--- a/mk/cmake/Modules/FindFriBiDi.cmake
++++ b/mk/cmake/Modules/FindFriBiDi.cmake
+@@ -28,9 +28,9 @@
+ SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
+ 
+ OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
+-IF(WANT_STATIC_LIBS)
+-	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
+-ENDIF()
++#IF(WANT_STATIC_LIBS)
++#	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
++#ENDIF()
+ 
+ MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
+ 
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
new file mode 100644
index 000000000000..ef99043c0a34
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# google-breakpad
+# TODO: fribidi, libvorbis static
+
+EAPI=5
+VIRTUALX_REQUIRED="manual"
+inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="http://www.megaglest.org/"
+SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
+
+LICENSE="GPL-3 BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
+
+RDEPEND="
+	~games-strategy/${PN}-data-${PV}
+	>=dev-lang/lua-5.1:0
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libsdl[X,sound,joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/gnutls
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	editor? ( x11-libs/wxGTK:3.0[X,opengl] )
+	fribidi? ( dev-libs/fribidi )
+	model-viewer? ( x11-libs/wxGTK:3.0[X] )
+	!static? (
+		dev-libs/xerces-c[icu]
+		media-libs/ftgl
+		media-libs/glew
+		media-libs/libpng:0
+		net-libs/libircclient
+		>=net-libs/miniupnpc-1.8
+		net-misc/curl
+		virtual/jpeg:0
+		)
+	videos? ( media-video/vlc )"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	virtual/pkgconfig
+	editor? ( ${VIRTUALX_DEPEND} )
+	model-viewer? ( ${VIRTUALX_DEPEND} )
+	static? (
+		dev-libs/icu[static-libs]
+		dev-libs/xerces-c[icu,static-libs]
+		media-libs/ftgl[static-libs]
+		media-libs/glew[static-libs]
+		media-libs/libpng:0[static-libs]
+		net-libs/libircclient[static-libs]
+		net-libs/miniupnpc[static-libs]
+		net-misc/curl[static-libs]
+		virtual/jpeg:0[static-libs]
+	)"
+
+src_prepare() {
+	if use editor || use model-viewer ; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+	fi
+
+	epatch "${FILESDIR}"/${P}-static-build.patch \
+		"${FILESDIR}"/${P}-cmake.patch \
+		"${FILESDIR}"/${P}-miniupnpc.patch
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse3; then
+		SSE=3
+	elif use cpu_flags_x86_sse2; then
+		SSE=2
+	elif use cpu_flags_x86_sse; then
+		SSE=1
+	else
+		SSE=0
+	fi
+
+	local mycmakeargs=(
+		$(cmake-utils_use_enable fribidi FRIBIDI)
+		$(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR)
+		$(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS)
+		$(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
+		$(cmake-utils_use_with videos VLC)
+		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
+		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
+		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		# icons are used at runtime, wrong default location share/pixmaps
+		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		-DUSE_FTGL=ON
+		$(cmake-utils_use_want static STATIC_LIBS)
+		$(cmake-utils_use_want streflop STREFLOP)
+		-DWANT_SVN_STAMP=off
+		$(cmake-utils_use static wxWidgets_USE_STATIC)
+		$(cmake-utils_use unicode wxWidgets_USE_UNICODE)
+		$(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL)
+
+		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
+	)
+
+	# support CMAKE_BUILD_TYPE=Gentoo
+	append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	if use editor || use model-viewer; then
+		# work around parallel make issues - bug #561380
+		MAKEOPTS="-j1 ${MAKEOPTS}" \
+			VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
+	else
+		cmake-utils_src_compile
+	fi
+}
+
+src_install() {
+	# rebuilds some targets randomly without fast option
+	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
+
+	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
+	doicon -s 48 ${PN}.png
+
+	use editor &&
+		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
+	use model-viewer &&
+		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	einfo
+	elog 'Note about Configuration:'
+	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
+	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
+	elog 'values in these files.'
+	elog
+	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
+	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
+	elog 'Some graphics cards may require setting Max Lights to 1.'
+	einfo
+
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/megaglest/metadata.xml b/games-strategy/megaglest/metadata.xml
new file mode 100644
index 000000000000..192243d3ba3d
--- /dev/null
+++ b/games-strategy/megaglest/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://megaglest.svn.sourceforge.net/viewvc/megaglest/trunk/docs/CHANGELOG.txt?revision=3397</changelog>
+		<doc lang="en">http://glest.wikia.com/wiki/MG</doc>
+		<bugs-to>https://sourceforge.net/tracker/?group_id=300350&amp;atid=1266776</bugs-to>
+		<remote-id type="github">MegaGlest/megaglest-source</remote-id>
+	</upstream>
+	<use>
+		<flag name="editor">Build map editor</flag>
+		<flag name="fribidi">Enable FriBIDi support</flag>
+		<flag name="streflop">Use the library streflop. Out of synchs may
+			occur if not enabled.</flag>
+		<flag name="tools">Build model import/export tools</flag>
+		<flag name="unicode">Use unicode strings for wxwidgets</flag>
+		<flag name="wxuniversal">Use the wxUniversal port which implements
+			the various GUI controls by drawing them itself </flag>
+		<flag name="model-viewer">Build model viewer</flag>
+	</use>
+	<longdescription lang="en">
+		MegaGlest is an entertaining free (freeware and free software) and
+		open source cross-platform 3D real-time strategy (RTS) game, where
+		you control the armies of one of seven different factions: Tech,
+		Magic, Egyptians, Indians, Norsemen, Persian or Romans. The game is
+		setup in one of 17 naturally looking settings, which -like the unit
+		models- are crafted with great appreciation for detail. Additional
+		game data can be downloaded from within the game at no cost.
+	</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/metadata.xml b/games-strategy/metadata.xml
new file mode 100644
index 000000000000..9cac05913c02
--- /dev/null
+++ b/games-strategy/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The games-strategy category contains strategy games.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-strategy enthält Strategiespiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-strategy contiene juegos de estrategia.
+	</longdescription>
+	<longdescription lang="ja">
+		games-strategyカテゴリーにはストラテジー・ゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-strategy categorie bevat strategiespellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-strategy chứa các trò chơi chiến thuật.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-strategy contiene giochi strategici.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria games-strategy contém jogos de estratégia.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria games-strategy zawiera gry strategiczne.
+	</longdescription>
+</catmetadata>
+
diff --git a/games-strategy/mindrover-demo-1.07b b/games-strategy/mindrover-demo-1.07b
deleted file mode 100644
index b4d802167cb2..000000000000
--- a/games-strategy/mindrover-demo-1.07b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Control a robot as it races across Europa
-EAPI=5
-HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=9
-KEYWORDS=~x86
-LICENSE=all-rights-reserved GPL-2+
-RDEPEND=virtual/opengl games-misc/games-envd
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=http://demos.linuxgamepublishing.com/mindrover/mindrover_demo.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=607231463986813eb882fd88b62f2a99
diff --git a/games-strategy/mindrover-demo/Manifest b/games-strategy/mindrover-demo/Manifest
new file mode 100644
index 000000000000..14f2b2370beb
--- /dev/null
+++ b/games-strategy/mindrover-demo/Manifest
@@ -0,0 +1,3 @@
+DIST mindrover_demo.run 25266633 BLAKE2B 427dd9a808309634ff59c5cb756b7433225f15f4bfed8ef6ed5ebf0f85db1a0db5e488b4041c04aa3b75a6f651bd0a013e89d70b8c11b1cab262861888d26bb2 SHA512 ddb78f6a40bd42dd3b3ce0a6793f5e217937d3be1dd294d7d8596f8409eee506522a64d9396db2d93fa3beca197d85c7a6507a8f2ae773d0b9b123e9be1e761c
+EBUILD mindrover-demo-1.07b.ebuild 1102 BLAKE2B cc5f9cd09c652dc9576824bfa46b4fa851d0f7c39db84ac1573f4fbb5a7b2a578eb5c11d4c125ef33c981f44fd65bd9e3478d261d4436e590c10f4240d7edc51 SHA512 b778ebbe2c38346ca1a0e1ce4c7a60308a08809c930df095eb9bef7fc941b219c20a4246cad746ef7b718e1ff22d60a19aa6c95e639a3dae8badc174c6f4cb89
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/mindrover-demo/metadata.xml b/games-strategy/mindrover-demo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/mindrover-demo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
new file mode 100644
index 000000000000..c41f3c126707
--- /dev/null
+++ b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils unpacker games
+
+MY_P="mindrover_demo.run"
+DESCRIPTION="Control a robot as it races across Europa"
+HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=9"
+SRC_URI=" http://demos.linuxgamepublishing.com/mindrover/${MY_P}"
+
+LICENSE="all-rights-reserved GPL-2+"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+RESTRICT="mirror bindist strip"
+
+RDEPEND="virtual/opengl"
+
+S=${WORKDIR}
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+src_install() {
+	einfo "This will take a while ... go get a pizza or something"
+
+	dodir "${dir}"
+
+	tar -zxf data.tar.gz -C "${Ddir}"/ || die
+	tar -zxf music.tar.gz -C "${Ddir}"/ || die
+
+	dodoc README
+	newicon icon.xpm ${PN}.xpm || die
+	exeinto "${dir}"
+	doexe bin/Linux/x86/glibc-2.1/mindrover_demo \
+		bin/Linux/x86/glibc-2.1/lib/libopenal.so.0.0.6 || die
+	dosym "${dir}"/libopenal.so.0.0.6 "${dir}"/libopenal.so.0
+
+	games_make_wrapper ${PN} ./mindrover_demo "${dir}" "${dir}"
+	make_desktop_entry ${PN} "Mindrover: Europa Project (Demo)"
+
+	prepgamesdirs
+}
diff --git a/games-strategy/naev-0.6.1-r1 b/games-strategy/naev-0.6.1-r1
deleted file mode 100644
index cf2af825b622..000000000000
--- a/games-strategy/naev-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst unpack
-DEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal ) virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A 2D space trading and combat game, in a similar vein to Escape Velocity
-EAPI=6
-HOMEPAGE=http://blog.naev.org/
-IUSE=debug +mixer +openal
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal )
-SLOT=0
-SRC_URI=mirror://sourceforge/naev/naev-0.6.1.tar.bz2 mirror://sourceforge/naev/ndata-0.6.1.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ff2273c1a031ca4b9b322c90f33b256
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
new file mode 100644
index 000000000000..113e0384af04
--- /dev/null
+++ b/games-strategy/naev/Manifest
@@ -0,0 +1,4 @@
+DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
+DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
+EBUILD naev-0.6.1-r1.ebuild 1545 BLAKE2B 44c10dd5764f76cfb8c693d5b75072d0262f91ee88e1d0769cc931508b494f710536b6c4bf922b9a97de65f04752a8c4d416ec2323e26677900321725f6a2da9 SHA512 787650821eb5ca41c6c816961fee73b30ed915c2c2ad1fc95c1b389e32230ce809f41e92d601aa662af867db361b6404ebb66f85902b1de4b178cf52268272a0
+MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62
diff --git a/games-strategy/naev/metadata.xml b/games-strategy/naev/metadata.xml
new file mode 100644
index 000000000000..fd273f3193a7
--- /dev/null
+++ b/games-strategy/naev/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="mixer">
+		Enables <pkg>media-libs/sdl-mixer</pkg> sound backend in addition to
+		<pkg>media-libs/openal</pkg> one.
+	</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">naev</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/naev/naev-0.6.1-r1.ebuild b/games-strategy/naev/naev-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..c7932c3eb325
--- /dev/null
+++ b/games-strategy/naev/naev-0.6.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic gnome2-utils
+
+DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="http://blog.naev.org/"
+SRC_URI="mirror://sourceforge/naev/${P}.tar.bz2
+	mirror://sourceforge/naev/ndata-${PV}.zip"
+
+LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +mixer +openal"
+
+RDEPEND="
+	media-libs/libsdl2[X,sound,video]
+	dev-libs/libzip
+	dev-libs/libxml2
+	>=media-libs/freetype-2:2
+	>=media-libs/libvorbis-1.2.1
+	>=media-libs/libpng-1.2:0=
+	virtual/glu
+	virtual/opengl
+	dev-lang/lua:0
+	mixer? ( media-libs/sdl2-mixer )
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-lua=shared \
+		$(use_enable debug) \
+		$(use_with openal) \
+		$(use_with mixer sdlmixer)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		appicondir=/usr/share/pixmaps \
+		appdatadir=/usr/share/appdata \
+		Graphicsdir=/usr/share/applications \
+		install
+	insinto /usr/share/${PN}
+	newins "${DISTDIR}"/ndata-${PV}.zip ndata
+
+	local res
+	for res in 16 32 64 128; do
+		newicon -s ${res} extras/logos/logo${res}.png naev.png
+	done
+
+	rm -f "${D}"/usr/share/doc/${PF}/LICENSE
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/netherearth-0.52-r1 b/games-strategy/netherearth-0.52-r1
deleted file mode 100644
index 5d1fa21081f5..000000000000
--- a/games-strategy/netherearth-0.52-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/freeglut app-arch/unzip
-DESCRIPTION=A remake of the SPECTRUM game Nether Earth
-EAPI=6
-HOMEPAGE=http://www.braingames.getput.com/nether/
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/freeglut
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=http://www.braingames.getput.com/nether/sources.zip http://www.braingames.getput.com/nether/netherearth052.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=6dab8984b931ba946c6ddc566c3d816b
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
new file mode 100644
index 000000000000..d7ea91b7f4a6
--- /dev/null
+++ b/games-strategy/netherearth/Manifest
@@ -0,0 +1,10 @@
+AUX Makefile 1003 BLAKE2B 53264f4ebfcb11142d6c503263d47825cb9f3370a9e291551043aab616da09fb936e293a01eb5f4916ebd29690e315004b0dfa2303f2853963b3e80e0b260d59 SHA512 72cb6f6cb31beb79d91ac3b60eff1cb4046fcecd83621c42ff34a145eefbf484b8bc87ed3c2792bec7d1587d2578c95b4a4b925f9a032c8eefe9a9208a96fcdb
+AUX netherearth-0.52-freeglut.patch 371 BLAKE2B 3b480c96a2ce423213e870a3310a2d0411717662b1f557268ceaf46a4ca7710044a82f7df0f9d2128006a0e7dcad6322be86b91260d4f4f2a6a2215ec66b4c02 SHA512 125c27de71d4c600f78ca3c6f86e6431a6ae20cfc2b12238f3fdfca99bc77bbe90ffb5f3b98ee58d987d8852b154d63342f1677eae99eeebff07b0b2d810edfa
+AUX netherearth-0.52-gentoo-paths.patch 4356 BLAKE2B 59b2320ab0e5dadd23a6d9559e45da2f9ede1daa78b97ba3ebde6a74db4d8fe3281ed7244f180e7d863022f0350c481d9e7c800d524fcc1d763d5aa33e16d77f SHA512 55fe5ddc2e4d783eb3b930600168c1c106562c84e4532f84dbfe44afb44e9134bb32f0c5cc8dea520cc86d661cf984122d4e82da8d624d03bd6fb42e67ba45ca
+AUX netherearth-0.52-glibc-212.patch 410 BLAKE2B 3aaf59a8ed6c02df5cf5e5037c92d3b51866be06bc28e79980cdddc983c6da5be8f298139a651f625e17011426fed85d86dbff075b1a8980134cf0a3e052ec1e SHA512 fe33f1b9220a8538490316880bfbb671ad65c0a55a896aaa624791a9c094cbded0e5ac182f87750bd58300550a9dbcb10da6453b531c2d58582780a10838ecef
+AUX netherearth-0.52-ldflags.patch 333 BLAKE2B 557e8519d0dafe902a0713d91c539b4ddf7b11d8a05a3ce22a2c5d4c806f6c54e29a77c371991a8dbc5c2afa88f85cc4792e2e5966c606ad95217e997e80f8dc SHA512 39aab126a7110590d8fa77d7f1e1d695a16af43809ac128a01a06f6f583f7a80435d40e1f341c945b3279a17c51348a5c5744954588740106549e292721743a9
+AUX netherearth-0.52-linux.patch 1255 BLAKE2B 5389c41fa27426a89c904605ca058620636ebccbdf6a2c74988f7b777618e4892a9e352bf54d851da739dceba7721807b3113126da9825d3efe8257fabfe65cd SHA512 fd5e4385798a3027bb6fe89b92939e0e9d7f463420cb1d47d1606bd2fabc12d1f755892cb1523062a07eb5d2138156aabfcb801daaff7b5f1fdbba8d079ef56f
+DIST netherearth052.zip 872397 BLAKE2B 091a5f9e6773450e3796daebf0d40e1796ca97682aa8092dd669deb3dcf4161a9f6f408d5e43bcce847375ad61c7cb43a90acf382898a0ddd36b3da55917cbb1 SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5
+DIST sources.zip 75918 BLAKE2B 23142db81e0fca94948cfc6d6443daf1f7909c1dc2334b73897c1e07d1eb39c0c05cedb7cb0b1c8681990a0a0b6632e4666e67128379e14da23fbbe90b9ae641 SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75
+EBUILD netherearth-0.52-r1.ebuild 1959 BLAKE2B 062404ba75e3c292cab09260d201244b6d1c8126f8446f0a5d1471a74308138e553455d765c3f8e26d794eb3e06e1ef3a4c8cf9b510218aba61ea31fbb6b5f59 SHA512 4f92ffd97841c6759002571031eb01b1f9c7732cd0888962faf28d0d470e97fd315eeaf07fedf80d81ce31816ae8dbba9d9cc6d6ac95937a6b258d8948f22b6a
+MISC metadata.xml 530 BLAKE2B a306a4d5741d0e7e1bfca697f04e8aed8337c7658cf910c213eee9541510484019ded391b4d884bda58cbd30a47a913a5eb1ac8b298cb4dfd4ba733fda64818a SHA512 4ec339e99b397a71a0f5b6ffccf7f9cefafdee1ce0627c9c5e5f8b00c0158fd7e73e7d0d9612c8f653ea30113905ad6b4efbec694fcd4c05b3ab59439d558868
diff --git a/games-strategy/netherearth/files/Makefile b/games-strategy/netherearth/files/Makefile
new file mode 100644
index 000000000000..07c671a10e31
--- /dev/null
+++ b/games-strategy/netherearth/files/Makefile
@@ -0,0 +1,20 @@
+# ls *.cpp
+#
+#3dobject-ase.cpp  construction.cpp  maps.cpp         netherdebug.cpp    radar.cpp
+#3dobject.cpp      enemy_ai.cpp      menu.cpp         nethersave.cpp     robot_ai.cpp
+#bitmap.cpp        glprintf.cpp      myglutaux.cpp    particles.cpp      robots.cpp
+#bullet.cpp        main.cpp          nether.cpp       piece3dobject.cpp  shadow3dobject.cpp
+#cmc.cpp           mainmenu.cpp      nethercycle.cpp  quaternion.cpp     vector.cpp
+
+
+SOURCES = 3dobject-ase.cpp 3dobject.cpp cmc.cpp nether.cpp piece3dobject.cpp vector.cpp bitmap.cpp bullet.cpp glprintf.cpp main.cpp mainmenu.cpp maps.cpp menu.cpp myglutaux.cpp nethercycle.cpp netherdebug.cpp nethersave.cpp particles.cpp construction.cpp quaternion.cpp radar.cpp enemy_ai.cpp robot_ai.cpp robots.cpp shadow3dobject.cpp
+OBJECTS = $(SOURCES:.cpp=.o)
+TARGET = nether_earth
+
+.cpp.o:
+	g++ ${CXXFLAGS} -c $< -o $@
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+	g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread
diff --git a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
new file mode 100644
index 000000000000..b61e1f139b04
--- /dev/null
+++ b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
@@ -0,0 +1,18 @@
+--- a/main.cpp
++++ b/main.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <GL/glut.h>
+ #include "SDL/SDL.h"
+ #include "SDL/SDL_mixer.h"
+ 
+@@ -144,6 +145,7 @@
+     bool quit = false;
+ 
+ 	load_configuration();
++	glutInit(&argc, argv);
+ 
+ 	screen_sfc = initialization((fullscreen ? SDL_FULLSCREEN : 0));
+ 	if (screen_sfc==0) return 0;
diff --git a/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch b/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch
new file mode 100644
index 000000000000..25f99be50fab
--- /dev/null
+++ b/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch
@@ -0,0 +1,139 @@
+diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp ./3dobject-ase.cpp
+--- ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp	2002-10-26 00:00:00.000000000 +0300
++++ ./3dobject-ase.cpp	2004-04-16 21:42:55.000000000 +0300
+@@ -34,7 +34,7 @@
+ 	char buffer[256];
+ 	FILE *fp;
+ 
+-	fp=fopen(file,"r+");
++	fp=fopen(file,"r");
+ 	if (fp==NULL) return false;
+ 
+ 	/* Look for the materials: */ 
+diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp ./3dobject.cpp
+--- ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp	2004-01-06 20:49:00.000000000 +0200
++++ ./3dobject.cpp	2004-04-16 21:43:44.000000000 +0300
+@@ -74,7 +74,7 @@
+ 
+ 	int *smooth;
+ 
+-	fp=fopen(file,"r+");
++	fp=fopen(file,"r");
+ 	if (fp==NULL) return false;
+ 
+ 	/* Importar un fichero .ASC de 3DStudio */ 
+diff -ud ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp ./bitmap.cpp
+--- ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp	2004-01-06 20:49:00.000000000 +0200
++++ ./bitmap.cpp	2004-04-16 21:45:13.000000000 +0300
+@@ -14,7 +14,7 @@
+ 	g=0;
+ 	b=0;
+ 
+-	fp=fopen(file,"rb+");
++	fp=fopen(file,"rb");
+ 	if (fp==NULL) return;
+ 
+ 	/* Tag: */ 
+diff -ud ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp ./mainmenu.cpp
+--- ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp	2004-01-06 20:50:00.000000000 +0200
++++ ./mainmenu.cpp	2004-04-16 21:14:14.000000000 +0300
+@@ -6,6 +6,9 @@
+ #include <dirent.h>
+ #endif
+ 
++#include <stdlib.h>
++#include <fcntl.h>
++#include <unistd.h>
+ #include "string.h"
+ #include "stdio.h"
+ #include "math.h"
+@@ -483,8 +486,10 @@
+ {
+ 	int v;
+ 	FILE *fp;
++	char cfg_path[300];
+ 
+-	fp=fopen("nether.cfg","r");
++	sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME"));
++	fp=fopen(cfg_path,"r");
+ 	if (fp==0) return;
+ 
+ 	if (2!=fscanf(fp,"%i %i",&SCREEN_X,&SCREEN_Y)) return;
+@@ -510,8 +515,12 @@
+ void save_configuration(void)
+ {
+ 	FILE *fp;
++	char cfg_path[300];
+ 
+-	fp=fopen("nether.cfg","w");
++	sprintf(cfg_path, "%s/.netherearth", getenv("HOME"));
++	mkdir(cfg_path, 0755);
++	sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME"));
++	fp=fopen(cfg_path,"w");
+ 	if (fp==0) return;
+ 
+ 	fprintf(fp,"%i %i\n",SCREEN_X,SCREEN_Y);
+diff -ud ../NetherEarth_v0.51-linsrc.orig/nether.cpp ./nether.cpp
+--- ../NetherEarth_v0.51-linsrc.orig/nether.cpp	2004-01-06 21:03:00.000000000 +0200
++++ ./nether.cpp	2004-04-16 20:54:54.000000000 +0300
+@@ -1203,7 +1203,7 @@
+ 			if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0);
+ 						       else glColor3f(0.5,0.5,1.0);
+ 			glTranslatef(0,-2,0);
+-			sprintf(filename,"savedgame%i.txt",i);
++			sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i);
+ 			fp=fopen(filename,"r");
+ 			if (fp==0) {
+ 				scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1);
+@@ -1232,7 +1232,7 @@
+ 			if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0);
+ 						       else glColor3f(0.5,0.5,1.0);
+ 			glTranslatef(0,-2,0);
+-			sprintf(filename,"savedgame%i.txt",i);
++			sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i);
+ 			fp=fopen(filename,"r");
+ 			if (fp==0) {
+ 				scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1);
+@@ -1291,7 +1291,7 @@
+ 			case 4:
+ 				{
+ 					char filename[80];
+-					sprintf(filename,"savedgame%i.txt",option_menu-1);
++					sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1);
+ 					save_game(filename);
+ 					//save_debug_report("debugreport.txt");
+ 					game_state=STATE_PAUSE;
+@@ -1326,7 +1326,7 @@
+ 			case 4:
+ 				{
+ 					char filename[80];
+-					sprintf(filename,"savedgame%i.txt",option_menu-1);
++					sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1);
+ 					killmenu(act_menu);
+ 					load_game(filename);
+ 					newmenu(act_menu);
+diff -ud ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp ./nethersave.cpp
+--- ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp	2003-09-17 00:00:00.000000000 +0300
++++ ./nethersave.cpp	2004-04-16 21:23:04.000000000 +0300
+@@ -2,6 +2,10 @@
+ #include "windows.h"
+ #endif
+ 
++#include <stdlib.h>
++#include <sys/types.h>
++#include <fcntl.h>
++#include <unistd.h>
+ #include "string.h"
+ #include "stdio.h"
+ #include "math.h"
+@@ -40,7 +44,10 @@
+ 	ROBOT *r;
+ 	BULLET *bul;
+ 	EXPLOSION *e;
++	char tmp_path[300];
+ 
++	sprintf(tmp_path, "%s/.netherearth", getenv("HOME"));
++	mkdir(tmp_path, 0755);
+ 	fp=fopen(filename,"w");
+ 	if (fp==0) return false;
+ 
diff --git a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch b/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
new file mode 100644
index 000000000000..813f963db4c8
--- /dev/null
+++ b/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/335137
+
+--- sources/mainmenu.cpp
++++ sources/mainmenu.cpp
+@@ -3,6 +3,7 @@
+ #else
+ #include <stddef.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <dirent.h>
+ #endif
+ 
+--- sources/nethersave.cpp
++++ sources/nethersave.cpp
+@@ -1,5 +1,8 @@
+ #ifdef _WIN32
+ #include "windows.h"
++#else
++#include <sys/types.h>
++#include <sys/stat.h>
+ #endif
+ 
+ #include "string.h"
diff --git a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
new file mode 100644
index 000000000000..7d81f912764f
--- /dev/null
+++ b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
@@ -0,0 +1,8 @@
+--- a/Makefile.old	2010-10-12 09:30:19.000000000 +0200
++++ b/Makefile	2010-10-12 09:30:38.000000000 +0200
+@@ -17,4 +17,4 @@
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJECTS)
+-	g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread
++	g++ $(LDFLAGS) $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread
diff --git a/games-strategy/netherearth/files/netherearth-0.52-linux.patch b/games-strategy/netherearth/files/netherearth-0.52-linux.patch
new file mode 100644
index 000000000000..6c4c0d1e9733
--- /dev/null
+++ b/games-strategy/netherearth/files/netherearth-0.52-linux.patch
@@ -0,0 +1,47 @@
+diff -burN sources/glprintf.cpp sources-linux/glprintf.cpp
+--- sources/glprintf.cpp	2002-10-26 00:17:00.000000000 +0200
++++ sources-linux/glprintf.cpp	2005-06-18 18:22:54.000000000 +0200
+@@ -3,6 +3,7 @@
+ #endif
+ #include "GL/gl.h"
+ 
++#include "string.h"
+ #include "stdio.h"
+ #include "stdarg.h"
+ #include "GL/gl.h"
+diff -burN sources/list.h sources-linux/list.h
+--- sources/list.h	2002-10-27 12:17:00.000000000 +0100
++++ sources-linux/list.h	2005-06-18 18:21:34.000000000 +0200
+@@ -1,6 +1,9 @@
+ #ifndef GENERIC_LIST
+ #define GENERIC_LIST
+ 
++
++#include "stdlib.h"
++
+ /* 
+ Funciones para LISTAS: 
+ 
+diff -burN sources/maps.cpp sources-linux/maps.cpp
+--- sources/maps.cpp	2005-05-05 23:42:00.000000000 +0200
++++ sources-linux/maps.cpp	2005-06-18 18:23:05.000000000 +0200
+@@ -3,6 +3,7 @@
+ #endif
+ 
+ #include "stdio.h"
++#include "string.h"
+ 
+ #include "GL/gl.h"
+ #include "GL/glu.h"
+diff -burN sources/myglutaux.cpp sources-linux/myglutaux.cpp
+--- sources/myglutaux.cpp	2002-10-26 00:17:00.000000000 +0200
++++ sources-linux/myglutaux.cpp	2005-06-18 18:23:29.000000000 +0200
+@@ -5,6 +5,8 @@
+ #include <GL/gl.h>
+ #include "GL/glut.h"
+ 
++#include "string.h"
++#include "stdlib.h"
+ #include "stdio.h"
+ #include "math.h"
+ #include "vector.h"
diff --git a/games-strategy/netherearth/metadata.xml b/games-strategy/netherearth/metadata.xml
new file mode 100644
index 000000000000..26fb6b6b6d5b
--- /dev/null
+++ b/games-strategy/netherearth/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Nether Earth was the very first real time strategy game. It worked on a
+		SPECTRUM machine, and only needed 48KB of RAM to work!! It has all the
+		typical elements of strategy games: resources, factories, combat units,
+		etc.
+	</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/netherearth/netherearth-0.52-r1.ebuild b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
new file mode 100644
index 000000000000..e1aa7cabaaac
--- /dev/null
+++ b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+MY_PV="${PV/./}"
+DESCRIPTION="A remake of the SPECTRUM game Nether Earth"
+HOMEPAGE="http://www.braingames.getput.com/nether/"
+SRC_URI="http://www.braingames.getput.com/nether/sources.zip
+	http://www.braingames.getput.com/nether/${PN}${MY_PV}.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror bindist"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.6-r3
+	>=media-libs/sdl-mixer-1.2.5-r1
+	media-libs/freeglut
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+S="${WORKDIR}/sources"
+
+data="../nether earth v${PV}"
+
+src_unpack() {
+	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die
+	unzip -LL "${DISTDIR}/sources.zip" >/dev/null || die
+}
+
+src_prepare() {
+	default
+
+	DATA_DIR=/usr/share/${PN}
+
+	cp "${FILESDIR}/Makefile" . || die
+
+	# Fix compilation errors/warnings
+	eapply "${FILESDIR}"/${P}-linux.patch
+
+	eapply "${FILESDIR}"/${P}-freeglut.patch \
+		"${FILESDIR}"/${P}-glibc-212.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+
+	# Modify dirs and some fopen() permissions
+	eapply "${FILESDIR}/${P}-gentoo-paths.patch"
+	sed -i \
+		-e "s:models:${DATA_DIR}/models:" \
+		-e "s:textures:${DATA_DIR}/textures:" \
+		-e "s:maps/\*:${DATA_DIR}/maps/\*:" \
+		-e "s:\./maps:${DATA_DIR}/maps:" \
+		mainmenu.cpp || die
+	sed -i \
+		-e "s:models:${DATA_DIR}/models:g" \
+		-e "s:textures:${DATA_DIR}/textures:" \
+		-e "s:sound/:${DATA_DIR}/sound/:" \
+		nether.cpp || die
+	sed -i -e "s:maps:${DATA_DIR}/maps:" \
+		main.cpp || die
+	sed -i -e "s:textures/:${DATA_DIR}/textures/:" \
+		myglutaux.cpp || die
+
+	cd "${data}"
+	rm textures/thumbs.db
+}
+
+src_install() {
+	dobin nether_earth
+
+	cd "${data}"
+
+	# Install all game data
+	insinto "${DATA_DIR}"
+	doins -r maps models sound textures
+
+	dodoc readme.txt
+
+	newicon textures/nuclear.bmp ${PN}.bmp
+	make_desktop_entry nether_earth "Nether Earth" /usr/share/pixmaps/${PN}.bmp
+}
diff --git a/games-strategy/netpanzer-0.8.2 b/games-strategy/netpanzer-0.8.2
deleted file mode 100644
index 0b593d761cb4..000000000000
--- a/games-strategy/netpanzer-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs dev-util/ftjam
-DESCRIPTION=Fast-action multiplayer strategic network game
-EAPI=5
-HOMEPAGE=http://www.netpanzer.info/
-IUSE=dedicated
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/netpanzer.berlios/netpanzer-0.8.2.tar.bz2 mirror://sourceforge/netpanzer.berlios/netpanzer-data-0.8.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c0b4a215067047580fc6870b42ba138d
diff --git a/games-strategy/netpanzer/Manifest b/games-strategy/netpanzer/Manifest
new file mode 100644
index 000000000000..98bca346ff28
--- /dev/null
+++ b/games-strategy/netpanzer/Manifest
@@ -0,0 +1,9 @@
+AUX netpanzer-0.8.2-gcc43.patch 2241 BLAKE2B ee3c15946fd3877544e69de53c54eed1ab160154d19a161a061dd98663b1c97f586482dcbecccbe8d13ccddac299386b28efed166899d214fe99fa0b88f2d27d SHA512 aeddced38643a38d0bd86d02d4b4c8acb6a7c74f80d6fd0f9697b325b3bd1bd019a9145bfad91c9e658c8d4e267efb83ccb58424efff9a1c63d2e4c617a31fe2
+AUX netpanzer-0.8.2-gcc47.patch 399 BLAKE2B c62dc1fc9b0945324ae1e6a39cab0fd70c4c8b98afeec9c9af3912c584cce64ae4646dd6a5c2be5e880cc1bafb39e19b0a5fe15c7f7d6cf481fe3714be70cf86 SHA512 d4d62649e33de0f40ae159b07a59e95fa7928ad88d4bfbfc6677d6404c7abd22954e72902ef88d98275ede223c9866dcd361d9dc48969638742f50335e3a562c
+AUX netpanzer-ded 359 BLAKE2B 693ace37fc7011d73425101d21bbc47547872e3377094910addd914dedc09161ac4ea9389d01e65cf2347a30fb7fd7a02e9c802c9e6045ee31275f74e7feb41b SHA512 0d8c410711627664e41853dc31c73cefece2ed51696713969eae7bfbc6eefe9a4f878e95fbd6584db6ba46c8af76c300281939a3d663cc16bebd2c46040700d1
+AUX netpanzer-ded.ini 1261 BLAKE2B a1c333ba3c6ea49d8104c473d4109a64746d984dabc3001f74225da25eaa14654989cc140d4aa003ff7f47cb86c681760a6a6ea12256da983c6f5813bed09c9b SHA512 3d9e8603d717a52b603c1da7b6b734f771b768b8d3f64c27d881af87947b3c816ec07420cd841c728a6a4e9e5d92798e78d910516d8c5fe33d192ac6a6bcabb6
+AUX netpanzer.rc 776 BLAKE2B a5e60db1a8a0a6615a83f06a4eee56478b0ae6faae01033b24cfff9b4565ccf0d4bb8a85ff8e905474c352639852f56cace93ebbf6ce15e79269ec835955def7 SHA512 b82f11ec76e44d2adc7567ee95e564b05d613b96da6fa9218b0a1571f22577259a60748e0b4da486a00e6c65b26fba339ef78a1798d7c9aca89d9edcf4b33055
+DIST netpanzer-0.8.2.tar.bz2 10416147 BLAKE2B d3c704c5244b00c15abfe45256c2bc9d2f84856cf221aa2b969af24dde3bcc7f28df1678fe5833b5caac9384c209cea2e2bfea9b6fb128c76dad75307f125c33 SHA512 7d7f5b485b20b2cefc71061412367edd963e59612767f6b69751915eda3f2939eebedfa29cb77ba0986cf4966b0fc12456b1bb6cfc2bd794c47fbce0b5f6f57a
+DIST netpanzer-data-0.8.tar.bz2 10123751 BLAKE2B 3c0baf7f5df93f7bc907bbcd627cdac9a9844e9ff12297bdd9b82074e26fe45010fe19efab1fd5725d29f1d52a5d0bc2873aa32371461fca5955ae4f53808f81 SHA512 9120d8d3a190069206ed327f1d7d2b2d36f40feefa823956cf6db66e8d0622959449b9385d81b08fdfc59b3b44b7e4d6f6ca2c7362f1a857e1110d61e7c08ce6
+EBUILD netpanzer-0.8.2.ebuild 1639 BLAKE2B ab98fea2164858540ede69dee0832947c5d5f97abb483849edc4f8e450644c52b97e00420304c59ae8d496e2de0a9abf9ec8cb652b9203cfb32aa6a38ee6be83 SHA512 c18068518f7f4db191d13dba3f6798ecd1476c31146947f49fa189f2a2e7d62ad44525951a572a8c7bac4c4846d1cf97366a370ecfd8415924f7aa11b755530e
+MISC metadata.xml 340 BLAKE2B 7bbd91e252ff994e9d7e3607cb47c01e734f724f7c1a469472a7d503db70006e319fcc5553121dc6aeaad71f73afdcc54be8855dac5683e085845605b2c1da2a SHA512 b4d07a9224bcf6390184655df2a7826b3ecae25e21fa707851d389364366cc5f0e317d8ffc3d6f8abed33ebd4a886bbdbfecb11330e25ca1a2eb6e2045153e76
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch
new file mode 100644
index 000000000000..cf73ba4c2252
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch
@@ -0,0 +1,62 @@
+Index: netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/2D/ColorTable.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -17,6 +17,8 @@
+ */
+ #include <config.h>
+ 
++#include <memory>
++
+ #include "Util/FileSystem.hpp"
+ #include "Util/Log.hpp"
+ #include "Util/Exception.hpp"
+Index: netpanzer-0.8.2/src/Lib/2D/Palette.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/2D/Palette.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/2D/Palette.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <config.h>
+ 
+ #include <math.h>
++#include <memory>
+ 
+ #include "Palette.hpp"
+ #include "Util/FileSystem.hpp"
+Index: netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/NetPanzer/Network/ProxyServer.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -17,6 +17,7 @@
+ */
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <string>
+ #include <stdexcept>
+ #include <ctype.h>
+Index: netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2008-02-05 16:36:27.000000000 +0000
++++ netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2008-02-05 16:36:39.000000000 +0000
+@@ -17,6 +17,7 @@
+ */
+ #include <config.h>
+ 
++#include <memory>
+ #include <vector>
+ #include <string>
+ #include "MapSelectionView.hpp"
+Index: netpanzer-0.8.2/src/Lib/Util/Log.cpp
+===================================================================
+--- netpanzer-0.8.2.orig/src/Lib/Util/Log.cpp	2008-02-05 17:13:36.000000000 +0000
++++ netpanzer-0.8.2/src/Lib/Util/Log.cpp	2008-02-05 17:13:43.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <vector>
+ #include <exception>
+ #include <iomanip>
++#include <algorithm>
+ 
+ #include "Exception.hpp"
+ #include "FileSystem.hpp"
+
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc47.patch b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc47.patch
new file mode 100644
index 000000000000..432f40a9f9aa
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc47.patch
@@ -0,0 +1,11 @@
+--- src/Lib/ArrayUtil/QueueTemplate.hpp.old	2012-10-16 13:57:33.000000000 +0200
++++ src/Lib/ArrayUtil/QueueTemplate.hpp	2012-10-16 13:58:16.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+     bool enqueue(const TYPE& object )
+     {
+-        add( object, (rear + 1) % this->size );
++        this->add( object, (rear + 1) % this->size );
+         rear = (rear + 1) % this->size;
+ 
+         if ( front == rear )
diff --git a/games-strategy/netpanzer/files/netpanzer-ded b/games-strategy/netpanzer/files/netpanzer-ded
new file mode 100644
index 000000000000..d6dd85193641
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer-ded
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+running=yes
+while [[ $running = yes ]] ; do
+    /usr/games/bin/netpanzer --game_config=/etc/netpanzer-ded.ini -d $@
+    if [[ $? -ge 128 ]] ; then
+        echo "`date`: Restarting server after crash"
+        # wait a bit to not blow cpu and logfiles on constant crashs
+        sleep 30
+    else
+        #normal exit
+        running=no
+    fi
+done
+
diff --git a/games-strategy/netpanzer/files/netpanzer-ded.ini b/games-strategy/netpanzer/files/netpanzer-ded.ini
new file mode 100644
index 000000000000..903fb3b493b3
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer-ded.ini
@@ -0,0 +1,80 @@
+[game]
+
+[interface]
+attacknotificationtime=5
+consoletextdelay=3
+consoletextusage=25
+drawunitdamage=yes
+drawunitflags=yes
+drawunitreload=no
+gameinfoposition_x=0
+gameinfoposition_y=0
+minimapdrawtype=0
+minimapposition_x=0
+minimapposition_y=0
+minimapsize_x=194
+minimapsize_y=194
+playerflag=26
+rankposition_x=0
+rankposition_y=0
+scrollrate=1000
+toolbarposition_x=0
+toolbarposition_y=0
+unitcolor=0
+unitinfodrawlayer=0
+unitselectionmode=1
+vehicleselectioncolor=1
+viewdrawbackgroundmode=0
+
+[player]
+masterservers=81.169.185.36,81.173.119.122
+name=Gentoo NetPanzer Server
+proxyserver=
+proxyserverpass=
+proxyserveruser=
+
+[radar]
+alliedoutpostcolor=11
+alliedunitcolor=11
+displayclouds=no
+enemyoutpostcolor=4
+objectivedrawmode=1
+playeroutpostcolor=1
+playerunitcolor=0
+resizerate=400
+unitsize=0
+
+[server]
+allowallies=yes
+bindaddress=
+cloudcoverage=0
+fraglimit=500
+gametype=0
+logging=yes
+mapcycle=Cramped, Tight Quarters, Two Villages, Cramped
+maxplayers=8
+maxunits=160
+objectivepercentage=75
+powerups=yes
+public=yes
+respawntype=1
+serverport=3030
+timelimit=50
+windspeed=30
+
+[sound]
+effects=yes
+effectsvolume=100
+enable=yes
+music=yes
+musicvolume=80
+
+[visuals]
+blendsmoke=yes
+displayshadows=yes
+fullscreen=yes
+gamma=50
+hardwareDoubleBuffer=yes
+hardwareSurface=yes
+resolution=0
+
diff --git a/games-strategy/netpanzer/files/netpanzer.rc b/games-strategy/netpanzer/files/netpanzer.rc
new file mode 100644
index 000000000000..b1d29df5be33
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer.rc
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting netpanzer dedicated server"
+	screen -A -m -d -S netpanzer-ded su - GAMES_USER_DED -c "GENTOO_DIR/netpanzer-ded"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping netpanzer dedicated server"
+	local pid=`screen -list | grep netpanzer-ded | awk -F . '{print $1}' | sed -e s/.//`
+	if [[ -z "${pid}" ]] ; then
+		eend 1 "Lost screen session"
+	else
+		pid=`pstree -p ${pid} | sed -e 's:^.*netpanzer-ded(\([0-9]*\)).*:\1:'`
+		if [[ -z "${pid}" ]] ; then
+			eend 1 "Lost netpanzer-ded session"
+		else
+			kill ${pid}
+			eend $? "Could not kill netpanzer-ded"
+		fi
+	fi
+}
+
+status() {
+	screen -list | grep netpanzer-ded
+}
diff --git a/games-strategy/netpanzer/metadata.xml b/games-strategy/netpanzer/metadata.xml
new file mode 100644
index 000000000000..6bb77c4ca82c
--- /dev/null
+++ b/games-strategy/netpanzer/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">netpanzer.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild b/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
new file mode 100644
index 000000000000..9a70ba26b16f
--- /dev/null
+++ b/games-strategy/netpanzer/netpanzer-0.8.2.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 games
+
+DATAVERSION="0.8"
+DESCRIPTION="Fast-action multiplayer strategic network game"
+HOMEPAGE="http://www.netpanzer.info/"
+SRC_URI="mirror://sourceforge/netpanzer.berlios/${P}.tar.bz2
+	mirror://sourceforge/netpanzer.berlios/${PN}-data-${DATAVERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="dedicated"
+
+RDEPEND="dedicated? ( app-misc/screen )
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer
+	media-libs/sdl-image
+	dev-games/physfs"
+DEPEND="${RDEPEND}
+	dev-util/ftjam"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	egamesconf
+	cd "${WORKDIR}"/${PN}-data-${DATAVERSION} \
+		&& egamesconf
+}
+
+src_compile() {
+	AR="${AR} cru" jam -q || die
+
+	cd "${WORKDIR}"/${PN}-data-${DATAVERSION}
+	jam -q || die
+}
+
+src_install() {
+	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die
+
+	cd "${WORKDIR}"/${PN}-data-${DATAVERSION}
+	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die
+
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.rc ${PN}
+		sed -i \
+			-e "s:GAMES_USER_DED:${GAMES_USER_DED}:" \
+			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
+			"${D}"/etc/init.d/${PN} || die
+
+		insinto /etc
+		doins "${FILESDIR}"/${PN}-ded.ini
+		dogamesbin "${FILESDIR}"/${PN}-ded
+		sed -i \
+			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
+			"${D}/${GAMES_BINDIR}"/${PN}-ded || die
+	fi
+
+	rm -rf "${D}/${GAMES_DATADIR}"/{applications,pixmaps}
+	doicon "${S}"/${PN}.png
+	make_desktop_entry ${PN} NetPanzer
+	prepgamesdirs
+}
diff --git a/games-strategy/openra-20141029-r2 b/games-strategy/openra-20141029-r2
deleted file mode 100644
index 5c629d8b6098..000000000000
--- a/games-strategy/openra-20141029-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl >=sys-apps/sed-4
-DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
-EAPI=5
-HOMEPAGE=http://open-ra.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl games-misc/games-envd
-SLOT=0
-SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20141029 -> openra-20141029.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03c213a841dec897b386ac7037cde118
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
new file mode 100644
index 000000000000..7634c50e0840
--- /dev/null
+++ b/games-strategy/openra/Manifest
@@ -0,0 +1,4 @@
+AUX README.gentoo 4754 BLAKE2B 08fc1df7aa3f14a44c2642b606a351be4b117d2a133f04c680159b17998ccb056fb285910804c321a212fcab162e739a0c914e41203dc37b1682386754ec016f SHA512 423c2682c3a9e69ccb078399ffec2ed2cb4bf1445c86db730756457e65f90d6f56c80e09b4f5e0b0eb0501a2a692d7d2add3847f77794aaf7555574a76c75392
+DIST openra-20141029.tar.gz 15340674 BLAKE2B bcb18118b1c04da6d2c7c9db2fc10e69a35623994c0c2915ce1c3b410889b72a8761ab6235a876c774470dc8ca03c823f09a6d195416dacd7f55ea6ea5353f06 SHA512 44594ec3c3a590ae29b0291fdf2292c72ba920dff7892cc269e729a161505c4bc0c5c682bf3c6d3cabb0cdebfa3cac5975eeeeec3f5a673e948ed28132c4a313
+EBUILD openra-20141029-r2.ebuild 2001 BLAKE2B dcf47ec78d0898fd0e7e69b63dcfa4aec12cc16b67e7c460c08e248726ba9c8013868d6a895b6c7bfc04650daa8016ebd71289cbe94bc496feb30f5d3c320874 SHA512 01a42450a6edb1b6a7b74264a0bbdf23d98af852697fb99a74af81e89598ed2705ceb1408108400a4a925b113f717a3d6eed781a8a680d6ecf1b084db27c7570
+MISC metadata.xml 508 BLAKE2B b34a0d75f760668ced55f5268e2f75e7980dcccac6bbe26a6822f4434327888c8e242a1ea2f5bd3c70493a9b1a4e5b5905a36ceb615bf99544ac9c27c12457a7 SHA512 a001c0493ffb22d88e5c6769afcbd6f21193ec3f200d92181baaa280ce56ce5e9062c1685497549a7682b5c423525a65117af298df3d2218c80fcc3d7c34bf4a
diff --git a/games-strategy/openra/files/README.gentoo b/games-strategy/openra/files/README.gentoo
new file mode 100644
index 000000000000..33502af0f9d2
--- /dev/null
+++ b/games-strategy/openra/files/README.gentoo
@@ -0,0 +1,111 @@
+OpenRA is a Libre/Free Real Time Strategy game engine supporting early
+Westwood games like Command & Conquer and Command & Conquer: Red Alert.
+
+Distributed mods include a reimagining and updating of both the Red
+Alert and Command & Conquer multiplayer games.
+
+You may run the game from desktop games menu or just manually
+run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
+or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer.
+
+If you have problems starting the game consider switching to
+alternative Cg Renderer. You may run the game with alternative
+Cg Graphics Renderer from desktop games menu or by adding
+`Graphics.Renderer=Cg` parameter explicitly to above console commands
+ (convenient for some integrated graphics cards).
+To run explicitly with a default one use `Graphics.Renderer=Gl`
+parameter. The default Graphics Renderer is a better one, so
+don't forget to upgrade your graphics hardware drivers to the
+latest version. For Cg renderer also try to upgrade nvidia-cg-toolkit
+too. 
+
+The RA packages will need to be extracted to ~/.openra/Content/ra/
+before the RA mod will actually work. The C&C packages will need
+to be extracted to ~/.openra/Contet/cnc/ for C&C mod. You may 
+execute OpenRA and it will suggest to download content from original
+CD or a minimal one from OpenRA site automatically. You may also try
+to download minimal content pack from OpenRA site manually by using
+OpenRA Utility:
+
+cd /usr/share/games/openra
+mono OpenRA.Utility.exe --download-url=http://open-ra.org/get-dependency.php?file=ra-packages,/tmp/ra-packages.zip
+mono OpenRA.Utility.exe --extract-zip=/tmp/ra-packages.zip,~/.openra/Content/ra/
+
+The same commands for C&C mod:
+mono OpenRA.Utility.exe --download-url=http://open-ra.org/get-dependency.php?file=cnc-packages,/tmp/cnc-packages.zip
+mono OpenRA.Utility.exe --extract-zip=/tmp/cnc-packages.zip,~/.openra/Content/cnc/
+
+But the better choice is to download a full pack from original game CD
+(or iso). However, full CD pack usage result in slower game start from
+OpenRA Lobby. It happens due to a lot of unnecessary things like video
+clips were pre-packaged in it. If you want optimal game start and all
+music themes (made by Frank Klepacki) from classic CD you should
+download them from OpenRA Forum:
+http://www.sleipnirstuff.com/forum/viewtopic.php?f=83&t=15063
+
+The minimal required files for the Red Alert mod are:
+EITHER:
+ * conquer.mix
+ * temperat.mix
+ * interior.mix
+ * snow.mix
+ * sounds.mix
+ * allies.mix
+ * russian.mix
+OR: (Usually pretty long game start)
+ * main.mix
+AND:
+ * redalert.mix
+
+The minimal required files for the Command and Conquer mod are:
+ * cclocal.mix
+ * speech.mix
+ * conquer.mix
+ * sounds.mix
+ * tempicnh.mix
+ * temperat.mix
+ * winter.mix
+ * desert.mix
+
+If you have a case-sensitive filesystem you must change the filenames to
+lower case.
+
+Red Alert and C&C have been released by EA Games as freeware. They could be
+downloaded from http://www.commandandconquer.com/classic
+Unfortunately the installer is 16-bit and so won’t run on 64-bit operating
+systems. This can be worked around by using the Red Alert Setup Manager
+ (http://ra.afraid.org/html/downloads/utilities-3.html).
+Make sure you apply the no-CD protection fix so all the files needed
+are installed to the hard drive.
+
+If your notebook doesn't show long battery life under OpenRA load you can
+do several things:
+1. Turn off "Show Shellmap" item under General tab of Settings menu.
+2. Edit ~/.openra/settings.yaml in the "Graphics:" section to add
+framelimiter. Add "CapFramerate: True" string there to enable framelimiter.
+The default setting is 60 frames per second. You can change it's value by
+adding "MaxFramerate: 70", for example, string in that section. Be careful
+with special tab symbols at the beginning of the strings. Don't forget to
+backup your settings file.
+
+Please note: OpenRA has 2 types of released versions:
+1. Release Versions or just Versions.
+2. Unstable Playtests Versions or just Playtests.
+Release Versions are considered as more stable ones. Playtests are also
+pretty stable in most cases but they have usually more features wich are
+needed to be tested before inclusion into release. So, if you have any
+problems, please report them to the IRC channel #openra on irc.freenode.net
+(Use http://webchat.freenode.net/ if you don't have IRC client)
+or to the bug-tracker (http://bugs.open-ra.org).
+
+You may also see servers list with
+http://master.open-ra.org/list.php
+or by using orabot on IRC channel:
+]games (or !games)
+to see the games wich are waiting to start or
+]games --all
+to see all games.
+
+Please read HACKING for an overview of the engine and read OpenRA Wiki
+page for more info about the game and it's development:
+https://github.com/OpenRA/OpenRA/wiki
diff --git a/games-strategy/openra/metadata.xml b/games-strategy/openra/metadata.xml
new file mode 100644
index 000000000000..a4988625f33d
--- /dev/null
+++ b/games-strategy/openra/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://openra.res0l.net/news/</changelog>
+		<doc lang="en">https://github.com/OpenRA/OpenRA/wiki</doc>
+		<bugs-to>https://github.com/OpenRA/OpenRA/issues</bugs-to>
+		<remote-id type="github">OpenRA/OpenRA</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/openra/openra-20141029-r2.ebuild b/games-strategy/openra/openra-20141029-r2.ebuild
new file mode 100644
index 000000000000..9c2afbc5770c
--- /dev/null
+++ b/games-strategy/openra/openra-20141029-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils mono-env gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg:0
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_configure() { :; }
+
+src_prepare() {
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_compile() {
+	emake all
+	emake native-dependencies
+	emake docs
+}
+
+src_install() {
+	emake \
+		datadir="/usr/share" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)" \
+		DESTDIR="${D}" \
+		install-all install-linux-scripts
+
+	exeinto "$(games_get_libdir)/openra"
+	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
+		DOCUMENTATION.md Lua-API.md
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	elog "optional dependencies:"
+	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/outerspace-0.5.68-r1 b/games-strategy/outerspace-0.5.68-r1
deleted file mode 100644
index 0aa4d863ea04..000000000000
--- a/games-strategy/outerspace-0.5.68-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=sys-apps/sed-4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=On-line strategy game taking place in the dangerous universe
-EAPI=6
-HOMEPAGE=https://www.ospace.net/ https://sourceforge.net/projects/ospace/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/pygame-1.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/ospace/Client/0.5.68/Outer%20Space-0.5.68.tar.gz -> outerspace-0.5.68.tar.gz mirror://sourceforge/ospace/Client/0.5.68/outerspace_0.5.68-0ubuntu1_all.deb
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9aebb47150fe67f59995e43c1582bcf3
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
new file mode 100644
index 000000000000..feafc91522f6
--- /dev/null
+++ b/games-strategy/outerspace/Manifest
@@ -0,0 +1,6 @@
+AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7a23fbfcc20dbe6e8c8e2427a4e561960b338def2bd0c28f37f5fdcfcbfc1983b740f3f2a1f3 SHA512 fd20d9de084fef162eec391d68dc973df566b62fd2254fe8ad92c91b073341ca17f96844e0cae28592a7a4d05cc6e3744d66cd37dce9b70319678b91db8d8a1b
+AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
+DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
+DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
+EBUILD outerspace-0.5.68-r1.ebuild 1607 BLAKE2B 0f40261cf16d047c90c3bc49591b5e510c282eb2267e591ad027f80a537f33bc1f579bac8c2f179a230b7d9d2bcecdb31ccc9873f0c40b705b21d988a3a78666 SHA512 778a9c0879b0c03ff527f6918f0e8bf8ebaec479aa02d5a43fe791e6c73d8daa912dc37cd19f35d2e36191b7fb2f5155fcdbc03a432dd5b8969d92f177247ae7
+MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e
diff --git a/games-strategy/outerspace/files/outerspace b/games-strategy/outerspace/files/outerspace
new file mode 100644
index 000000000000..2a6bbe26dafb
--- /dev/null
+++ b/games-strategy/outerspace/files/outerspace
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+mkdir -p ~/.outerspace
+cd ~/.outerspace || exit 1
+
+ln -sf "@GENTOO_LIBDIR@"/{osc.py,lib,libsrvr} .
+ln -sf "@GENTOO_DATADIR@"/res .
+
+exec python osc.py "$@"
diff --git a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
new file mode 100644
index 000000000000..c95852dca3dc
--- /dev/null
+++ b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
@@ -0,0 +1,83 @@
+--- a/setup.py
++++ b/setup.py
+@@ -42,12 +42,7 @@
+ 
+ # collect data files
+ data_files = []
+-data_files.append(
+-    (
+-        ".",
+-        ["../ChangeLog.txt", "../COPYING", "../README", "../README_CZ"]
+-    )
+-)
++
+ 
+ # resources
+ for root, dirs, files in os.walk('res'):
+@@ -57,16 +52,6 @@
+         pass
+     if files:
+         data_files.append((root, [os.path.join(root, file) for file in files]))
+-
+-data_files.append(
+-    (
+-        "res/techspec",
+-        [
+-            "../server/lib/ige/ospace/Rules/techs.spf",
+-            "../server/lib/ige/ospace/Rules/Tech.spf",
+-        ]
+-    )
+-)
+ 
+ if havePy2Exe:
+     data_files.append((".", ["../updater/update.exe"]))
+@@ -114,10 +99,3 @@
+     **extraArgs
+ )
+ 
+-# cleanup
+-def onerror(func, path, err):
+-    if func is os.remove:
+-        os.chmod(path, stat.S_IWRITE)
+-        os.remove(path)
+-
+-shutil.rmtree("libsrvr", onerror = onerror)
+--- a/osc.py
++++ b/osc.py
+@@ -23,12 +23,36 @@
+ # tweak PYTHONPATH
+ import sys
+ import os
++import errno
+ sys.path.insert(0, "lib")
+ 
+ for item in ("libsrvr", "../server/lib"):
+     if os.path.exists(item):
+         sys.path.insert(0, item)
+         break
++
++userdir=os.path.expanduser("~/.outerspace")
++resdir=os.path.join(userdir, "res")
++rootresdir="@GENTOO_DATADIR@/res"
++
++if not (os.path.isdir(userdir)):
++	try:
++		os.makedirs(userdir)
++	except:
++		sys.exit("unable to create %s" % userdir)
++
++try:
++	os.symlink(rootresdir, resdir)
++except OSError, e:
++	if e.errno == errno.EEXIST:
++		os.remove(resdir)
++		os.symlink(rootresdir, resdir)
++
++try:
++	os.chdir(userdir)
++except:
++	sys.exit("unable to cd into %s" % userdir)
++
+ 
+ #configure gc
+ #import gc
diff --git a/games-strategy/outerspace/metadata.xml b/games-strategy/outerspace/metadata.xml
new file mode 100644
index 000000000000..8868ccd042b9
--- /dev/null
+++ b/games-strategy/outerspace/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">
+Outer Space is an on-line strategy game which takes place in the dangerous
+universe. You will become powerful commander of many stars, planets, and great
+fleets and will struggle for survival with other commanders.
+
+Outer Space communicates with the server in the same way as your browser, but
+you will need a special client to play it. Using this client you can create an
+account on the server and you can start to explore the world of the Outer Space.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ospace</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
new file mode 100644
index 000000000000..a7d5680c16a5
--- /dev/null
+++ b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop gnome2-utils distutils-r1
+
+MY_PN="${PN/outerspace/Outer Space}"
+DESCRIPTION="On-line strategy game taking place in the dangerous universe"
+HOMEPAGE="https://www.ospace.net/ https://sourceforge.net/projects/ospace/"
+SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz -> ${P}.tar.gz
+	mirror://sourceforge/ospace/Client/${PV}/outerspace_${PV}-0ubuntu1_all.deb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygame-1.7"
+DEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	default
+	unpack ./data.tar.gz
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-scripts="/usr/bin" \
+		--install-data="/usr/share/${PN}" \
+		--install-lib="$(python_get_sitedir)"
+
+	# source tarball is missing files
+	# get them from ubuntu.deb
+	insinto "$(python_get_sitedir)"/ige/ospace/Rules
+	doins "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
+}
+
+src_prepare() {
+	default
+
+	# fix setup script
+	# rework python start script to avoid shell-wrapper script
+	eapply "${FILESDIR}"/${P}-setup.patch
+
+	sed -i\
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		osc.py || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	newicon res/logo-login.png ${PN}.png
+	make_desktop_entry "osc.py" "${MY_PN}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/s25rttr-0.8.1-r3 b/games-strategy/s25rttr-0.8.1-r3
deleted file mode 100644
index 4b95314b6c53..000000000000
--- a/games-strategy/s25rttr-0.8.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-arch/bzip2 media-libs/libsamplerate media-libs/libsdl[X,sound,opengl,video] media-libs/libsndfile media-libs/sdl-mixer[vorbis] net-libs/miniupnpc virtual/libiconv virtual/opengl sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Open Source remake of The Settlers II game (needs original game files)
-EAPI=6
-HOMEPAGE=https://www.siedler25.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 media-libs/libsamplerate media-libs/libsdl[X,sound,opengl,video] media-libs/libsndfile media-libs/sdl-mixer[vorbis] net-libs/miniupnpc virtual/libiconv virtual/opengl
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/s25rttr-0.8.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c42e2282e17fb238b7e9d592c2f59611
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
new file mode 100644
index 000000000000..56eb1652559e
--- /dev/null
+++ b/games-strategy/s25rttr/Manifest
@@ -0,0 +1,10 @@
+AUX s25rttr-0.8.1-cmake-3.patch 851 BLAKE2B 212aacf9ab7d37f41b0f1ade26fac67f015c62c02058874910af7d8e0123bd39a1f1301e0296ec906ce55f38e006bbdba6f30d9b98f35439639ea778f8272c22 SHA512 46f012e386854fbb7f21bbee98855849303501bf946b74a93c87ec9745cf5ec50b903ea3d35ecf9e84c1e4161c1876d43507c97d6bd9af8b5af2f6c9f4cb2805
+AUX s25rttr-0.8.1-cmake.patch 5706 BLAKE2B 5b9d796e1e6815336eb9a9006e321a66e6c733ebd514b5ff92ae542e6078a9dc2366dc7e01cc310ea758c903dceebb545a860fa09fe462fd5fa00bf2202c3647 SHA512 0a53ea20225d616686aff2ef2d98ae5dc5394e28db9be554102332705de5418cd5dd895075923924c7ada0e8bbcc2b9825203e531b3fffa531dc4232d9463fa3
+AUX s25rttr-0.8.1-format.patch 698 BLAKE2B f4ad85af1c05e4a6ace8da4a62e75673a773698170a430a716aef0219d08badfef01fb3b9d71b225549e541a3f7dc9be754c18f349c522c046f4ec8b83125385 SHA512 f0ba023f3d6fff3970cfcfc132c44e4dcff41ed91faee74b5ad513bce3bd625d6528511114fad70f6d3f5cdfc6e471ecef07a607be6a082ca7f3a0b71477d8cc
+AUX s25rttr-0.8.1-fpic.patch 1508 BLAKE2B f53042695c3fa65fb2ced0afb8307fd9e56d12d2b6ad0bef2c309720177d3466eb61a7bd0ed89c9f4c6ff3ff45faf9fab5e7e4b7d26f4a6dbb957f030805df31 SHA512 23c2f54864205c55bb7f18cb9b6e949640451b4b4de86b2c30a8721fd724c8ba00fd667bc8c07ea31ba8edfb92630afec08e1f52ab861d08887cf639f8cde7a9
+AUX s25rttr-0.8.1-gcc6.patch 1504 BLAKE2B 6cbb0fcd59ebedbb0e9faf49bc192944b70ceee9a0abdc3b5256717672da190a6337ed2ad4d52d28aedc1b0e29704c9fe36b6a67aafe9aceb28bd350895efb12 SHA512 3a10ee4c6329c1dcc514e2b4d5edec41b56ac72c08955b24eeced94d1c9757703fe0732d833718dd99a4e5d70857a8e84347d8036c683b9b82d37916bd2cf951
+AUX s25rttr-0.8.1-miniupnpc-api-14.patch 1385 BLAKE2B a5fe9c6937dfe154685ac1e0debab0b5ef3e6c3e27a792f947e1c5a93f772f2d9829602c87db76d9a421d723e652c01f3e015643801d0c136002164f366a5fca SHA512 163a83ac734ff2accca133c20c0e15f7f21140e41661add4229f2a878baebebf09eb82420b2d0b0a7a77042be35608bd00c30006265395e842ae28d64b8986f6
+AUX s25rttr-0.8.1-soundconverter.patch 767 BLAKE2B 7a3772caa5624ee18a73cff0fb41531798022ef845feb4e1bb7bae560207efe82fb084fec7c0d9dfdde02c293db6fe3c2ea9290a5a6fd59cc59fee37a32693b7 SHA512 e62de5e040e89d53b73a0b7202eab0b32382656978e6c4471b1f3b996c9c679c9de13a8db671d719a79b985b062be3e67e75dacd4d9b5efb58e63c30bde1c10c
+DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
+EBUILD s25rttr-0.8.1-r3.ebuild 2561 BLAKE2B f13028cb9ecc8411759492da43b3203c22ef701d81c7f84641c79f1ea1a727ff68f66b4cf8fee5c5fba1b28439fcb14ee6588d7e973f030f7cddea78181080bb SHA512 d08a0c4eccab8a1cd85efca0f794ff36b340b8326e103df69fbed55a48a530a8315e73635d0b8bc3647df2c3b5c346a7371633e3073919992259f9c295d02f1f
+MISC metadata.xml 463 BLAKE2B 33a0cc242b253cb1a3446cc2705cfb32bf0cd125c990bf0b8d527c3c9de546c390dd8fbad984c2a2a6264a25e0f889b63e86287024aa666dfdac94a5aacc3664 SHA512 dd5ea72d1f7ceda9bb2f033c8482e2978924ebee1a61e00fb515b0b0e846553bb1a4024aa739ae1f51608dcb90d0138d6679df1133a8140bfa2bfdb48163c885
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
new file mode 100644
index 000000000000..b7e9e424eb08
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fcbfb02..ae1c5f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,12 +2,12 @@
+ ### $Id: CMakeLists.txt 8341 2012-09-30 12:09:04Z FloSoft $
+ ################################################################################
+ 
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+-CMAKE_POLICY(SET CMP0003 OLD)
+-
+-IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
+-	CMAKE_POLICY(SET CMP0015 OLD)
+-ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
++CMAKE_POLICY(SET CMP0003 NEW)
++CMAKE_POLICY(SET CMP0015 NEW)
++IF(NOT CMAKE_VERSION VERSION_LESS 3.1)
++	CMAKE_POLICY(SET CMP0053 NEW)
++ENDIF()
+ 
+ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+ 
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
new file mode 100644
index 000000000000..14f2edb52df5
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
@@ -0,0 +1,160 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Oct  5 13:33:05 UTC 2012
+
+make build system gentoo-compatible
+provide options for SDL and GLFW video drivers
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,12 +19,19 @@
+ 
+ ################################################################################
+ 
+-INCLUDE(cmake/crosscompile.cmake)
+-
+ PROJECT(s25client)
+ 
+ ################################################################################
+ 
++# options
++OPTION(BUILD_GLFW_DRIVER "Build the GLFW video driver" 0)
++OPTION(BUILD_SDL_DRIVER "Build the sdl video driver" 1)
++IF (UNIX)
++	IF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
++		MESSAGE(FATAL_ERROR "No video driver selected! Either use SDL or GLFW.")
++	ENDIF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
++ENDIF (UNIX)
++
+ SET(PREFIX ${PREFIX} CACHE STRING "Path prefix")
+ SET(BINDIR ${BINDIR} CACHE STRING "Directory for the binaries")
+ SET(DATADIR ${DATADIR} CACHE STRING "Data directory")
+@@ -106,38 +113,6 @@
+ 			   build_paths.h)
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build_version.h.cmake"
+ 			   build_version.h)
+-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/preinstall.sh.cmake"
+-			   preinstall.sh @ONLY)
+-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/postinstall.sh.cmake"
+-			   postinstall.sh @ONLY)
+-
+-################################################################################
+-
+-ADD_SUBDIRECTORY(version)
+-
+-ADD_CUSTOM_TARGET(updateversion ALL
+-				  COMMAND "${CMAKE_BINARY_DIR}/version/src/version" "${CMAKE_SOURCE_DIR}"
+-				  DEPENDS version
+-				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+-)
+-
+-ADD_CUSTOM_TARGET(mrproper
+-				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build/cleanup.sh"
+-				  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+-)
+-
+-ADD_CUSTOM_TARGET(create_nightly
+-				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "nightly" "${CMAKE_SOURCE_DIR}"
+-				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+-)
+-
+-ADD_CUSTOM_TARGET(create_stable
+-				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "stable" "${CMAKE_SOURCE_DIR}"
+-				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+-)
+-
+-# preinstall script
+-INSTALL(SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/preinstall.cmake")
+ 
+ ################################################################################
+ 
+@@ -148,7 +123,6 @@
+ ADD_SUBDIRECTORY(libutil)
+ ADD_SUBDIRECTORY(liblobby)
+ ADD_SUBDIRECTORY(s-c)
+-ADD_SUBDIRECTORY(s25update)
+ ADD_SUBDIRECTORY(src)
+ 
+ ################################################################################
+@@ -157,7 +131,6 @@
+ INSTALL(CODE "INCLUDE(driver/cmake_install.cmake)")
+ INSTALL(CODE "INCLUDE(libsiedler2/cmake_install.cmake)")
+ INSTALL(CODE "INCLUDE(s-c/cmake_install.cmake)")
+-INSTALL(CODE "INCLUDE(s25update/cmake_install.cmake)")
+ INSTALL(CODE "INCLUDE(src/cmake_install.cmake)")
+ 
+ # and then dont let him install anything
+--- a/driver/video/CMakeLists.txt
++++ b/driver/video/CMakeLists.txt
+@@ -3,7 +3,11 @@
+ #################################################################################
+ 
+ ADD_SUBDIRECTORY( WinAPI )
+-ADD_SUBDIRECTORY( GLFW )
+-ADD_SUBDIRECTORY( SDL )
++IF(BUILD_GLFW_DRIVER)
++	ADD_SUBDIRECTORY( GLFW )
++ENDIF(BUILD_GLFW_DRIVER)
++IF(BUILD_SDL_DRIVER)
++	ADD_SUBDIRECTORY( SDL )
++ENDIF(BUILD_SDL_DRIVER)
+ 
+ #################################################################################
+--- a/driver/video/SDL/src/CMakeLists.txt
++++ b/driver/video/SDL/src/CMakeLists.txt
+@@ -30,9 +30,9 @@
+ 	ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
+ 	
+ 	INSTALL(TARGETS videoSDL 
+-		RUNTIME DESTINATION ${LIBDIR}/driver/video 
+-		LIBRARY DESTINATION ${LIBDIR}/driver/video
+-		ARCHIVE DESTINATION ${LIBDIR}/driver/video
++		RUNTIME DESTINATION ${LIBDIR} 
++		LIBRARY DESTINATION ${LIBDIR}
++		ARCHIVE DESTINATION ${LIBDIR}
+ 	)
+ ELSE (SDL_FOUND)
+ 	MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver")
+--- a/driver/video/GLFW/src/CMakeLists.txt
++++ b/driver/video/GLFW/src/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ ### $Id$
+ #################################################################################
+ 
+-IF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
++IF ("${COMPILEFOR}" STREQUAL "linux" )
+ 	FIND_LIBRARY(GLFW_LIBRARY glfw) 
+ 	
+ 	IF (GLFW_LIBRARY)
+@@ -21,6 +21,6 @@
+ 	ELSE (GLFW_LIBRARY)
+ 		MESSAGE(WARNING ": GLFW library not found: Not building GLFW videodriver")
+ 	ENDIF (GLFW_LIBRARY)
+-ENDIF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
++ENDIF ("${COMPILEFOR}" STREQUAL "linux" )
+ 
+ #################################################################################
+--- a/driver/audio/SDL/src/CMakeLists.txt
++++ b/driver/audio/SDL/src/CMakeLists.txt
+@@ -34,9 +34,9 @@
+         ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
+ 
+         INSTALL(TARGETS audioSDL 
+-            RUNTIME DESTINATION ${LIBDIR}/driver/audio 
+-            LIBRARY DESTINATION ${LIBDIR}/driver/audio
+-            ARCHIVE DESTINATION ${LIBDIR}/driver/audio
++            RUNTIME DESTINATION ${LIBDIR} 
++            LIBRARY DESTINATION ${LIBDIR}
++            ARCHIVE DESTINATION ${LIBDIR}
+         )
+     ELSE (SDLMIXER_FOUND)
+         MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver")
+--- a/build_paths.h.cmake
++++ b/build_paths.h.cmake
+@@ -41,6 +41,7 @@
+ 
+ //	set game directory (normal $(datadir)/s25rttr/S2)
+ //#define GAMEDIR DATADIR"/S2"
++#cmakedefine GAMEDIR "${GAMEDIR}"
+ 
+ //	set driver directory (normal $(libdir)/driver)
+ //#define DRIVERDIR LIBDIR"/driver"
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
new file mode 100644
index 000000000000..3d50543b9c0e
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
@@ -0,0 +1,11 @@
+--- a/src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
++++ b/src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
+@@ -1349,7 +1349,7 @@
+ 			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
+ 			break;
+ 		default:
+-			snprintf(text, sizeof(text), _("Team victory!"));
++			snprintf(text, sizeof(text), "%s", _("Team victory!"));
+ 			break;
+ 	}
+ 	messenger.AddMessage("", 0, CD_SYSTEM, text, COLOR_ORANGE);
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
new file mode 100644
index 000000000000..4a1d11ef1704
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
@@ -0,0 +1,38 @@
+From 2b4f956263864cebb1b9c5ce120c7cd30f512bdb Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Sat, 18 Jul 2015 19:03:05 +0300
+Subject: [PATCH] Fixed build of sdl drivers
+
+---
+ driver/audio/SDL/src/CMakeLists.txt | 1 +
+ driver/video/SDL/src/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/driver/audio/SDL/src/CMakeLists.txt b/driver/audio/SDL/src/CMakeLists.txt
+index 5ad3f02..5a91cd5 100644
+--- a/driver/audio/SDL/src/CMakeLists.txt
++++ b/driver/audio/SDL/src/CMakeLists.txt
+@@ -20,6 +20,7 @@ IF (SDL_FOUND)
+         
+         ADD_LIBRARY(audioSDL SHARED SDL.cpp SDL.h main.h SoundSDL_Music.cpp SoundSDL_Music.h SoundSDL_Effect.cpp SoundSDL_Effect.h ${PROJECT_SOURCE_DIR}/build_version.cpp ../../../src/DriverInterface.cpp ../../../src/tempname.cpp ../../../src/tempname.h)
+     
++    	ADD_DEFINITIONS(-fPIC)
+         ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
+         ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
+ 
+diff --git a/driver/video/SDL/src/CMakeLists.txt b/driver/video/SDL/src/CMakeLists.txt
+index 83d10cf..ca67573 100644
+--- a/driver/video/SDL/src/CMakeLists.txt
++++ b/driver/video/SDL/src/CMakeLists.txt
+@@ -16,6 +16,7 @@ IF (SDL_FOUND)
+ 
+ 	ADD_LIBRARY(videoSDL SHARED SDL.cpp SDL.h main.h ../../../../build_version.cpp ../../../src/DriverInterface.cpp)
+ 
++	ADD_DEFINITIONS(-fPIC)
+ 	ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR})
+ 	ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR})
+ 
+-- 
+2.3.6
+
+
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
new file mode 100644
index 000000000000..957ecf4ddf50
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
@@ -0,0 +1,84 @@
+Bug: https://bugs.gentoo.org/610972
+Commit: https://github.com/Return-To-The-Roots/mygettext/commit/3b902a46322b7e88e9d2cdf85ee0912c6565f9a2
+
+--- a/driver/audio/SDL/src/SDL.cpp
++++ b/driver/audio/SDL/src/SDL.cpp
+@@ -175,23 +175,23 @@
+ 	
+ 	char file[512];
+ 	if(!tempname(file, 512))
+-		return false;
++		return NULL;
+ 
+ 	strncat(file, ".wav", 512);
+ 	
+ 	FILE *dat = fopen(file, "wb");
+ 	if(!dat)
+-		return false;
++		return NULL;
+ 
+ 	if(fwrite(data, 1, size, dat) != size)
+-		return false;
++		return NULL;
+ 	
+ 	fclose(dat);
+ 
+ 	switch(data_type)
+ 	{
+ 	default:
+-		return false;
++		return NULL;
+ 
+ 	case AudioDriver::AD_WAVE:
+ 		{
+@@ -233,12 +233,12 @@
+ 
+ 	char file[512];
+ 	if(!tempname(file, 512))
+-		return false;
++		return NULL;
+ 
+ 	switch(data_type)
+ 	{
+ 	default:
+-		return false;
++		return NULL;
+ 
+ 	case AudioDriver::AD_MIDI:
+ 		{
+@@ -266,10 +266,10 @@
+ 
+ 	FILE *dat = fopen(file, "wb");
+ 	if(!dat)
+-		return false;
++		return NULL;
+ 
+ 	if(fwrite(data, 1, size, dat) != size)
+-		return false;
++		return NULL;
+ 
+ 	fclose(dat);
+ 
+--- a/src/VideoDriverWrapper.cpp
++++ b/src/VideoDriverWrapper.cpp
+@@ -481,7 +481,7 @@
+ 	if(videodriver == NULL)
+ 	{
+ 		fatal_error("Kein Videotreiber ausgewaehlt!\n");
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	return videodriver->GetFunction(extension);
+--- a/mygettext/src/mygettext.h
++++ b/mygettext/src/mygettext.h
+@@ -21,6 +21,9 @@
+ 
+ #pragma once
+ 
++// necessarily here
++#include <locale>
++
+ const char *mysetlocale(int category, const char *locale);
+ 
+ #undef gettext
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
new file mode 100644
index 000000000000..d2ff0ee1fe39
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
@@ -0,0 +1,36 @@
+From 3b08b907235c09ab84e3bb23d1e05fe5a1d1c00e Mon Sep 17 00:00:00 2001
+From: Manuel Zeise <mail@manuel-zeise.de>
+Date: Sun, 3 Jan 2016 16:54:05 +0100
+Subject: [PATCH] Switch for miniUPnPc API version 14 and above
+
+API version 14 of miniUPnPc has introduced a new TTL argument to
+upnpDiscover() with a recommended default value of 2. A new preprocessor
+statement evaluates the API version and selects the correct version of
+upnpDiscover() based on the API version.
+
+--- s25rttr-0.8.1/libutil/src/UPnP.cpp
++++ s25rttr-0.8.1/libutil/src/UPnP.cpp
+@@ -210,7 +210,11 @@
+ 	UPNPDev* devicelist = NULL;
+ #ifdef UPNPDISCOVER_SUCCESS
+ 	int upnperror = 0;
++#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
++	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
++#else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
++#endif
+ #else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
+ #endif
+@@ -276,7 +280,11 @@
+ 	UPNPDev* devicelist = NULL;
+ #ifdef UPNPDISCOVER_SUCCESS
+ 	int upnperror = 0;
++#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
++	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
++#else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
++#endif
+ #else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
+ #endif
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
new file mode 100644
index 000000000000..1cc7686b850d
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
@@ -0,0 +1,17 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Mon Apr 30 20:42:28 UTC 2012
+
+relocate executables sound-convert and s-c_resample which get installed
+into datadir by default
+
+--- a/libutil/src/files.h
++++ b/libutil/src/files.h
+@@ -140,7 +140,7 @@
+ 	/* 54 */RTTRDIR "",                               // unbenutzt
+ 	/* 55 */SETTINGSDIR "/LSTS/SOUND.LST",            // Die konvertierte sound.lst
+ 	/* 56 */RTTRDIR "/sound.scs",                     // Das konvertier-script
+-	/* 57 */RTTRDIR "",                               // Basispfad fürn Soundconverter
++	/* 57 */DRIVERDIR "",                             // Basispfad fürn Soundconverter
+ 	/* 58 */GAMEDIR "/DATA/MIS0BOBS.LST",
+ 	/* 59 */GAMEDIR "/DATA/MIS1BOBS.LST",
+ 	/* 60 */GAMEDIR "/DATA/MIS2BOBS.LST",
diff --git a/games-strategy/s25rttr/metadata.xml b/games-strategy/s25rttr/metadata.xml
new file mode 100644
index 000000000000..7603c5eda305
--- /dev/null
+++ b/games-strategy/s25rttr/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://www.siedler25.org/index.php?com=dynamic&amp;mod=9&amp;PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5</changelog>
+		<bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
new file mode 100644
index 000000000000..47531d7e1d95
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
+
+DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
+HOMEPAGE="https://www.siedler25.org/"
+# no upstream source tarball yet
+# https://bugs.launchpad.net/s25rttr/+bug/1069546
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	media-libs/libsamplerate
+	media-libs/libsdl[X,sound,opengl,video]
+	media-libs/libsndfile
+	media-libs/sdl-mixer[vorbis]
+	net-libs/miniupnpc
+	virtual/libiconv
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+DOCS=( RTTR/texte/{keyboardlayout.txt,readme.txt} )
+
+DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-soundconverter.patch
+	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-miniupnpc-api-14.patch
+	"${FILESDIR}"/${P}-cmake-3.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_configure() {
+	local arch
+	case ${ARCH} in
+		amd64)
+			arch="x86_64" ;;
+		x86)
+			arch="i386" ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
+	esac
+
+	local mycmakeargs=(
+		-DCOMPILEFOR="linux"
+		-DCOMPILEARCH="${arch}"
+		-DCMAKE_SKIP_RPATH=YES
+		-DPREFIX="/usr/"
+		-DBINDIR="/usr/bin"
+		-DDATADIR="/usr/share"
+		-DLIBDIR="/usr/$(get_libdir)/${PN}"
+		-DDRIVERDIR="/usr/$(get_libdir)/${PN}"
+		-DGAMEDIR="~/.${PN}/S2"
+		-DBUILD_GLFW_DRIVER=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# work around some relative paths (CMAKE_IN_SOURCE_BUILD not supported)
+	ln -s "${CMAKE_USE_DIR}"/RTTR "${CMAKE_BUILD_DIR}"/RTTR || die
+
+	cmake-utils_src_compile
+
+	mv "${CMAKE_USE_DIR}"/RTTR/{sound-convert,s-c_resample} "${T}"/ || die
+}
+
+src_install() {
+	cd "${CMAKE_BUILD_DIR}" || die
+
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe "${T}"/{sound-convert,s-c_resample}
+	exeinto /usr/"$(get_libdir)"/${PN}/video
+	doexe driver/video/SDL/src/libvideoSDL.so
+	exeinto /usr/"$(get_libdir)"/${PN}/audio
+	doexe driver/audio/SDL/src/libaudioSDL.so
+
+	insinto /usr/share
+	doins -r "${CMAKE_USE_DIR}"/RTTR
+	dosym ./LSTS/splash.bmp /usr/share/RTTR/splash.bmp
+
+	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
+	dobin src/s25client
+	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/scorched3d-44-r2 b/games-strategy/scorched3d-44-r2
deleted file mode 100644
index 163d62b41e5b..000000000000
--- a/games-strategy/scorched3d-44-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/expat media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-net sys-libs/zlib virtual/jpeg:0 !dedicated? ( virtual/opengl virtual/glu media-libs/glew:0= media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:3.0[X] media-libs/freetype:2 sci-libs/fftw:3.0= ) mysql? ( virtual/mysql ) !dedicated? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Multi-player tank battle in 3D (OpenGL)
-EAPI=6
-HOMEPAGE=http://www.scorched3d.co.uk/
-IUSE=dedicated mysql
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-net sys-libs/zlib virtual/jpeg:0 !dedicated? ( virtual/opengl virtual/glu media-libs/glew:0= media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:3.0[X] media-libs/freetype:2 sci-libs/fftw:3.0= ) mysql? ( virtual/mysql )
-SLOT=0
-SRC_URI=mirror://sourceforge/scorched3d/Scorched3D-44-src.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=3891e000be68b77a4ae4498fe542aaaf
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
new file mode 100644
index 000000000000..01f629e05553
--- /dev/null
+++ b/games-strategy/scorched3d/Manifest
@@ -0,0 +1,11 @@
+AUX scorched3d-44-fix-c++14.patch 566 BLAKE2B 0924707c4da94b1ca088b46db19e145191708d38be6f848cdeec5a84a1f90002736d40ed3e95b8e836580adb496d5fbb0f247f31df991a28c797842086cca01e SHA512 f74db569f471e1ac24fe6dfa15c319ac6dce52a6b35d333efb314b59156b150e7a09c843e7046d804a4768eea294671546313043c46bc38ac5e951d1daa1c23d
+AUX scorched3d-44-fixups.patch 717 BLAKE2B 24af35bbc6d1070d08282e4915d4575f1d0783a49d542a3d7aca45ad91ac8ab8378a0a48d19e7e593d71e39882ea1964a1686d6f4fbcacedb00cbc26f8e68d65 SHA512 8045df51e6a09d9101d971056edc77e03694b2872819cd892d1239c04ad5c59afa8a60adc2ca04a63a5d501bbb113221408522a33159eee836e600bb2b8d40c7
+AUX scorched3d-44-freetype.patch 1372 BLAKE2B a2b5f4551ae2d64c8a35cf9f305c3ff67b62d0cf5bf939b2c2a450fa347d6f39d6bc240346ee3deda98b8c3b87053a6fbcc22125c5ba0c63d149c64ab7194775 SHA512 98688db48920b32aa87aeb9fbfb245f18ebc0f5b2a92a341ffd49ad94fc10e6bee4ee5864e15497e7617467759cc1fe809887e107d881b199965f5b22045bfc9
+AUX scorched3d-44-gcc43.patch 561 BLAKE2B 4fb787d19161ecb21b40f0636288d521af62d281bfe9af7408761851f3f527e0645d0c698f42b47765743f72d2d07d85b45d32875182c6febe1b38e0862b3e45 SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1
+AUX scorched3d-44-jpeg9.patch 614 BLAKE2B de7f71778be9530801a6f764d64f6020a260c9cef328dbf0481f9a486f50211879db981fffc54ec4fa67309a365fa8f1e712be28b72514dc69473c23c7b422e5 SHA512 8adb3bd124b11b006d8124e57fc506e8dc56415c89cca70440901cef7aa547f241d100c42281345fd489c95f9e8eb105d5e5de5ef18382087e203877cc8f6ca4
+AUX scorched3d-44-odbc.patch 503 BLAKE2B 90c212fd77732bad90d5455e967cbc18f3e28c6352637e6325dd9c3ae91e9e86d759dac66d1054a75a84ddfa827fb5b80aa4483d90e77782a5632ad4bc29fdd6 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e
+AUX scorched3d-44-win32.patch 464 BLAKE2B 51362a695212dd8d37013c1b4a11d77fb1b8564b54e3ec9ce3e0165ee83e42d65883dc3df964180d975885a555b1ae02e87fc20cc3c85d4507308110ee7cf810 SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd
+AUX scorched3d-44-wxgtk.patch 7001 BLAKE2B b120e1cc12343fa5be2e4348930d2656eb2c727224a8e9e63f00dfb4da71888918d3fcccc1a9a439737ce2f6fbe6224be06d4801b4cb857ad1e4765d2c444e4e SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120
+DIST Scorched3D-44-src.tar.gz 41689613 BLAKE2B 61f5536ad6e9dedeb0e778f90d73aa918f890632385278d4d788a43f1e199e817d6199f923c264dadbe8084fa53c32968b599c9b08784de0d5752069f9bed818 SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca
+EBUILD scorched3d-44-r2.ebuild 2310 BLAKE2B 3826272ff4fe72b696980b08102036a1bd87e4bbd1da35fa5d64abf39f86b14dec6c11fa8169393edb8e6935a10f91e76677a3a4fc8ab164fa9445a38326a06b SHA512 239d20d7d6125eb299c9e88a7d69feafbce593190daf724539bf846cc1dd4de13df6be9e8b8d02f59e4d2ad601310b7b37ef31e55d51909c4e245f5b30ccd74f
+MISC metadata.xml 333 BLAKE2B da791c5728d5a17950492280dcf23b0543b6c444885f852b491a8eaa65f2befcd755470183e8084034a16fb6507b073b2de91afdb00d4db2eaca68077495daa8 SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171
diff --git a/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch
new file mode 100644
index 000000000000..e3cba2741405
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch
@@ -0,0 +1,14 @@
+In C++14, bool -> T* implicit conversions are not allowed anymore.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=601890
+
+--- a/src/common/weapons/AccessoryStore.cpp
++++ b/src/common/weapons/AccessoryStore.cpp
+@@ -156,7 +156,7 @@
+ 	Accessory *parent, XMLNode *currentNode)
+ {
+ 	XMLNode *typeNode = 0;
+-	if (!currentNode->getNamedParameter("type", typeNode)) return false;
++	if (!currentNode->getNamedParameter("type", typeNode)) return NULL;
+ 
+ 	AccessoryPart *accessoryPart = 
+ 		AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);
diff --git a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
new file mode 100644
index 000000000000..47499d4cf307
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
@@ -0,0 +1,25 @@
+--- scorched.orig/configure.ac
++++ scorched/configure.ac
+@@ -13,22 +13,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include -I/usr/X11R6"
+-
+-if test `uname` == Darwin; then
+-LDFLAGS="$LDFLAGS -lmx"
+-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
+-else
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
+-	echo "Warning: No beer found in fridge!";
+-	echo "We highly suggest that you rectify this situation immediately."
+-])
+-
+ AC_ARG_ENABLE(serveronly, 
+ 	[  --enable-serveronly Enable server only compilation],
+ 		    , enable_serveronly=no,
diff --git a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
new file mode 100644
index 000000000000..e4717972d81a
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
@@ -0,0 +1,45 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -437,7 +437,7 @@
+    if test "$FT2_CONFIG" = "no" ; then
+      no_ft=yes
+    else
+-     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
++     FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
+      FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+      ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+--- a/src/client/GLEXT/GLFont2dFreeType.h
++++ b/src/client/GLEXT/GLFont2dFreeType.h
+@@ -23,10 +23,10 @@
+ 
+ #include <GLEXT/GLFont2dStorage.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include <freetype.h>
++#include <ftglyph.h>
++#include <ftoutln.h>
++#include <fttrigon.h>
+ #include <string>
+ 
+ class GLFont2dFreeType
+--- a/src/launcher/wxdialogs/TrueTypeFont.h
++++ b/src/launcher/wxdialogs/TrueTypeFont.h
+@@ -25,10 +25,10 @@
+ #include <wx/image.h>
+ #include <ft2build.h>
+ #include <string>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include <freetype.h>
++#include <ftglyph.h>
++#include <ftoutln.h>
++#include <fttrigon.h>
+ 
+ class TrueTypeFont
+ {
diff --git a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
new file mode 100644
index 000000000000..79f40b70e652
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
@@ -0,0 +1,22 @@
+--- scorched.old/src/common/common/main.h
++++ scorched/src/common/common/main.h
+@@ -40,7 +40,7 @@
+ void _no_storage()
+ {
+ 	printf("Failed to allocate memory!!");
+-	std::exit(1);
++	exit(1);
+ }
+ 
+ void run_main(int argc, char *argv[], OptionsParameters &params)
+--- scorched.old/src/common/porting/windows.h
++++ scorched/src/common/porting/windows.h
+@@ -20,7 +20,7 @@
+ typedef unsigned short  WORD;
+ typedef unsigned char   BYTE;
+ 
+-typedef int 	HWND;
++// typedef int 	HWND;
+ typedef void * 	HINSTANCE;
+ typedef int 	WPARAM;
+ typedef int 	LPARAM;
diff --git a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
new file mode 100644
index 000000000000..1cebf3ebd7bc
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
@@ -0,0 +1,20 @@
+--- a/src/common/image/ImageJpgFactory.cpp.old	2014-12-03 09:52:03.306552513 +0100
++++ b/src/common/image/ImageJpgFactory.cpp	2014-12-03 09:53:22.117786304 +0100
+@@ -79,7 +79,7 @@
+ 	src->next_input_byte = FakeEOI;
+ 	src->bytes_in_buffer = 2;
+ 
+-	return TRUE;
++	return (boolean)TRUE;
+ }
+ 
+ METHODDEF(void)
+@@ -166,7 +166,7 @@
+ 	src->bytes_in_buffer = buffer.getBufferUsed();
+ 	src->next_input_byte = (JOCTET *) buffer.getBuffer();
+ 
+-	jpeg_read_header(&cinfo, TRUE);
++	jpeg_read_header(&cinfo, (boolean)TRUE);
+ 	jpeg_start_decompress(&cinfo);
+ 
+ 	if ((cinfo.output_components == 3 && !readalpha) ||
diff --git a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch b/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
new file mode 100644
index 000000000000..e7f3833bf897
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
@@ -0,0 +1,16 @@
+When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build.
+bug #285384 - patch from Bob Johnson
+
+--- scorched/src/common/porting/windows.h
++++ fix_scorched/src/common/porting/windows.h
+@@ -11,8 +11,8 @@
+ 
+ typedef char * 		LPSTR;
+ typedef const char *	LPCTSTR;
+-typedef unsigned int 	DWORD;
+-typedef unsigned int *  LPDWORD;
++typedef unsigned long 	DWORD;
++typedef DWORD *         LPDWORD;
+ typedef unsigned char * LPBYTE;
+ typedef int 		INT;
+ typedef long         	LONG;
diff --git a/games-strategy/scorched3d/files/scorched3d-44-win32.patch b/games-strategy/scorched3d/files/scorched3d-44-win32.patch
new file mode 100644
index 000000000000..05f9c806b1c7
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-win32.patch
@@ -0,0 +1,18 @@
+--- scorched.old/src/common/porting/windows.h
++++ scorched/src/common/porting/windows.h
+@@ -9,6 +9,7 @@
+ #include <ctype.h>
+ #include <common/Defines.h>
+ 
++#ifdef _WIN32
+ typedef char * 		LPSTR;
+ typedef const char *	LPCTSTR;
+ typedef unsigned int 	DWORD;
+@@ -27,6 +28,7 @@
+ typedef int 	LRESULT;
+ typedef void *	HDC;
+ typedef void *  HGLRC;
++#endif  /* _WIN32 */
+ 
+ #define _strnicmp(a,b,c)	strncasecmp(a,b,c)
+ #define stricmp(a,b)		strcasecmp(a,b)
diff --git a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
new file mode 100644
index 000000000000..ee8b97554656
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
@@ -0,0 +1,161 @@
+Description: Fix to build with wxWidgets 3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-05-01
+
+--- a/src/launcher/wxdialogs/Display.cpp
++++ b/src/launcher/wxdialogs/Display.cpp
+@@ -26,7 +26,7 @@
+ 	// Display settings
+ 	wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
+ 	wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL);
+-	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
++	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
+ 	wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :"));
+ 	IDC_DISPLAY_CTRL = 
+ 		new wxComboBox(parent, -1,
+@@ -88,7 +88,7 @@
+ 	// Sound settings
+ 	wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
+ 	wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);
+-	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
++	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
+ 	wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));
+ 	wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));
+ 	wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));
+@@ -137,7 +137,7 @@
+ 		wxT("Game Detail Options"));
+ 	wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);
+ 
+-	wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
++	wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	IDC_LOADULTRA_CTRL = new wxButton(parent,  ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));
+ 	IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
+ 	IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));
+@@ -256,7 +256,7 @@
+ 		wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1, 
+ 													  wxT("Graphics Detail"));
+ 		wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
+-		wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
++		wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
+ 		
+ 		IDC_NOWATERREF_CTRL = 
+ 		new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement"));
+@@ -471,7 +471,7 @@
+ {
+ 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, 
+ 		wxDefaultPosition, wxSize(480, 250));
+-	wxSizer *sizer = new wxFlexGridSizer(5, 1);
++	wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
+ 	
+ 	keyboardKeyList.clear();
+ 	if (!Keyboard::instance()->loadKeyFile())
+--- a/src/launcher/wxdialogs/SettingsDialog.cpp
++++ b/src/launcher/wxdialogs/SettingsDialog.cpp
+@@ -105,7 +105,7 @@
+ 	mainPanel_ = new wxPanel(book_, -1);
+ 	book_->AddPage(mainPanel_, wxT("Main"));
+ 	wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -166,7 +166,7 @@
+ {
+ 	moneyPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -215,7 +215,7 @@
+ {
+ 	scorePanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -249,7 +249,7 @@
+ {
+ 	weaponsPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -286,7 +286,7 @@
+ {
+ 	envPanel_ = new wxPanel(book_, -1);
+ 	wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
+-	wxSizer *sizer = new wxFlexGridSizer(2, 2);
++	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ 	envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	setters_.push_back(
+@@ -337,7 +337,7 @@
+ 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, 
+ 		wxDefaultPosition, wxSize(225, 200));
+ 
+-	wxSizer *sizer = new wxFlexGridSizer(3, 3);
++	wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
+ 	int i = 0;
+ 	std::list<LandscapeDefinitionsEntry> &defns =
+ 		landscapeDefinitions.getAllLandscapes();
+@@ -438,7 +438,7 @@
+ 		wxT("Players are persistent for game"));
+ 	playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);
+ 		
+-	wxSizer *sizer = new wxGridSizer(3, 3);
++	wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
+ 	playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+ 
+ 	for (int i=0; i<24; i++)
+--- a/src/launcher/wxdialogs/DisplayDialog.cpp
++++ b/src/launcher/wxdialogs/DisplayDialog.cpp
+@@ -449,15 +449,15 @@
+ 	IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
+ 	IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8));
+ 	IDC_VOLUME_CTRL->SetRange(0, 128);
+-	IDC_VOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_VOLUME_CTRL->SetTickFreq(4);
+ 	IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
+ 	IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
+-	IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
+ 	IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
+ 	IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
+-	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
++	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
+ 	IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
+ 	IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8));
+ 	IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8));
+@@ -733,11 +733,7 @@
+ 		convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename
+ 		wxT(""), // default extension
+ 		wxT("*.s3m"),
+-#if wxCHECK_VERSION(2, 8, 0)
+ 		wxFD_SAVE);
+-#else
+-		wxSAVE);
+-#endif
+ 	if (file.empty()) return;
+ 	ModFiles files;
+ 	if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false))
+@@ -761,11 +757,7 @@
+ 		wxT(""), // default filename
+ 		wxT(""), // default extension
+ 		wxT("*.s3m"),
+-#if wxCHECK_VERSION(2, 8, 0)
+ 		wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+-#else
+-		wxOPEN | wxFILE_MUST_EXIST);
+-#endif
+ 	if (file.empty()) return;
+ 	ModFiles files;
+ 	std::string mod;
diff --git a/games-strategy/scorched3d/metadata.xml b/games-strategy/scorched3d/metadata.xml
new file mode 100644
index 000000000000..bad136330d96
--- /dev/null
+++ b/games-strategy/scorched3d/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">scorched3d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
new file mode 100644
index 000000000000..6cd098e970d6
--- /dev/null
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0
+
+inherit autotools eutils wxwidgets
+
+DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
+HOMEPAGE="http://www.scorched3d.co.uk/"
+SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+RDEPEND="
+	dev-libs/expat
+	media-fonts/dejavu
+	media-libs/libpng:0=
+	media-libs/libsdl[video]
+	media-libs/sdl-net
+	sys-libs/zlib
+	virtual/jpeg:0
+	!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/glew:0=
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/freealut
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		media-libs/freetype:2
+		sci-libs/fftw:3.0=
+	)
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	!dedicated? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/scorched
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fixups.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-odbc.patch
+	"${FILESDIR}"/${P}-win32.patch
+	"${FILESDIR}"/${P}-freetype.patch
+	"${FILESDIR}"/${P}-jpeg9.patch
+	"${FILESDIR}"/${P}-wxgtk.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+)
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_prepare() {
+	edos2unix \
+		src/launcher/wxdialogs/SettingsDialog.cpp \
+		src/launcher/wxdialogs/DisplayDialog.cpp \
+		src/launcher/wxdialogs/Display.cpp \
+		src/launcher/wxdialogs/KeyDialog.cpp
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
+		--with-fftw="${EPREFIX}"/usr \
+		--with-ogg="${EPREFIX}"/usr \
+		--with-vorbis="${EPREFIX}"/usr \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-wx-config="${WX_CONFIG}" \
+		--without-pgsql \
+		$(use_with mysql) \
+		$(use_enable dedicated serveronly)
+}
+
+src_install() {
+	default
+
+	# remove bundled fonts
+	rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
+
+	if ! use dedicated; then
+		newicon data/images/tank-old.bmp ${PN}.bmp
+		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
+	fi
+}
diff --git a/games-strategy/seven-kingdoms-2.14.7 b/games-strategy/seven-kingdoms-2.14.7
deleted file mode 100644
index 9238eaabbff9..000000000000
--- a/games-strategy/seven-kingdoms-2.14.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
-DESCRIPTION=Seven Kingdoms: Ancient Adversaries
-EAPI=6
-HOMEPAGE=https://7kfans.com/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/the3dfxdude/7kaa/releases/download/v2.14.7/7kaa-2.14.7.tar.xz https://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb836dd5eaf549f85884bbcd341141f8
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
new file mode 100644
index 000000000000..32b874b17bde
--- /dev/null
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -0,0 +1,4 @@
+DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
+DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
+EBUILD seven-kingdoms-2.14.7.ebuild 783 BLAKE2B 88eb5caf7fad23b0924878a177f4dc4c7da78e928752ff6082350bc44635ab8b2e0c5286d14d5e36562eb23c6bff40e6e52d2b3d6b7bcbb298cf3df578f1ccf7 SHA512 f360b0580feefb5e53f0639e56aa206af62ac20932c0e624bff9865e449c31fe72d735cc7b204eb073252c6509872f2ce487a5ff00164ce4a79910d3bf3fefcc
+MISC metadata.xml 323 BLAKE2B d6893eaaa3f0dd7c230028000f15ed2964a7e7f4b2e5c710c61e2735aa27dafd4c2cff4deaec887854a68e7102f6df772fa8c1ae9c1286df68f115704e608049 SHA512 09f1b34120c01f3dd5f367a2b4ba99b7b89ef06362843e18bc320c7ce7eaea02cbc6c8a0d33541630758d77c6482bc88138d7cdfa1c4fa6dac7ca559d0feeff8
diff --git a/games-strategy/seven-kingdoms/metadata.xml b/games-strategy/seven-kingdoms/metadata.xml
new file mode 100644
index 000000000000..4a1da05f9526
--- /dev/null
+++ b/games-strategy/seven-kingdoms/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>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">skfans</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
new file mode 100644
index 000000000000..33a7974f04b1
--- /dev/null
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PN="7kaa"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
+HOMEPAGE="https://7kfans.com/"
+SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="net-libs/enet:1.3=
+	media-libs/libsdl2[X,video]
+	media-libs/openal
+	net-misc/curl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.xz
+}
+
+src_install() {
+	default
+
+	doicon "${DISTDIR}/${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame"
+}
diff --git a/games-strategy/smac-6.0a b/games-strategy/smac-6.0a
deleted file mode 100644
index 9fe417c7dc9c..000000000000
--- a/games-strategy/smac-6.0a
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=games-util/loki_patch
-DESCRIPTION=Linux port of the popular strategy game from Firaxis
-EAPI=5
-HOMEPAGE=http://www.lokigames.com/products/smac/
-IUSE=+videos
-KEYWORDS=~amd64 ~x86
-LICENSE=LOKI-EULA
-PROPERTIES=interactive
-RDEPEND=sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp !ppc? ( sys-libs/lib-compat-loki ) media-libs/libsdl[sound,video] media-libs/sdl-ttf media-libs/sdl-mixer media-libs/smpeg media-libs/freetype sys-libs/zlib games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( mirror://lokigames/smac/smac-6.0a-x86.run ) amd64? ( mirror://lokigames/smac/smac-6.0a-x86.run ) ppc? ( http://mirrors.dotsrc.org/lokigames/installers/smac/smac-install-ppc.run )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2530ab3e491cc4e81b36d0a4180fd057
diff --git a/games-strategy/smac/Manifest b/games-strategy/smac/Manifest
new file mode 100644
index 000000000000..00cea5f3ed46
--- /dev/null
+++ b/games-strategy/smac/Manifest
@@ -0,0 +1,4 @@
+DIST smac-6.0a-x86.run 6801730 BLAKE2B 95d50c79cde06c4abb5473d7a67f4a66205f7147b7796c9f5e62273776083ce592ec748fd4db559b57568075fb53b4d44db05b2cf14e450ed5757898da6c26d7 SHA512 b71dd1ee46d37d66131cf6fc15c6a406719989021c8dbb6e74cded18c5520ee9ba4bbdfc5bdfc0ddfa67fa2e846365636be41d87a6440473e8ae5ebf542b7744
+DIST smac-install-ppc.run 18528928 BLAKE2B f5c9689c192ebd8ae03d5bb5d4db6deb2b19c5924ce87426cb9140163c9b53a1c4b0ba8592d8b823b2b73847cbf4ffa6d400000a3cf458dd5473ab6bd0aef965 SHA512 99fc6edca2c9e64bfc0cab644cbd061c3842359c16e5e6537a2aa2df4cd2a1a6a39169a2b9540199b08f7aee28f4e2cfad814499fdd55b5edf7ab9b19c12d793
+EBUILD smac-6.0a.ebuild 3069 BLAKE2B dd865b2d81bc1bcb69254beed8f8f9066a83e87541bac41bd230a895f72939b8f0780fa6771cda473c3fe43a8277531e026c0da204b921f83d0f87cdec9e070e SHA512 031b661c3fc11be4c3474fc7c752ca15332b982e527f61560763c5a3592369262e5ce76157f61f00a635b22b0d0be489732183ae5ceb42a09fda004ecb5d315b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/smac/metadata.xml b/games-strategy/smac/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/smac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
new file mode 100644
index 000000000000..e6aff2ef3a12
--- /dev/null
+++ b/games-strategy/smac/smac-6.0a.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils unpacker cdrom games
+
+DESCRIPTION="Linux port of the popular strategy game from Firaxis"
+HOMEPAGE="http://www.lokigames.com/products/smac/"
+SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-x86.run )
+	amd64? ( mirror://lokigames/${PN}/${P}-x86.run )
+	ppc? ( http://mirrors.dotsrc.org/lokigames/installers/${PN}/${PN}-install-ppc.run )"
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+videos"
+RESTRICT="strip"
+
+DEPEND="games-util/loki_patch"
+RDEPEND="sys-libs/glibc
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	!ppc? ( sys-libs/lib-compat-loki )
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer
+	media-libs/smpeg
+	media-libs/freetype
+	sys-libs/zlib"
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+src_unpack() {
+	cdrom_get_cds Alien_Crossfire_Manual.pdf
+	mkdir -p "${S}"/a
+	cd "${S}"/a
+	use x86 || use amd64 && unpack_makeself ${P}-x86.run
+	use ppc && unpack_makeself ${PN}-install-ppc.run
+}
+
+src_install() {
+	einfo "Copying files... this may take a while..."
+	exeinto "${dir}"
+	doexe "${CDROM_ROOT}"/bin/x86/{smac,smacx,smacpack}
+
+	insinto "${dir}"
+	doins ${CDROM_ROOT}/{{Alien_Crossfire,Alpha_Centauri}_Manual.pdf,QuickStart.txt,README,icon.{bmp,xpm}}
+
+	cd "${Ddir}"
+	tar xzf "${CDROM_ROOT}"/data.tar.gz || die
+	insinto "${dir}"/data
+	doins "${CDROM_ROOT}"/data/*.{pcx,cvr,flc,gif}
+	doins -r "${CDROM_ROOT}"/data/{facs,fx,projs,techs,voices}
+
+	if use videos ; then
+		doins -r "${CDROM_ROOT}"/data/movies
+	fi
+
+	cd "${S}"/a
+	if use ppc ; then
+		cd ${P}-ppc
+	fi
+	loki_patch --verify patch.dat
+	loki_patch patch.dat "${Ddir}" >& /dev/null || die
+
+	# now, since these files are coming off a cd, the times/sizes/md5sums wont
+	# be different ... that means portage will try to unmerge some files (!)
+	# we run touch on ${D} so as to make sure portage doesnt do any such thing
+	find "${Ddir}" -exec touch '{}' +
+
+	newicon "${CDROM_ROOT}"/icon.xpm smac.xpm
+
+	games_make_wrapper ${PN}pack ./${PN}pack "${dir}" "${dir}"
+	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	games_make_wrapper ${PN}x ./${PN}x "${dir}" "${dir}"
+	make_desktop_entry smacpack "Sid Meier's SMAC Planetary Pack" smacpack
+	make_desktop_entry smac "Sid Meier's Alpha Centauri" smac
+	make_desktop_entry smacx "Sid Meier's Alpha Centauri - Alien Crossfire" smac
+	prepgamesdirs
+
+	if use x86 || use amd64 ; then
+	    einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
+	    dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 && \
+	    dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 && \
+	    dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
+	fi
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "To start Sid Meyer's SMAC Planetary Pack run:"
+	elog " smac"
+	elog "To play Sid Meyer's Alpha Centauri run:"
+	elog " smac"
+	elog "To play Alien Crossfire run:"
+	elog " smacx"
+	elog "Be sure to enable CONFIG_UID16 in your kernel config or"
+	elog "the game will error." # bug 340303
+}
diff --git a/games-strategy/spaz-1.605 b/games-strategy/spaz-1.605
deleted file mode 100644
index c08022922fcf..000000000000
--- a/games-strategy/spaz-1.605
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Space Pirates and Zombies
-EAPI=4
-HOMEPAGE=http://spacepiratesandzombies.com
-IUSE=alsa pulseaudio
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LOKI-EULA
-RDEPEND=>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=spaz-linux-humblebundle-09182012-bin
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc2851baad46c7f377e149d64af8a42f
diff --git a/games-strategy/spaz/Manifest b/games-strategy/spaz/Manifest
new file mode 100644
index 000000000000..11d2bf945db8
--- /dev/null
+++ b/games-strategy/spaz/Manifest
@@ -0,0 +1,3 @@
+DIST spaz-linux-humblebundle-09182012-bin 157466422 BLAKE2B c3b832c4cb8b68bbe353bc019d4af6af335b45e3bcc89209f2a61a840b52448f4d09eaf1544f67995049d377600eae433ce2140171d189afcd7d3c388d67ec78 SHA512 ba62be6a247dfb1ee04db8784b3e173140e7491f2bd68a528ad9c81cab4bc8f807bfeb4593fa37c76e43401420a6f788075cd2541fd16ed7443fe4301a76d50c
+EBUILD spaz-1.605.ebuild 929 BLAKE2B 00b3287d47a9c8d24ba6931083a291522c8060632c243ae768af92f228a1dde7aae10b952bbb725363144c6a18e97ba91ddff1e748c26860188d706da0e70577 SHA512 54c156847f3e387498b90db80e9330a6610824b5fce54895aafc41ab00f5e9d1a089f3c199d9f19f44012201484131f0c3da9113c5116c83af1ea49b2d19c27d
+MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/games-strategy/spaz/metadata.xml b/games-strategy/spaz/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/games-strategy/spaz/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="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/spaz/spaz-1.605.ebuild b/games-strategy/spaz/spaz-1.605.ebuild
new file mode 100644
index 000000000000..80749b2c42ce
--- /dev/null
+++ b/games-strategy/spaz/spaz-1.605.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit unpacker games
+
+DESCRIPTION="Space Pirates and Zombies"
+HOMEPAGE="http://spacepiratesandzombies.com"
+SRC_URI="${PN}-linux-humblebundle-09182012-bin"
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="alsa pulseaudio"
+RESTRICT="fetch strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
+
+S="${WORKDIR}"/data
+
+QA_PREBUILT="opt/spaz/SPAZ"
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	local dir="${GAMES_PREFIX_OPT}/${PN}"
+
+	insinto "${dir}"
+	exeinto "${dir}"
+	doexe SPAZ
+	doins -r common game mods
+	doins audio.so
+	newicon SPAZ.png spaz.png
+	dodoc README-linux.txt
+
+	games_make_wrapper ${PN} ./SPAZ "${dir}" "${dir}"
+	make_desktop_entry ${PN} "Space Pirates and Zombies" ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-strategy/tornado-1.4 b/games-strategy/tornado-1.4
deleted file mode 100644
index 0ba53ed40894..000000000000
--- a/games-strategy/tornado-1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Clone of a C64 game - destroy the opponent's house
-EAPI=5
-HOMEPAGE=http://kiza.kcore.de/software/tornado/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=http://kiza.kcore.de/software/tornado/download/tornado-1.4.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78a9a07d12aeda81de2f91f2a4fe8771
diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
new file mode 100644
index 000000000000..830934926e91
--- /dev/null
+++ b/games-strategy/tornado/Manifest
@@ -0,0 +1,4 @@
+AUX tornado-1.4-gentoo.patch 955 BLAKE2B 923f1f8aff22a9ac20e67220c249e57fd80a028ab8f2f58106c1c7300a29cd97e2bf52cb6403150f645a8a91f565b2a853631d656ddf80d909bfc35dd508537b SHA512 16499538f588370026e05518d5f437599b9f1a291e47c681cb8f7c3c7a88ba4dd1aafb8b979bc8fc35640777be8b54bf209433c88ac9f1c667f97a39500973d9
+DIST tornado-1.4.tar.gz 54591 BLAKE2B 6a734730e987c6e0516f08e6b3a594b46285e86f3e9b967bd6ff575dc3a55c053b9e4bb7795b51914eebed87979e2a1a290a0273f68a045630b6255cc9714794 SHA512 764c18b228a24cdcaf1456af79d1bdb997f200c09bc33d8f54df28f1f995db1b1a3a328550c5561bc8ebd38d4187f472aa1c892d91889e613b9ff42b86bee322
+EBUILD tornado-1.4.ebuild 867 BLAKE2B e846e4a5ee6325cf8a175f5864bd2cc128195e101fcb87252c9f9913775e812ae56578b2f18c5311f29d33420df3e3f1b46922af176efe4c06902ba815040c37 SHA512 e260752c861452a53624b62579efdd8246c2f104a404f3197844f9c233218ac867b530b2082e145dc5a86d2d39c9abd33519fa102d5fa26a54dd8d2340a8d82b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/tornado/files/tornado-1.4-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-gentoo.patch
new file mode 100644
index 000000000000..fb8966841158
--- /dev/null
+++ b/games-strategy/tornado/files/tornado-1.4-gentoo.patch
@@ -0,0 +1,26 @@
+--- Makefile.old        2009-02-12 12:42:25.000000000 +0100
++++ Makefile    2009-02-12 12:44:52.000000000 +0100
+@@ -1,10 +1,9 @@
+-CC = gcc
+ MAKE = make
+-LDFLAGS = -lncurses
++LDLIBS = -lncurses
+ OBJFILES = main.o draw.o erwin.o network.o scores.o
+-PREFIX = /usr/local
+-LOCALEPATH = /usr/local/share/locale
+-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
++PREFIX = /usr
++LOCALEPATH = /usr/share/locale
++CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
+ VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
+ LOCALES = de
+ MAN = doc/man
+@@ -25,7 +24,7 @@
+ $(MAKE) -C $(MAN) all
+ 
+ tornado: $(OBJFILES)
+-	$(CC) $(LDFLAGS) $(OBJFILES) -o tornado
++	$(CC) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado
+ 
+ debug: tornado.6 locales
+ 	gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
diff --git a/games-strategy/tornado/metadata.xml b/games-strategy/tornado/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/tornado/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/tornado/tornado-1.4.ebuild b/games-strategy/tornado/tornado-1.4.ebuild
new file mode 100644
index 000000000000..0c6638176e97
--- /dev/null
+++ b/games-strategy/tornado/tornado-1.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Clone of a C64 game -  destroy the opponent's house"
+HOMEPAGE="http://kiza.kcore.de/software/tornado/"
+SRC_URI="http://kiza.kcore.de/software/tornado/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e "s:PREFIX/bin:${GAMES_BINDIR}:" \
+		-e "s:PREFIX/man:/usr/man:" \
+		-e "s:/var/games:${GAMES_STATEDIR}:" \
+		-e "s:/usr/local:/usr:" \
+		doc/man/tornado.6.in \
+		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	dogamesbin tornado
+	doman doc/man/tornado.6
+	dodoc AUTHOR CREDITS Changelog README TODO
+	insinto "${GAMES_STATEDIR}"
+	doins tornado.scores
+	prepgamesdirs
+	fperms 664 "${GAMES_STATEDIR}/tornado.scores"
+}
diff --git a/games-strategy/triplea-1.8.0.9-r1 b/games-strategy/triplea-1.8.0.9-r1
deleted file mode 100644
index 06fa51898dc7..000000000000
--- a/games-strategy/triplea-1.8.0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/apple-java-extensions-bin:0 dev-java/commons-httpclient:3 dev-java/oracle-javamail:0 dev-java/osgi-core-api:0 dev-java/upnplib:0 >=virtual/jdk-1.7 app-arch/unzip test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An open source clone of the popular Axis and Allies boardgame
-EAPI=5
-HOMEPAGE=http://triplea.sourceforge.net/
-IUSE=test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-java/apple-java-extensions-bin:0 dev-java/commons-httpclient:3 dev-java/oracle-javamail:0 dev-java/osgi-core-api:0 dev-java/upnplib:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/triplea/triplea_1_8_0_9_source_code_only.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6f049f12f809fb0e5cbac394d9ff32c4
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
new file mode 100644
index 000000000000..f8a208399d29
--- /dev/null
+++ b/games-strategy/triplea/Manifest
@@ -0,0 +1,6 @@
+AUX mkdir.sh 28 BLAKE2B e23eb97930e3fd2f5860a0acd5c5a79fd43ebb6577bb79c03b369b74172ec7110b39b5324580e2392c95e5235c86a8b786c67d97adfdd6ae804e4fcc36409973 SHA512 f49b4476521ad392ab91550ce1ef150b4fe4243020f7a173a3fe0d11e31476c22c11773058d4da1a013b63cb3b7017ac8ed38d4793d921a691546481c280ad37
+AUX paths.patch 3867 BLAKE2B 18c958a16855b39e8e800c62976aba0cebb42914a8b67cf3ff09e65dc4a3f505a2a0aa6f5d97a63281300788c2e425248c4319bcc69d3daa691a96a1b0786555 SHA512 bc411daa31e6d7a56a1c762eb785547d0be2f9dfc33dc1311f43e78c9d6337c0786860b52f63c817e61bf137fc71099a4019e6441fca1b469bc4f96a79b0300a
+AUX upnplib.patch 999 BLAKE2B 4fd4113eee4b1e695b4bfcada24b57dcf1aa49b346b896926b8ef18d6dc2db8da0720d3c572cb99c6d047cfc0a9256e08ba280096fdb1780fe16492bcbfaf2c9 SHA512 2195e3aec282935bce60017e99e8211bd153165b3359636517fbe518a4630f1e4464beef57015d92e522a399eb9ea79ad75ced36c4b87388905b16705e341283
+DIST triplea_1_8_0_9_source_code_only.zip 378475905 BLAKE2B b9266467d7a919cc4d6e25d30604a21c738761f4b2a31076fd7e2c98c004c5d7b80c98231d388adae619ce29281eec4a9590c6be31fecdbf547d240f81c8951c SHA512 d117bb85d0136d85c76f091cf3b2a398ad1f8755df2cea02867be36d91c6cc98e0fc713a72a93dc74ec91c7b44959afdad5b136591a25a0080f4eabf3c8bff0d
+EBUILD triplea-1.8.0.9-r1.ebuild 2328 BLAKE2B 550c6033bf98560da85a62dfc114b0c5cb4e2a826e01422931c9ced89cd6ff50e7e177f1875a4b19a7341e28b8fbac8293ed256ac25e9a14a6e52c7a6146574d SHA512 c5d9b751355b475429e1b96bd1dc1e45c1b60db0733c706dbf9a571fee566a3e90f1b78997672873779bb452866b70e8ea1eb67d2aa30f49aa302357c3edb2ef
+MISC metadata.xml 330 BLAKE2B e5affd70d163a58ffd63374d6a23a291f38eb5e27aa45d0d4f16857d3483b0a1cc64944ef5fe1284b5742ad5ee72ccb2d4ae0cb9a0c4a8470c8bb1e450dc0ff9 SHA512 25e53b4fda63cde7b2211a94b42804a0eb166fe5159eadcbaf5609645526064790a4b01483fe1e15b5b84fb90c73c55b66afe1c1039bb2dc8354e4c603588ea6
diff --git a/games-strategy/triplea/files/mkdir.sh b/games-strategy/triplea/files/mkdir.sh
new file mode 100644
index 000000000000..f1bd04d125c1
--- /dev/null
+++ b/games-strategy/triplea/files/mkdir.sh
@@ -0,0 +1 @@
+mkdir -v "${HOME}/.triplea"
diff --git a/games-strategy/triplea/files/paths.patch b/games-strategy/triplea/files/paths.patch
new file mode 100644
index 000000000000..f0cd91e3abe6
--- /dev/null
+++ b/games-strategy/triplea/files/paths.patch
@@ -0,0 +1,63 @@
+diff -Naur a/src/games/strategy/engine/framework/GameRunner2.java b/src/games/strategy/engine/framework/GameRunner2.java
+--- a/src/games/strategy/engine/framework/GameRunner2.java	2015-09-02 20:30:04.000000000 +0100
++++ b/src/games/strategy/engine/framework/GameRunner2.java	2016-10-11 23:08:50.296813567 +0100
+@@ -952,9 +952,9 @@
+     // the default
+     File rootDir;
+     if (GameRunner.isMac()) {
+-      rootDir = new File(new File(userHome, "Documents"), "triplea");
++      rootDir = new File(new File(userHome, "Documents"), ".triplea");
+     } else {
+-      rootDir = new File(userHome, "triplea");
++      rootDir = new File(userHome, ".triplea");
+     }
+     return rootDir;
+   }
+diff -Naur a/src/games/strategy/engine/lobby/server/userDB/Database.java b/src/games/strategy/engine/lobby/server/userDB/Database.java
+--- a/src/games/strategy/engine/lobby/server/userDB/Database.java	2015-08-19 16:35:06.000000000 +0100
++++ b/src/games/strategy/engine/lobby/server/userDB/Database.java	2016-10-11 23:08:50.296813567 +0100
+@@ -54,7 +54,7 @@
+     if (System.getProperties().containsKey(ServerLauncher.SERVER_ROOT_DIR_PROPERTY)) {
+       root = new File(System.getProperties().getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY));
+     } else {
+-      root = GameRunner2.getRootFolder();
++      root = GameRunner2.getUserRootFolder();
+     }
+     if (!root.exists()) {
+       throw new IllegalStateException("Root dir does not exist");
+diff -Naur a/src/games/strategy/util/AccessLogFileHandler.java b/src/games/strategy/util/AccessLogFileHandler.java
+--- a/src/games/strategy/util/AccessLogFileHandler.java	2015-08-19 16:35:06.000000000 +0100
++++ b/src/games/strategy/util/AccessLogFileHandler.java	2016-10-11 23:10:31.219309604 +0100
+@@ -12,7 +12,7 @@
+   private static final String logFile;
+ 
+   static {
+-    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
++    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
+     if (!rootDir.exists()) {
+       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
+     }
+diff -Naur a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java
+--- a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java	2015-08-19 16:35:06.000000000 +0100
++++ b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java	2016-10-11 23:10:40.227175356 +0100
+@@ -13,7 +13,7 @@
+   private static final String logFile;
+ 
+   static {
+-    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
++    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
+     if (!rootDir.exists()) {
+       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
+     }
+diff -Naur a/src/games/strategy/util/RotatingLogFileHandler.java b/src/games/strategy/util/RotatingLogFileHandler.java
+--- a/src/games/strategy/util/RotatingLogFileHandler.java	2015-08-19 16:35:06.000000000 +0100
++++ b/src/games/strategy/util/RotatingLogFileHandler.java	2016-10-11 23:10:46.851076636 +0100
+@@ -12,7 +12,7 @@
+   private static final String logFile;
+ 
+   static {
+-    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
++    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
+     if (!rootDir.exists()) {
+       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
+     }
diff --git a/games-strategy/triplea/files/upnplib.patch b/games-strategy/triplea/files/upnplib.patch
new file mode 100644
index 000000000000..f17b7891302a
--- /dev/null
+++ b/games-strategy/triplea/files/upnplib.patch
@@ -0,0 +1,14 @@
+diff -Naur a/src/games/strategy/net/UniversalPlugAndPlayHelper.java b/src/games/strategy/net/UniversalPlugAndPlayHelper.java
+--- a/src/games/strategy/net/UniversalPlugAndPlayHelper.java	2015-08-19 16:35:06.000000000 +0100
++++ b/src/games/strategy/net/UniversalPlugAndPlayHelper.java	2016-10-11 22:10:37.287834187 +0100
+@@ -166,8 +166,8 @@
+     System.out.println("To " + m_local.getHostAddress() + ":" + internalPort);
+     boolean mapped = false;
+     try {
+-      mapped = m_device.addPortMapping("TripleA Game Hosting", "TCP", null, externalPort, m_local.getHostAddress(),
+-          internalPort, 0);
++      mapped = m_device.addPortMapping("TripleA Game Hosting", null, internalPort, externalPort,
++          m_local.getHostAddress(), 0, "TCP");
+     } catch (final IOException e) {
+       System.out.println("Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage());
+       return "Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage();
diff --git a/games-strategy/triplea/metadata.xml b/games-strategy/triplea/metadata.xml
new file mode 100644
index 000000000000..6c83e2c3e451
--- /dev/null
+++ b/games-strategy/triplea/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">triplea</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild b/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild
new file mode 100644
index 000000000000..ad0f13584c8a
--- /dev/null
+++ b/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators _)
+DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
+HOMEPAGE="http://triplea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # Needs X11 maybe use virtualx.eclass
+
+RDEPEND="dev-java/apple-java-extensions-bin:0
+	dev-java/commons-httpclient:3
+	dev-java/oracle-javamail:0
+	dev-java/osgi-core-api:0
+	dev-java/upnplib:0"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.7
+	app-arch/unzip
+	test? ( dev-java/ant-junit:0 )"
+RDEPEND="${RDEPEND}
+	>=virtual/jre-1.7"
+
+S=${WORKDIR}/${PN}_${MY_PV}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,commons-httpclient-3,oracle-javamail,osgi-core-api,upnplib"
+
+java_prepare() {
+	# Use ~/.triplea, not ~/triplea.
+	# Don't write server files under /usr/share or ${PWD}.
+	# Fix to build against our packaged upnplib.
+	epatch "${FILESDIR}"/{paths,upnplib}.patch
+
+	# Remove packaged or unneeded libs. Unfortunately Apache Derby was
+	# last-rited due to packaging issues. See bug #561410.
+	find lib/* ! -name "derby-*.jar" -delete || die
+	rm -r old/ || die
+}
+
+src_compile() {
+	eant
+	echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties || die
+	# The only target creating this is zip which does unjar etc
+	jar cf ${PN}.jar -C classes . || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r assets data dice_servers maps
+
+	java-pkg_dojar ${PN}.jar
+	java-pkg_newjar lib/derby-*.jar derby.jar
+
+	java-pkg_dolauncher ${PN} \
+		--main games.strategy.engine.framework.GameRunner \
+		--java_args "-Xmx256m"
+	java-pkg_dolauncher ${PN}-server -pre "${FILESDIR}"/mkdir.sh \
+		--main games.strategy.engine.lobby.server.LobbyServer \
+		--java_args "-server -Xmx64m -Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true"
+
+	newicon icons/triplea_icon.png ${PN}.png
+	newicon icons/triplea_icon.png ${PN}-server.png
+	make_desktop_entry ${PN} TripleA
+	make_desktop_entry ${PN}-server TripleA-server
+
+	dodoc changelog.txt TripleA_RuleBook.pdf
+	docinto html
+	dodoc -r doc/* readme.html
+}
diff --git a/games-strategy/ufoai-2.5.0_p20180603 b/games-strategy/ufoai-2.5.0_p20180603
deleted file mode 100644
index 9cd2dd2241f5..000000000000
--- a/games-strategy/ufoai-2.5.0_p20180603
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=net-misc/curl sys-libs/zlib client? ( media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/xvid virtual/jpeg:0 virtual/opengl ) editor? ( dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/jpeg:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gtksourceview:2.0 ) server? ( media-libs/libsdl2[threads] ) app-arch/unzip sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=UFO: Alien Invasion - X-COM inspired strategy game
-EAPI=6
-HOMEPAGE=https://ufoai.org/
-IUSE=+client cpu_flags_x86_sse debug editor server
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT
-RDEPEND=net-misc/curl sys-libs/zlib client? ( media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/xvid virtual/jpeg:0 virtual/opengl ) editor? ( dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/jpeg:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gtksourceview:2.0 ) server? ( media-libs/libsdl2[threads] )
-REQUIRED_USE=|| ( client editor server )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~chewi/distfiles/ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip mirror://sourceforge/ufoai/ufoai-2.5-data.tar editor? ( mirror://sourceforge/ufoai/ufoai-2.5-mappack.tar.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27aa020fae069b203d11a24b84d3f967
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
new file mode 100644
index 000000000000..afc325d031c8
--- /dev/null
+++ b/games-strategy/ufoai/Manifest
@@ -0,0 +1,6 @@
+AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5adf981e5062eb75bffaac51c127fe056e00da59238d91a0b1916d6325ea7e643a87e0945ac3ef20d8f2b958cc88904d96ed9c3 SHA512 b8a61ca5be370bc7fec5d97317e950b2654e6ffe4ffef4473b64f1a37af5dfbfa9152ef4e5bb11e2217bdadae04e7499ef19b67bfdfb32c5ab4a200ac5798ffc
+DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
+DIST ufoai-2.5-mappack.tar.bz2 12200150 BLAKE2B d20f96f74a4b71a4ff55e4e3f81380ee35a71c6e34d35e6300487c916f2d836e240428e8f8529cca13d46ccd5440e7f59d5bfe5f451a2cd84469f8f1e85dc796 SHA512 0f44cc3d99ceb80f91e5df0f7cbd57ce3170f5635feb082c002ab9a0f4f81216b05c346c698475c33e88f97032186f4620bad71d02bfa95ecb5c5d4f68c71994
+DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
+EBUILD ufoai-2.5.0_p20180603.ebuild 3972 BLAKE2B dc47c6537bbf7f4f824300bb639009b64d7cb27fe0f36a334c79617fdac03ab4c4c7d2ef1068121c8730c8775bdc988828496f9366507dde30154b756ecf78f8 SHA512 65256cda61fda4e051a859836841fa8575e8dd224242781e7b444c403bc51ef71807eed6ba919194a9d31719b64c67a430df3b92959ff0f4654b04bf7a38f6e6
+MISC metadata.xml 536 BLAKE2B d0037cae0706304da8c17767d8980eadd1b437bce5f75e980e3a42113b2596d6ed0017962720a9f0c1cc726ceb63028249d5b87b57cf1166dee03d4b884f5d42 SHA512 e02322e3077645800fdc90673261658fe0c33f5e20282cdf40a1867ce85e07e79967f38999031c652f259520489cc65942ae252f8a26182cbdeae6ac5024271d
diff --git a/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch
new file mode 100644
index 000000000000..5c92f433e279
--- /dev/null
+++ b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch
@@ -0,0 +1,37 @@
+* Prevent stripping
+* Prevent installation of useless wrappers
+* Install binaries to the right locations
+
+Chewi
+2018/06/05
+
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2018-06-03 21:55:40.000000000 +0100
++++ b/Makefile	2018-06-05 22:29:08.666944853 +0100
+@@ -33,8 +33,8 @@
+ CONFIGURE_PREFIX ?=
+ 
+ INSTALL         ?= install
+-INSTALL_PROGRAM ?= $(INSTALL) -m 755 -s
+-INSTALL_SCRIPT  ?= $(INSTALL) -m 755
++INSTALL_PROGRAM ?= $(INSTALL) -m 755
++INSTALL_SCRIPT  ?= true
+ INSTALL_DIR     ?= $(INSTALL) -d
+ INSTALL_MAN     ?= $(INSTALL) -m 444
+ INSTALL_DATA    ?= $(INSTALL) -m 444
+@@ -162,8 +162,13 @@
+ 
+ install-$(1): $($(1)_FILE)
+ 	@echo 'Install $$<'
+-	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGDATADIR)/$(dir $($(1)_FILE))
+-	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGDATADIR)/$$<
++	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGBINDIR)/
++	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGBINDIR)/
++
++install-game: $(game_FILE)
++	@echo 'Install $$<'
++	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGLIBDIR)/
++	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGLIBDIR)/$(notdir $(game_FILE))
+ 
+ uninstall-$(1):
+ 	@echo 'Uninstall $($(1)_FILE)'
diff --git a/games-strategy/ufoai/metadata.xml b/games-strategy/ufoai/metadata.xml
new file mode 100644
index 000000000000..916e44355c73
--- /dev/null
+++ b/games-strategy/ufoai/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <use>
+    <flag name="client">Build the main game client</flag>
+    <flag name="editor">Build the map editor and compiler</flag>
+    <flag name="server">Build the dedicated server</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">ufoai</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
new file mode 100644
index 000000000000..0fd98165739d
--- /dev/null
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop flag-o-matic gnome2-utils toolchain-funcs versionator
+
+# 2.5.0 requires several patches
+COMMIT="8b4533e85fdc0665889ff285e1521432084ee784"
+
+# UFO:AI v2.5.0 was uploaded to SourceForge as 2.5
+DIST_VERSION=$(get_version_component_range 1-2)
+
+# Install game data here
+DATADIR="/usr/share/${PN}"
+
+DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
+HOMEPAGE="https://ufoai.org/"
+SRC_URI="
+	https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
+	mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
+	editor? ( mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-mappack.tar.bz2 )
+"
+
+# https://ufoai.org/licenses/
+LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client cpu_flags_x86_sse debug editor server"
+REQUIRED_USE="|| ( client editor server )"
+
+RDEPEND="
+	net-misc/curl
+	sys-libs/zlib
+
+	client? (
+		media-libs/libogg
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,opengl,sound,threads,video]
+		media-libs/libtheora
+		media-libs/libvorbis
+		media-libs/sdl2-mixer
+		media-libs/sdl2-ttf
+		media-libs/xvid
+		virtual/jpeg:0
+		virtual/opengl
+	)
+
+	editor? (
+		dev-libs/glib:2
+		dev-libs/libxml2:2
+		media-libs/libogg
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,opengl,sound,threads,video]
+		media-libs/libvorbis
+		media-libs/openal
+		virtual/glu
+		virtual/jpeg:0
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/gtkglext
+		x11-libs/gtksourceview:2.0
+	)
+
+	server? (
+		media-libs/libsdl2[threads]
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+PATCHES=( "${FILESDIR}"/${P}-install.patch )
+
+src_unpack() {
+	use editor && unpack ${PN}-${DIST_VERSION}-mappack.tar.bz2
+	unpack ${PN}-code-${COMMIT}.zip
+	cd "${S}" || die
+	unpack ${PN}-${DIST_VERSION}-data.tar
+}
+
+src_prepare() {
+	default
+
+	# Make the build system a bit happier, will be fixed upstream
+	mkdir -p base/{maps,models} contrib/installer/mojosetup/scripts || die
+}
+
+src_configure() {
+	# Avoid noise, will be present in 2.6
+	append-cxxflags -Wno-expansion-to-defined
+
+	# The configure script of UFO:AI is hand crafted and a bit special
+	# econf does not work: "invalid option --build=x86_64-pc-linux-gnu"
+	local config=(
+		--prefix="${EPREFIX}"/usr
+		--datadir="${EPREFIX}${DATADIR}"
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+		--localedir="${EPREFIX}"/usr/share/locale
+		--disable-dependency-tracking
+		--disable-paranoid
+		--disable-memory
+		--disable-testall
+		--disable-ufomodel
+		--disable-ufoslicer
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable !debug release)
+		$(use_enable server ufoded)
+		$(use_enable client ufo)
+		$(use_enable editor uforadiant)
+		$(use_enable editor ufo2map)
+	)
+
+	if use client || use server; then
+		config+=( --enable-game )
+	else
+		config+=( --disable-game )
+	fi
+
+	echo ./configure "${config[@]}"
+
+	CC=$(tc-getCC) CXX=$(tc-getCXX) \
+	  ./configure "${config[@]}" || die "configure failed"
+}
+
+src_compile() {
+	emake all lang Q=
+}
+
+src_install() {
+	newicon -s 32 src/ports/linux/ufo.png ${PN}.png
+	emake install Q= DESTDIR="${D}"
+
+	if use client; then
+		doman debian/ufo.6
+		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
+	fi
+
+	if use server; then
+		doman debian/ufoded.6
+		make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN} "Game;StrategyGame" "Terminal=true"
+	fi
+
+	if use editor; then
+		doman debian/ufo{2map,radiant}.6
+		make_desktop_entry uforadiant "UFO: Alien Invasion Map editor" ${PN}
+
+		# Install map editor data (without the binary)
+		rm radiant/uforadiant || die
+		insinto "${DATADIR}"
+		doins -r radiant
+
+		# Install map sources
+		insinto "${DATADIR}"/base/maps
+		doins -r "${WORKDIR}"/${PN}-${DIST_VERSION}-mappack/*
+	fi
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-strategy/uqm-0.7.0-r4 b/games-strategy/uqm-0.7.0-r4
deleted file mode 100644
index 59348449782f..000000000000
--- a/games-strategy/uqm-0.7.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4:0= media-libs/libsdl[X,sound,joystick,video] media-libs/libvorbis media-libs/sdl-image[png] sys-libs/zlib opengl? ( virtual/opengl ) virtual/pkgconfig
-DESCRIPTION=The Ur-Quan Masters: Port of Star Control 2
-EAPI=6
-HOMEPAGE=http://sc2.sourceforge.net/
-IUSE=music opengl remix voice
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4:0= media-libs/libsdl[X,sound,joystick,video] media-libs/libvorbis media-libs/sdl-image[png] sys-libs/zlib opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/sc2/uqm-0.7.0-source.tgz mirror://sourceforge/sc2/uqm-0.7.0-content.uqm music? ( mirror://sourceforge/sc2/uqm-0.7.0-3domusic.uqm ) voice? ( mirror://sourceforge/sc2/uqm-0.7.0-voice.uqm ) remix? ( mirror://sourceforge/sc2/uqm-remix-disc1.uqm mirror://sourceforge/sc2/uqm-remix-disc2.uqm mirror://sourceforge/sc2/uqm-remix-disc3.uqm mirror://sourceforge/sc2/uqm-remix-disc4.uqm )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9017540f548e049899417cff35387d98
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
new file mode 100644
index 000000000000..9617b8304bd2
--- /dev/null
+++ b/games-strategy/uqm/Manifest
@@ -0,0 +1,12 @@
+AUX uqm-0.7.0-tempdir.patch 510 BLAKE2B bed2ffb2c9051accfc971268efc9c5769a43f87c22a5ac5bbeda86d171e69e9927671c0b8aaa2d16981febc15f62fb47fb80fb2e5fb4e46434ba7b97b4b0993a SHA512 07dc48c646e6e3642a1c917aa763996eaef8bae21e72470159b445e20e3e3315663009b4fd30c93a7f5b04ec78bf12de254434094f3c62ca523466148a2a9594
+AUX uqm-0.7.0-warning.patch 862 BLAKE2B 8e07610eea56c3c778cff5143284551a8230b35fb20ba15c11ff8266b67cedfaaa3de3c72c3aa3bf936e4799ef62bba8524e7cbe911f81c4d183f45762a38779 SHA512 d15b09a13b82a888a5c50c5e561213e755f104cb1f7b42bf3fdc7c39350bb517111c8d212218126c89136a2a4a7c47bcc4354e7c53a9df72795ce123a619a256
+DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
+DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348 SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
+DIST uqm-0.7.0-source.tgz 1562003 BLAKE2B 682f87b4967b1aef298dd576dd37cef838f2eaf42f2212fc3af70bf7319e5284cc9bff616d8db3a36a7f2760d2f47f714bcaa2f4f3d35993892a78cdadc85e54 SHA512 443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815
+DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625 SHA512 693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
+DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814de017700d7e6dcb1a065dff2a37d47239fdacbb2ba7639a788d795ac45579952aa7f78b760aa9dc8e3aa9d2ccde SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b
+DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
+DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
+DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
+EBUILD uqm-0.7.0-r4.ebuild 2887 BLAKE2B b9bcdc61a47019fefe86f46453e7413efe252a7e7169d9fed3b4d93c00b045228bd0a3956b0d8013388128eb16b30ab2aab1010b8ebce093bd29f70dbd3a9b20 SHA512 2c551fcce44049917d348d04d011c095ed0e92ba2ba7ca38f0430c2ad83e5e13c1c96951b0be0e03a23a49cb044aee4a281815d5dd9c3de7e80b9febd176f58f
+MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1
diff --git a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch b/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
new file mode 100644
index 000000000000..dbb693c660a8
--- /dev/null
+++ b/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
@@ -0,0 +1,14 @@
+# leaves files lying around bug #576098
+
+diff -ru uqm-0.7.0.orig/build/unix/config_functions uqm-0.7.0/build/unix/config_functions
+--- uqm-0.7.0.orig/build/unix/config_functions	2011-05-20 15:25:22.000000000 -0400
++++ uqm-0.7.0/build/unix/config_functions	2016-03-09 02:46:41.512465876 -0500
+@@ -16,7 +16,7 @@
+ #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ BUILDLOG=/dev/null
+-TEMPFILE="/tmp/build.$$.tmp"
++TEMPFILE="${T:-/tmp}/build.$$.tmp"
+ #KEEPTEMPFILES=keeptempfiles
+ 
+ 
diff --git a/games-strategy/uqm/files/uqm-0.7.0-warning.patch b/games-strategy/uqm/files/uqm-0.7.0-warning.patch
new file mode 100644
index 000000000000..7f05ee5bd1eb
--- /dev/null
+++ b/games-strategy/uqm/files/uqm-0.7.0-warning.patch
@@ -0,0 +1,29 @@
+--- ./src/libs/sound/decoders/aiffaud.c.orig	2011-05-20 15:24:44.000000000 -0400
++++ ./src/libs/sound/decoders/aiffaud.c	2016-03-10 00:53:37.336198208 -0500
+@@ -307,7 +307,7 @@
+ {
+ 	int bytes;
+ 
+-	memset(fmt, sizeof(*fmt), 0);
++	memset(fmt, 0, sizeof(*fmt));
+ 	if (size < AIFF_COMM_SIZE)
+ 	{
+ 		aifa->last_error = aifae_BadFile;
+@@ -369,7 +369,7 @@
+ 	aifa->max_pcm = 0;
+ 	aifa->data_ofs = 0;
+ 	memset(&aifa->fmtHdr, 0, sizeof(aifa->fmtHdr));
+-	memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
++	memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
+ 
+ 	// read wave header
+ 	if (!aifa_readFileHeader (aifa, &fileHdr))
+@@ -635,7 +635,7 @@
+ 
+ 	// reset previous values for SDX2 on seek ops
+ 	// the delta will recover faster with reset
+-	memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
++	memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
+ 
+ 	return pcm_pos;
+ }
diff --git a/games-strategy/uqm/metadata.xml b/games-strategy/uqm/metadata.xml
new file mode 100644
index 000000000000..0a1a6fc92acb
--- /dev/null
+++ b/games-strategy/uqm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
+  <use>
+    <flag name="music">download and install music files (large)</flag>
+    <flag name="remix">download and install music remix files (large)</flag>
+    <flag name="voice">download and install voice files (large)</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">sc2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-strategy/uqm/uqm-0.7.0-r4.ebuild b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
new file mode 100644
index 000000000000..f04136716330
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop toolchain-funcs
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
+	mirror://sourceforge/sc2/${P}-content.uqm
+	music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+	voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+	remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="music opengl remix voice"
+
+RDEPEND="
+	media-libs/libmikmod
+	media-libs/libogg
+	>=media-libs/libpng-1.4:0=
+	media-libs/libsdl[X,sound,joystick,video]
+	media-libs/libvorbis
+	media-libs/sdl-image[png]
+	sys-libs/zlib
+	opengl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	local myopengl
+
+	use opengl \
+		&& myopengl=opengl \
+		|| myopengl=pure
+
+	eapply \
+		"${FILESDIR}"/${P}-tempdir.patch \
+		"${FILESDIR}"/${P}-warning.patch
+
+	cat <<-EOF > config.state
+	CHOICE_debug_VALUE='nodebug'
+	CHOICE_graphics_VALUE='${myopengl}'
+	CHOICE_sound_VALUE='mixsdl'
+	CHOICE_accel_VALUE='plainc'
+	INPUT_install_prefix_VALUE='/usr/share'
+	INPUT_install_bindir_VALUE='\$prefix/bin'
+	INPUT_install_libdir_VALUE='\$prefix/lib'
+	INPUT_install_sharedir_VALUE='/usr/share/'
+	EOF
+
+	# Take out the read so we can be non-interactive.
+	sed -i \
+		-e '/read CHOICE/d' build/unix/menu_functions || die
+
+	# respect CFLAGS
+	sed -i \
+		-e "s/-O3//" build/unix/build.config || die
+
+	sed -i \
+		-e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
+		build/unix/uqm-wrapper.in || die
+
+	# respect CC
+	sed -i \
+		-e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
+		build/unix/config_proginfo_build || die
+}
+
+src_compile() {
+	MAKE_VERBOSE=1 ./build.sh uqm || die
+}
+
+src_install() {
+	# Using the included install scripts seems quite painful.
+	# This manual install is totally fragile but maybe they'll
+	# use a sane build system for the next release.
+	newbin uqm-wrapper uqm
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe uqm
+
+	insinto /usr/share/${PN}/content/packages
+	doins "${DISTDIR}"/${P}-content.uqm
+	echo ${P} > "${ED}"/usr/share/${PN}/content/version || die
+
+	insinto /usr/share/${PN}/content/addons
+	if use music; then
+		doins "${DISTDIR}"/${P}-3domusic.uqm
+	fi
+
+	if use voice; then
+		doins "${DISTDIR}"/${P}-voice.uqm
+	fi
+
+	if use remix; then
+		insinto /usr/share/${PN}/content/addons
+		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
+	fi
+
+	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt
+	docinto devel
+	dodoc doc/devel/[!n]*
+	docinto devel/netplay
+	dodoc doc/devel/netplay/*
+	make_desktop_entry uqm "The Ur-Quan Masters"
+}
diff --git a/games-strategy/wargus-2.4.1 b/games-strategy/wargus-2.4.1
deleted file mode 100644
index bf5d0bbe02fe..000000000000
--- a/games-strategy/wargus-2.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND==games-engines/stratagus-2.4.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Warcraft II for the Stratagus game engine
-EAPI=6
-HOMEPAGE=http://wargus.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=games-strategy/wargus-data
-RDEPEND==games-engines/stratagus-2.4.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/Wargus/wargus/archive/v2.4.1.tar.gz -> wargus-2.4.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21f9bf5beabef6e75ffd4aef26f7599e
diff --git a/games-strategy/wargus-data-0-r1 b/games-strategy/wargus-data-0-r1
deleted file mode 100644
index 30d8671dc796..000000000000
--- a/games-strategy/wargus-data-0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=games-strategy/wargus media-sound/cdparanoia media-sound/timidity++ media-video/ffmpeg2theora
-DESCRIPTION=Warcraft II data for wargus (needs DOS CD)
-EAPI=6
-HOMEPAGE=http://wargus.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-PROPERTIES=interactive
-RESTRICT=userpriv
-SLOT=0
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	portability	2b88d3ecc35035a3b8ab628b49cafb0e
-_md5_=0f0563cee2808c9c204c3aff4b28dd27
diff --git a/games-strategy/wargus-data/Manifest b/games-strategy/wargus-data/Manifest
new file mode 100644
index 000000000000..cdc0c6b308dd
--- /dev/null
+++ b/games-strategy/wargus-data/Manifest
@@ -0,0 +1,2 @@
+EBUILD wargus-data-0-r1.ebuild 951 BLAKE2B e03d8ca96a4dc70886269ef8ae36c33e73924cb45c80fdf49f62bb51847645d557f0d2ed1df298f70371d8a7b9351b25bf9e28114e5f1744a383b1315b734fc3 SHA512 dc3e4e3e44073d25236761b605ac892e513681d4088f8f202a02dede6559a59a68ab1e207f23b17d7bef01c1f44b54cd5108399e32e3503ecfcf672704801268
+MISC metadata.xml 329 BLAKE2B aad962070eacf1667ce2bed4939e290802eadb53bbb1e8ffe8ca13f9c006c45818f9dda522e6ba0d92d1404c8691a7d76a2636caee3657cd6ac3d947f0df2449 SHA512 fedeb73a5c2116db0073c51166b5c3fcf1c5667f5bb0db1b21f7643a6a8f247624738c883af3e457d6a6a7c2b5d39da6c26ffb2cecc847e64501bd659f1f119e
diff --git a/games-strategy/wargus-data/metadata.xml b/games-strategy/wargus-data/metadata.xml
new file mode 100644
index 000000000000..ee6903c19afc
--- /dev/null
+++ b/games-strategy/wargus-data/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">wargus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/wargus-data/wargus-data-0-r1.ebuild b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
new file mode 100644
index 000000000000..9636a8e03f33
--- /dev/null
+++ b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cdrom
+
+DESCRIPTION="Warcraft II data for wargus (needs DOS CD)"
+HOMEPAGE="http://wargus.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# wargus is needed for wartool (bug #578340)
+DEPEND="
+	games-strategy/wargus
+	media-sound/cdparanoia
+	media-sound/timidity++
+	media-video/ffmpeg2theora"
+# wrt bug #419331
+RESTRICT="userpriv"
+
+S=${WORKDIR}
+
+src_configure() {
+	export CDROM_NAME="WARCRAFT2"
+	cdrom_get_cds data/rezdat.war
+}
+
+src_compile() {
+	# cdparanoia needs write acces to the cdrom device
+	# this fixes sandbox violation wrt #418051
+	local save_sandbox_write=${SANDBOX_WRITE}
+	addwrite /dev
+	"${EPREFIX}"/usr/bin/wartool -v -r "${CDROM_ROOT}"/data "${S}"/ || die
+	SANDBOX_WRITE=${save_sandbox_write}
+}
+
+src_install() {
+	insinto /usr/share/stratagus/wargus
+	doins -r .
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
new file mode 100644
index 000000000000..a543cdcaff82
--- /dev/null
+++ b/games-strategy/wargus/Manifest
@@ -0,0 +1,3 @@
+DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0
+EBUILD wargus-2.4.1.ebuild 1015 BLAKE2B 2ec460a15d26df522ead61b9863618d24057da3b48e73eedb8888017369b94458e87e4792f05d6eb965412c3fee8b21a8fbaf8868065d46948e1e8acfdc0f793 SHA512 4b5b967cfbd52156e3fbe32eb75829ef627ef69534fb5994ad3d0a76ad4280cb89026eed1a5eef643c198865781a32eccb3d9308b356b3b00ae936fe736fd9f8
+MISC metadata.xml 378 BLAKE2B ea732d1cff85972c33a4fef5281b71f5e3bcf7663e864b00891802ee353fab9b33bd93fc6e76ff8123ba4dd8e77dc4889f3a8d044d7c664782c07629b2f942e6 SHA512 ccc5c5ce04783ccd03e482797fd8941fae5c1ba32936641b762595a03606996157637f5155a80eb7284fa2f290b8883b12a1b9b9ba83cf2693876f3cd269617f
diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml
new file mode 100644
index 000000000000..734f09c524c3
--- /dev/null
+++ b/games-strategy/wargus/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">wargus</remote-id>
+		<remote-id type="sourceforge">wargus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/wargus/wargus-2.4.1.ebuild b/games-strategy/wargus/wargus-2.4.1.ebuild
new file mode 100644
index 000000000000..e88a97f6bba3
--- /dev/null
+++ b/games-strategy/wargus/wargus-2.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="http://wargus.sourceforge.net/"
+SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="games-strategy/wargus-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin"/stratagus
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog "Enabling OpenGL in-game seems to cause segfaults/crashes."
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/warmux-11.04.1-r1 b/games-strategy/warmux-11.04.1-r1
deleted file mode 100644
index aa9442070ed5..000000000000
--- a/games-strategy/warmux-11.04.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx media-fonts/dejavu net-misc/curl x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A free Worms clone
-EAPI=6
-HOMEPAGE=http://gna.org/projects/warmux/
-IUSE=debug nls unicode
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx media-fonts/dejavu net-misc/curl x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
-SLOT=0
-SRC_URI=http://download.gna.org/warmux/warmux-11.04.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5dd3be27060fe7e515483284b7e23e74
diff --git a/games-strategy/warmux/Manifest b/games-strategy/warmux/Manifest
new file mode 100644
index 000000000000..822667f27489
--- /dev/null
+++ b/games-strategy/warmux/Manifest
@@ -0,0 +1,9 @@
+AUX warmux-11.04.1-action.patch 549 BLAKE2B d22e26bae34efd28729cbdb98e97365fb2e42de0bc8c464d2ccc9f2845a78d92716b8d432ae72deedd824938a5243aa3736baeccf7c12ec3cfba7c10573dd4d7 SHA512 c31ac142b43e593f4c7b9fff36a8dd0bb34b371a63935cf55627660d96eda8fe68af721254bd72a2168045a27b32a407df494eb6b216115a0bb0516478187ec9
+AUX warmux-11.04.1-fix-c++14.patch 488 BLAKE2B 0f60ce6c6d4238ec9eaa06428b4ff251fca1bfb8e3d05cb5c57a9a5d9e229c0775b76fffe33704aa6d8b636959cffc4f529d19cd09065e5842ccfd89745207cd SHA512 c8c6d5d070e926f7ffd03766c95481c0db8b43a8a0f3fad301e7e7210013098696ad5af0c5ab8c70f0081711b6b50847d8873af0ea79315c4c45c760e915eb88
+AUX warmux-11.04.1-gcc47.patch 335 BLAKE2B cfa1e6b42a00a0683c06257bd9156a8a85eef3181ba385f3eb4a82f944259cd2db1b0b56bccf0f68b6b09505f6825e02394fc07c8cd76bd8772340eefa43bc65 SHA512 33e403ce0dd69ae782ca3696838bfaf8126520b92b3b813ac491559dafd429ae3379131965a49e2c7ca2955a384ce41989f89db611696f999edf41c4abdd1270
+AUX warmux-11.04.1-gentoo.patch 1543 BLAKE2B 23c3cb85c720c0df37ed274dfe824f94ffce3362528bf2967b790bb51d7d8ec5bbd803d019dd0d4a68bc757cbe82bf4ca4f03745ffb6c91cbe76e17c34ce9e8e SHA512 30e565a3b212a3b54c29267b29a43343d21a3fbadf2bc70552fb074b0f174f08cf66a6565f19de4f0187dbfe68e9124fda42a0cd85d592f1d596f217f5c3c4f9
+AUX warmux-11.04.1-stat.patch 1746 BLAKE2B 886a8dc439e1546d823e27bbe2313aeff913d02f754abf4355221b99f504d8408ad1c652a3e61abd4fae10e832284f929c7d31767eca317174619f54eaf5f7db SHA512 f0af67d2109585e6cc02621a9ff249cfe5154783216d46d2c7641ec825a8e30d34767122d12ced8bfd916c3c966cadad49eeb43b44aa1954905950272c0c9902
+AUX warmux-11.04.1-zlib.patch 416 BLAKE2B a41b14d70de3c828368835825a240d8708b7d81cbd64fa0cc06540eee60e4f4bced5d7dd6566d4cec49e9e8ed2f2b03ec9578a334c7223d2b43e8c844f1b950a SHA512 09ccc426514cf96d07fc3b05b7f248b0b77d2e61991afe530cb61b9c5ebf5c9222d2d4716861beed95607653ca4c617c03f244a957c4c6369925bd531ab73d3c
+DIST warmux-11.04.1.tar.bz2 110083622 BLAKE2B 50d575986d780e9e1bde2740297e11d3e720afe8396106ff05cd6051ed57315b8cd94d946b85956981743455c1013c8da91e5db0874db1e226b13bd72b3516eb SHA512 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d
+EBUILD warmux-11.04.1-r1.ebuild 1465 BLAKE2B 266e0cbed986da4ee8ccfcd6982eead0627e1f6d90fbdf4cbe1e4a9c915149ccf0d7a7f289436c4abce4a331325bc2b4977af5268b95e5dfdaba1246e20377e9 SHA512 2e0d118e1a9fbb86fdaeaaa6504629c0ab3d569b90609f7bba13b39476b3a042aa9dad73ae66fd40508af4ee8a5f7bd31d3cf3e21161deb4f48054a51861eeee
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/warmux/files/warmux-11.04.1-action.patch b/games-strategy/warmux/files/warmux-11.04.1-action.patch
new file mode 100644
index 000000000000..e1530337a259
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-action.patch
@@ -0,0 +1,12 @@
+diff -uNr warmux-11.04.orig/lib/warmux/action/action.cpp warmux-11.04/lib/warmux/action/action.cpp
+--- warmux-11.04.orig/lib/warmux/action/action.cpp      2012-03-27 15:18:08.440709875 +0200
++++ warmux-11.04/lib/warmux/action/action.cpp   2012-03-27 15:17:44.871711354 +0200
+@@ -85,7 +85,7 @@
+ {
+   m_creator = _creator;
+
+-  m_header.len = SDLNet_Read32(buffer);
++  m_header.len = SDLNet_Read32((void *)buffer);
+   ASSERT(m_header.len >= sizeof(Header));
+   buffer += 4;
+   // All of the following could be skipped for the actions we now,
+\ No newline at end of file
diff --git a/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
new file mode 100644
index 000000000000..223ee47ab5a2
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
@@ -0,0 +1,14 @@
+In C++14, bool -> T* implicit conversions are not allowed anymore.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=598639
+
+--- a/src/interface/weapon_menu.cpp
++++ b/src/interface/weapon_menu.cpp
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-    return false;
++    return NULL;
+   const std::vector<PolygonItem *>& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff --git a/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch
new file mode 100644
index 000000000000..8460bcbd0b1c
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch
@@ -0,0 +1,11 @@
+Description: Fix FTBFS with gcc 4.7.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+
+--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
++++ warmux-11.04.1+repack/tools/list_games/main.cpp
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <unistd.h>
+ #include <WARMUX_types.h>
+ #include <WARMUX_network.h>
+ #include <WARMUX_index_server.h>
diff --git a/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch b/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch
new file mode 100644
index 000000000000..62d22f84c82d
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch
@@ -0,0 +1,40 @@
+diff -ru warmux-11.04.orig/configure.ac warmux-11.04/configure.ac
+--- warmux-11.04.orig/configure.ac	2011-04-18 16:46:12.000000000 -0400
++++ warmux-11.04/configure.ac	2011-04-19 11:17:27.380256500 -0400
+@@ -43,8 +43,6 @@
+   AC_MSG_ERROR([*** No C++ compiler can be found!])
+ fi
+ 
+-AX_CFLAGS_WARN_ALL([CXXFLAGS])
+-
+ # ==========================================================================
+ # == Set flags for various environments                                    =
+ # ==========================================================================
+@@ -348,14 +346,9 @@
+   exit 1
+ fi
+ 
+-dnl === Add Werror flag for gcc/g++ if debug mode is enabled, ==============
+-dnl === but allow RTTI (ie dynamic_cast, typeid/typeinfo unavailable) ======
+-if test "x${debug}" = "xyes"; then
++if test "x${debug}" != "xyes"; then
+-  CFLAGS="$CFLAGS -Werror"
+-  CXXFLAGS="$CXXFLAGS -Werror"
+-else
+   CXXFLAGS="$CXXFLAGS -fno-rtti"
+ fi
+ 
+ dnl === Forbid exceptions (Android platform requirement) ===================
+ CXXFLAGS="$CXXFLAGS -fno-exceptions"
+diff -ru warmux-11.04.orig/data/Makefile.am warmux-11.04/data/Makefile.am
+--- warmux-11.04.orig/data/Makefile.am	2011-04-18 16:46:11.000000000 -0400
++++ warmux-11.04/data/Makefile.am	2011-04-19 11:17:45.134724536 -0400
+@@ -1,8 +1,2 @@
+-xdg_appsdir = $(prefix)/share/applications
+-xdg_apps_DATA = warmux.desktop warmux_files.desktop
+-pixmapsdir = $(prefix)/share/pixmaps
+-pixmaps_DATA = icon/warmux_128x128.png
+-
+ nobase_dist_pkgdata_DATA = @DATA_FILES@
+ pkgdatadir = @DATADIR@
+-EXTRA_DIST = $(pixmaps_DATA)
diff --git a/games-strategy/warmux/files/warmux-11.04.1-stat.patch b/games-strategy/warmux/files/warmux-11.04.1-stat.patch
new file mode 100644
index 000000000000..487b3805ba6f
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-stat.patch
@@ -0,0 +1,61 @@
+diff -ur warmux-11.04.orig/lib/warmux/tools/file_tools.cpp warmux-11.04/lib/warmux/tools/file_tools.cpp
+--- warmux-11.04.orig/lib/warmux/tools/file_tools.cpp	2011-04-28 21:03:13.000000000 +0200
++++ warmux-11.04/lib/warmux/tools/file_tools.cpp	2013-03-05 16:58:42.040443845 +0100
+@@ -33,6 +33,8 @@
+ #  include <direct.h>
+ #  undef DeleteFile  // windows.h defines it I think
+ #else
++#  include <sys/types.h>
++#  include <sys/stat.h>
+ #  include <stdlib.h> // getenv
+ #  include <unistd.h> // not needed by mingw
+ #endif
+@@ -275,18 +277,14 @@
+ {
+   DIR           *dir;
+   struct dirent *file;
+-#ifdef __SYMBIAN32__
+   std::string    dname;
+-#endif
+ };
+ 
+ FolderSearch* OpenFolder(const std::string& dirname)
+ {
+   FolderSearch *f = new FolderSearch;
+   f->dir = opendir(dirname.c_str());
+-#ifdef __SYMBIAN32__
+   f->dname = dirname;
+-#endif
+ 
+   if (!f->dir) {
+     delete f;
+@@ -300,11 +298,11 @@
+ {
+   while ((f->file = readdir(f->dir)) != NULL) {
+ 
++    if (
+ #ifdef __SYMBIAN32__
+-    if (f->file->d_namlen && DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) {
+-#else
+-    if (f->file->d_type == DT_DIR) {
++      f->file->d_namlen &&
+ #endif
++      DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) {
+       // If we are also looking for files, report it isn't one
+       if (file)
+         file = false;
+@@ -316,11 +314,11 @@
+       continue;
+ 
+     // This is a file and we do search for file
++    if (
+ #ifdef __SYMBIAN32__
+-    if (f->file->d_namlen && DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) {
+-#else
+-    if (f->file->d_type == DT_REG) {
++      f->file->d_namlen &&
+ #endif
++      DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) {
+       file = true;
+       return f->file->d_name;
+     }
diff --git a/games-strategy/warmux/files/warmux-11.04.1-zlib.patch b/games-strategy/warmux/files/warmux-11.04.1-zlib.patch
new file mode 100644
index 000000000000..c7e77aba11c8
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-zlib.patch
@@ -0,0 +1,11 @@
+diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
+--- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
++++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
+@@ -25,6 +25,7 @@
+ #include <SDL_image.h>
+ #include <SDL_rotozoom.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "graphic/surface.h"
+ #include "tool/math_tools.h"
diff --git a/games-strategy/warmux/metadata.xml b/games-strategy/warmux/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-strategy/warmux/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
new file mode 100644
index 000000000000..c62645eee128
--- /dev/null
+++ b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="A free Worms clone"
+HOMEPAGE="http://gna.org/projects/warmux/"
+SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug nls unicode"
+
+RDEPEND="
+	dev-libs/libxml2
+	media-libs/libsdl[joystick,video,X]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	media-libs/sdl-net
+	media-libs/sdl-gfx
+	media-fonts/dejavu
+	net-misc/curl
+	x11-libs/libX11
+	nls? ( virtual/libintl )
+	unicode? ( dev-libs/fribidi )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-11.04
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-zlib.patch
+	"${FILESDIR}"/${P}-action.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-stat.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-localedir-name="${EPREFIX}"/usr/share/locale \
+		--with-datadir-name="${EPREFIX}"/usr/share/${PN} \
+		--with-font-path="${EPREFIX}"/usr/share/fonts/dejavu/DejaVuSans.ttf \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable unicode fribidi)
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}"/usr/share/${PN}/font/DejaVuSans.ttf || die
+	doicon data/icon/warmux.svg
+	make_desktop_entry warmux Warmux
+}
diff --git a/games-strategy/warzone2100-3.2.3 b/games-strategy/warzone2100-3.2.3
deleted file mode 100644
index 4c2e6ef675cd..000000000000
--- a/games-strategy/warzone2100-3.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) !sdl? ( dev-qt/qtopengl:5 dev-qt/qtx11extras:5 ) sdl? ( media-libs/libsdl2[opengl,video,X] ) app-arch/zip dev-libs/fribidi media-libs/fontconfig virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=3D real-time strategy game
-EAPI=6
-HOMEPAGE=http://wz2100.net/
-IUSE=debug nls sdl videos
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
-RDEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) !sdl? ( dev-qt/qtopengl:5 dev-qt/qtx11extras:5 ) sdl? ( media-libs/libsdl2[opengl,video,X] ) media-fonts/dejavu
-SLOT=0
-SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.2.3.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz ) https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> warzone2100-3.2.3-qt_compile_fix.patch
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b4c9a14ce3692eeb3b478f9c84247458
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
new file mode 100644
index 000000000000..2f2136539571
--- /dev/null
+++ b/games-strategy/warzone2100/Manifest
@@ -0,0 +1,5 @@
+DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
+DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
+DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
+EBUILD warzone2100-3.2.3.ebuild 2609 BLAKE2B 05ae8aea178cb29c3776e5c0fcab5ba4442765ec76766689bc35f5cfc23c51bb7524f2dc6b12abdd07e77e87688f74fa13d8fbb705f7a76a7f3acea95b7151ea SHA512 9dcc1c4b6b095ee4ef895abf5b3a5a5d1c4d1e5c371baeced194a2592304aaf71b005a6ecdc0443d0b32f3cfb7998897f6c63d5cf909f5855f0127e91920294c
+MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/metadata.xml b/games-strategy/warzone2100/metadata.xml
new file mode 100644
index 000000000000..ce7f3bcd92b0
--- /dev/null
+++ b/games-strategy/warzone2100/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+	Warzone 2100 offers campaign, multi-player, and single-player
+	skirmish modes. An extensive tech tree with over 400 different
+	technologies, combined with the unit design system, allows for
+	a wide variety of possible units and tactics.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">warzone2100</remote-id>
+		<remote-id type="github">Warzone2100/warzone2100</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
new file mode 100644
index 000000000000..5e292dc3dc77
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs eutils versionator gnome2-utils
+
+MY_PV=$(get_version_component_range -2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+
+SRC_URI+=" https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> ${PN}-3.2.3-qt_compile_fix.patch"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# upstream requested debug support
+IUSE="debug nls sdl videos"
+
+# TODO: unbundle miniupnpc and quesoglc
+# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/harfbuzz
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	nls? ( virtual/libintl )
+	!sdl? (
+		dev-qt/qtopengl:5
+		dev-qt/qtx11extras:5
+	)
+	sdl? ( media-libs/libsdl2[opengl,video,X] )
+"
+DEPEND="
+	${CDEPEND}
+	app-arch/zip
+	dev-libs/fribidi
+	media-libs/fontconfig
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+
+src_prepare() {
+	default
+
+	# https://developer.wz2100.net/ticket/4580
+	eapply "${DISTDIR}/${P}-qt_compile_fix.patch"
+
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+	sed '/appdata\.xml/d' -i icons/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir=/usr/share/doc/${PF}
+		--localedir=/usr/share/locale
+		--with-distributor="Gentoo ${PF}"
+		--with-icondir=/usr/share/icons/hicolor/128x128/apps
+		--with-applicationdir=/usr/share/applications
+		$(use_enable debug debug relaxed)
+		$(use_enable nls)
+		--with-backend=$(usex sdl "sdl" "qt")
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
+	if use videos ; then
+		insinto /usr/share/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+	doman doc/warzone2100.6
+	dodoc doc/quickstartguide.pdf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/wesnoth-1.14.2 b/games-strategy/wesnoth-1.14.2
deleted file mode 100644
index 6ed0861eb31d..000000000000
--- a/games-strategy/wesnoth-1.14.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=6
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc fribidi libressl nls openmp server
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.2.tar.gz -> wesnoth-1.14.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9b3e44a7d6f241612dc9b74b21200f7
diff --git a/games-strategy/wesnoth-1.14.3 b/games-strategy/wesnoth-1.14.3
deleted file mode 100644
index 5035d5d7559d..000000000000
--- a/games-strategy/wesnoth-1.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=6
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc fribidi libressl nls openmp server
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.3.tar.gz -> wesnoth-1.14.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9b3e44a7d6f241612dc9b74b21200f7
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
new file mode 100644
index 000000000000..b4fb5a65e35e
--- /dev/null
+++ b/games-strategy/wesnoth/Manifest
@@ -0,0 +1,6 @@
+AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
+DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e SHA512 010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
+DIST wesnoth-1.14.3.tar.gz 489258637 BLAKE2B bc6c49a768d07387f8f4a285801964acd4476819075cedfd9dd2a0bbe36706e93badd78d4bd4468b687d3d34073c59e4a67dde7a578dabfd26f224233eb87413 SHA512 57c6766edce3b7984da9e6bc795913e1a582e4afac8c287b603ad2173f49d26095af903b3f10938a3b04d4f2921c3a2a5f2239c6c3a4d88222fabd9601a833aa
+EBUILD wesnoth-1.14.2.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
+EBUILD wesnoth-1.14.3.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
+MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/files/wesnothd.rc-r1 b/games-strategy/wesnoth/files/wesnothd.rc-r1
new file mode 100644
index 000000000000..c1a0d9d20167
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnothd.rc-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	checkpath -q -d -m 0750 -o wesnoth:wesnoth /run/wesnothd
+	ebegin "Starting wesnothd"
+	start-stop-daemon --start --quiet -b -m \
+		--pidfile /run/wesnothd/wesnothd.pid \
+		-c wesnoth:wesnoth \
+		--exec /usr/bin/wesnothd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping wesnothd"
+	start-stop-daemon --stop --quiet --pidfile /run/wesnothd/wesnothd.pid
+	eend $?
+}
diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml
new file mode 100644
index 000000000000..cb9b89b8b017
--- /dev/null
+++ b/games-strategy/wesnoth/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="server">Enable compilation of server</flag>
+    <flag name="fribidi">Support for right-to-left languages</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">wesnoth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
new file mode 100644
index 000000000000..27cde05f1ad0
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+	>=dev-libs/boost-1.50:=[nls,threads,icu]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		>=media-libs/sdl2-ttf-2.0.12
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0
+		dbus? ( sys-apps/dbus )
+		fribidi? ( dev-libs/fribidi )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/libX11
+"
+
+pkg_setup() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local langs
+		for lang in $(cat po/LINGUAS)
+		do
+			has $lang $LINGUAS && langs+="$lang "
+		done
+		echo "$langs" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+
+	# Work around eclass
+	append-flags -UNDEBUG
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_FRIBIDI="$(usex fribidi)"
+		-DENABLE_OMP="$(usex openmp)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	DOCS="README.md changelog.md players_changelog.md" cmake-utils_src_install
+	if use dedicated || use server; then
+		rmdir "${ED%/}/run/wesnothd" || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.3.ebuild b/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
new file mode 100644
index 000000000000..27cde05f1ad0
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+	>=dev-libs/boost-1.50:=[nls,threads,icu]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		>=media-libs/sdl2-ttf-2.0.12
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0
+		dbus? ( sys-apps/dbus )
+		fribidi? ( dev-libs/fribidi )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/libX11
+"
+
+pkg_setup() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local langs
+		for lang in $(cat po/LINGUAS)
+		do
+			has $lang $LINGUAS && langs+="$lang "
+		done
+		echo "$langs" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+
+	# Work around eclass
+	append-flags -UNDEBUG
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_FRIBIDI="$(usex fribidi)"
+		-DENABLE_OMP="$(usex openmp)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	DOCS="README.md changelog.md players_changelog.md" cmake-utils_src_install
+	if use dedicated || use server; then
+		rmdir "${ED%/}/run/wesnothd" || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}
diff --git a/games-strategy/widelands-0.18-r1 b/games-strategy/widelands-0.18-r1
deleted file mode 100644
index f2b01a84958d..000000000000
--- a/games-strategy/widelands-0.18-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48:= media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A game similar to Settlers 2
-EAPI=6
-HOMEPAGE=http://www.widelands.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48:= media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip]
-SLOT=0
-SRC_URI=https://launchpad.net/widelands/build18/build-18/+download/widelands-build18-src.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=256643811005a24e5261ba8b629f9c32
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
new file mode 100644
index 000000000000..412c4bbcc75b
--- /dev/null
+++ b/games-strategy/widelands/Manifest
@@ -0,0 +1,4 @@
+AUX widelands-0.18-cxxflags.patch 1061 BLAKE2B e1cacaeebd60325cf79549f55b2968a77862cc34caac79dd86f4fae47d755730851c1f8b60c347ab69aeffcdacba39921fc5790c07cd0ed64c157f509170ea96 SHA512 ad911122384af9c07f3fc35446ed6f7e7bda86768983ee17668dbedcea2bc20eb88d4c43b051860553b6f455bc8655b226223b45b4d4f421ee5032cc380ad591
+DIST widelands-build18-src.tar.bz2 183443325 BLAKE2B 100555b7a800cac1094a768edd40e6b44d6bd0d36386c6f057e0cd81f9b03404b249f259c85d3fae655d7343bb50c41a70f228651530c13092e50190fdd2f9b8 SHA512 9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
+EBUILD widelands-0.18-r1.ebuild 1570 BLAKE2B e580356d83d1698a8943428a811ba154d1582ad13b9fbb8e3004e20be18344e233e2934c03b05fc161afced21493f76e3b422238f3ac3637ba23978d2c7613a9 SHA512 2c3e11eadbe6d26e8d3f176ce2666f37c7e4d1315ecc48abc711c9e5a54de91840ab9322eef1746cc43ffde404cad3aac9f5b928dd8dd122e66d548f2f33a309
+MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/files/widelands-0.18-cxxflags.patch b/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
new file mode 100644
index 000000000000..f6b65400bf82
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
@@ -0,0 +1,12 @@
+diff -ru widelands-build18-src.orig/CMakeLists.txt widelands-build18-src/CMakeLists.txt
+--- widelands-build18-src.orig/CMakeLists.txt	2014-02-22 04:06:51.000000000 -0500
++++ widelands-build18-src/CMakeLists.txt	2016-03-23 23:04:50.536259815 -0400
+@@ -271,7 +271,7 @@
+   ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+ ENDIF (CMAKE_COMPILER_IS_GNUCXX)
+ 
+-set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} ${WL_COMPILERFLAG_OPTIMIZATIONS} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
++set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+ 
+ #If building with MSVC, then check for 3rdparty libs
+ if (DEFINED MSVC)
diff --git a/games-strategy/widelands/metadata.xml b/games-strategy/widelands/metadata.xml
new file mode 100644
index 000000000000..8910ce0417b5
--- /dev/null
+++ b/games-strategy/widelands/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">widelands</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
new file mode 100644
index 000000000000..adee0947e0bc
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.18-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator cmake-utils
+
+MY_PV=build$(get_version_component_range 2)
+MY_P=${PN}-${MY_PV}-src
+
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/lua:0
+	>=dev-libs/boost-1.48:=
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/libsdl[video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	sys-libs/zlib[minizip]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cxxflags.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
+	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWL_VERSION_STANDARD=true
+
+		# Game is NOT happy being moved from /usr/share/games
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/games/${PN}
+
+		-DWL_INSTALL_PREFIX="${EPREFIX}"/usr/games
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
+		-DWL_INSTALL_LOCALEDIR="${EPREFIX}"/usr/share/games/${PN}/locale
+		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon pics/wl-ico-128.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}
diff --git a/games-strategy/xbattleai-1.2.2-r2 b/games-strategy/xbattleai-1.2.2-r2
deleted file mode 100644
index 126c72ecba74..000000000000
--- a/games-strategy/xbattleai-1.2.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXext !games-strategy/xbattle app-text/rman x11-misc/imake x11-base/xorg-proto
-DESCRIPTION=A multi-player game of strategy and coordination
-EAPI=6
-HOMEPAGE=https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/
-KEYWORDS=~amd64 ~x86
-LICENSE=xbattle
-RDEPEND=dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXext !games-strategy/xbattle
-SLOT=0
-SRC_URI=https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/xbattleai-1.2.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eeb33682008afa8a840736614266eddf
diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest
new file mode 100644
index 000000000000..3ced68c2c9b2
--- /dev/null
+++ b/games-strategy/xbattleai/Manifest
@@ -0,0 +1,4 @@
+AUX xbattleai-1.2.2-sandbox.patch 4167 BLAKE2B e6336e72f4c466475e164e997bcef44d4c5fd96f457d08f2d1326761fade15e911ab048f05e63e4cadfdd955a90adce763c9b1facace8c33145e49b61482ad54 SHA512 013bd282c53f9a99b530b5a75907f7cc7b6829a0b20b7f77668325e1e12f2d8257019f68d1ccd147ac69d14d217412a31a3dcb3feaf2b55c39ae80545f956076
+DIST xbattleai-1.2.2.tgz 1511991 BLAKE2B f4372d9521ba878b53132a00392b3254d90642e0993920b44235eeb6ef1d874a32c7583983aecabf96ad245795820bb42c59a07c850db655ef7803f9216b61ed SHA512 41ac0f558b3adc697897903f5c9ed0d411867c405f0452282958083db7637c97a19f0ac9727e5123648a12dd2dcc5a304031efaab6089068b9f542e5db185e18
+EBUILD xbattleai-1.2.2-r2.ebuild 989 BLAKE2B 483226fc6c987f27424b9b211049cde75bc2097bd65b56d7cdba96cbad66ea881bafda0c633b87ea7dd1e230efdab8735bbe68b6e9e489b39e0a78ded1389f75 SHA512 60ecbc9efe6394b2527d4d7dda9ea767fd8818e51a5942f5e2661b00997ef78d2a46b7bc75b38f7d3f9061f448603ccded22e35e430862c1d4fc9cb3369d30a7
+MISC metadata.xml 1356 BLAKE2B 13ecdee27af4359fa0052f3db53c55243a92de5fb9419272f8f97cb576ebbb8bdc04734bb10b72088e6ba31ea6ec9d32c129fb6704f037d30bd41f2a0b81db96 SHA512 fca551005a6b3e52d30e6a53b82e8d961debba3654a4e4f99e8cd23818a15bf4adfbcc1ffbd19cbe892c0118e5b24a5e83846ab7d72f8613c2e02cd58327cf7f
diff --git a/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch b/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
new file mode 100644
index 000000000000..56d63ac694e4
--- /dev/null
+++ b/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
@@ -0,0 +1,114 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -200,87 +200,87 @@
+ .PHONY: install-bin
+ 
+ install-bin: ${TARGET} ${SCRIPTS}
+-	${INSTALL_DIRS} ${bindir}
++	${INSTALL_DIRS} ${DESTDIR}/${bindir}
+ 	@list='${TARGET} ${SCRIPTS}'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_PROGRAM} $$p ${bindir}"; \
+-	    ${INSTALL_PROGRAM} $$p ${bindir}; \
++	    ${INSTALL_PROGRAM} $$p ${DESTDIR}/${bindir}; \
+ 	  else :; fi; \
+ 	done
+ 
+ .PHONY: install-man
+ 
+ install-man:
+-	${INSTALL_DIRS} ${mandir}
++	${INSTALL_DIRS} ${DESTDIR}/${mandir}
+ 	@list='${MAN1}'; for p in $$list; do \
+ 	  ${INSTALL_DIRS} ${mandir}/man1; \
+ 	  if test -f ${SRC_DIR}/$${p}.man; then \
+ 	    ${ECHO} "${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man1/$${p}.1"; \
+-	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man1/$${p}.1; \
++	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${DESTDIR}/${mandir}/man1/$${p}.1; \
+ 	  else :; fi; \
+ 	done
+ 	@list='${MAN6}'; for p in $$list; do \
+-	  ${INSTALL_DIRS} ${mandir}/man6; \
++	  ${INSTALL_DIRS} ${DESTDIR}/${mandir}/man6; \
+ 	  if test -f ${SRC_DIR}/$${p}.man; then \
+ 	    ${ECHO} "${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man6/$${p}.6"; \
+-	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man6/$${p}.6; \
++	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${DESTDIR}/${mandir}/man6/$${p}.6; \
+ 	  else :; fi; \
+ 	done
+ 
+ .PHONY: install-share
+ 
+ install-share:
+-	${INSTALL_DIRS} ${XBO_DIR}
++	${INSTALL_DIRS} ${DESTDIR}/${XBO_DIR}
+ 	@list='${SRC_DIR}/xbos/*'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_DATA} $$p ${XBO_DIR}"; \
+-	    ${INSTALL_DATA} $$p ${XBO_DIR}; \
++	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBO_DIR}; \
+ 	  else :; fi; \
+ 	done
+-	${INSTALL_DIRS} ${XBT_DIR}
++	${INSTALL_DIRS} ${DESTDIR}/${XBT_DIR}
+ 	@list='${SRC_DIR}/xbts/*'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_DATA} $$p ${XBT_DIR}"; \
+-	    ${INSTALL_DATA} $$p ${XBT_DIR}; \
++	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBT_DIR}; \
+ 	  else :; fi; \
+ 	done
+-	${INSTALL_DIRS} ${XBA_DIR}
++	${INSTALL_DIRS} ${DESTDIR}/${XBA_DIR}
+ 	@list='${SRC_DIR}/xbas/*'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_DATA} $$p ${XBA_DIR}"; \
+-	    ${INSTALL_DATA} $$p ${XBA_DIR}; \
++	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBA_DIR}; \
+ 	  else :; fi; \
+ 	done
+-	${INSTALL_DIRS} ${IMG_DIR}
++	${INSTALL_DIRS} ${DESTDIR}/${IMG_DIR}
+ 	@list='${SRC_DIR}/images/*'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_DATA} $$p ${IMG_DIR}"; \
+-	    ${INSTALL_DATA} $$p ${IMG_DIR}; \
++	    ${INSTALL_DATA} $$p ${DESTDIR}/${IMG_DIR}; \
+ 	  else :; fi; \
+ 	done
+-	${INSTALL_DIRS} ${SND_DIR}
++	${INSTALL_DIRS} ${DESTDIR}/${SND_DIR}
+ 	@list='${SRC_DIR}/snd/*'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_DATA} $$p ${SND_DIR}"; \
+-	    ${INSTALL_DATA} $$p ${SND_DIR}; \
++	    ${INSTALL_DATA} $$p ${DESTDIR}/${SND_DIR}; \
+ 	  else :; fi; \
+ 	done
+-	${INSTALL_DIRS} ${XBC_DIR}
++	${INSTALL_DIRS} ${DESTDIR}/${XBC_DIR}
+ 	@list='${SRC_DIR}/xbcs/*'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_DATA} $$p ${XBC_DIR}"; \
+-	    ${INSTALL_DATA} $$p ${XBC_DIR}; \
++	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBC_DIR}; \
+ 	  else :; fi; \
+ 	done
+-	${INSTALL_DIRS} ${GC_DIR}
+-	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.dat ${GC_DIR};
+-	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.xbo ${GC_DIR};
+-	${INSTALL_PROGRAM} ${SRC_DIR}/gauntlet/gauntlet_interp.awk ${GC_DIR};
+-	${INSTALL_DIRS} ${GC_DIR}/gauntlet_levels
++	${INSTALL_DIRS} ${DESTDIR}/${GC_DIR}
++	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.dat ${DESTDIR}/${GC_DIR};
++	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.xbo ${DESTDIR}/${GC_DIR};
++	${INSTALL_PROGRAM} ${SRC_DIR}/gauntlet/gauntlet_interp.awk ${DESTDIR}/${GC_DIR};
++	${INSTALL_DIRS} ${DESTDIR}/${GC_DIR}/gauntlet_levels
+ 	@list='${SRC_DIR}/gauntlet/gauntlet_levels/*'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    ${ECHO} "${INSTALL_DATA} $$p ${GC_DIR}/gauntlet_levels"; \
+-	    ${INSTALL_DATA} $$p ${GC_DIR}/gauntlet_levels; \
++	    ${INSTALL_DATA} $$p ${DESTDIR}/${GC_DIR}/gauntlet_levels; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/games-strategy/xbattleai/metadata.xml b/games-strategy/xbattleai/metadata.xml
new file mode 100644
index 000000000000..d5cbe36e0094
--- /dev/null
+++ b/games-strategy/xbattleai/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+From the HOMEPAGE:
+XBattle is a concurrent multi-player arcade/strategy game that captures
+the dynamics of a wide range of military situations through numerous
+options. The game board is a matrix of game cells which can be occupied
+by troops of various colors, with troop strength indicated by the size of
+colored markers within a cell. Troops are commanded by clicking the mouse
+near the edge of an occupied cell in the direction that movement is to take
+place. XBattle is concurrent, so that commands are given continuously by
+all players without waiting for turns. A command will be acknowledged by
+the appearance of a command vector, and thereafter, in each update cycle,
+a certain proportion of the troops will move from the source cell to the
+destination cell. In this way, troops can be slowly redistributed via
+supply lines which steadily deliver troops to their endpoints. Troops
+of different colors engage in battle whenever they come to occupy the
+same cell. A wide variety of options are available for configuring troop
+movement, distribution, and production.
+</longdescription>
+</pkgmetadata>
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..e7b53bcc541e
--- /dev/null
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A multi-player game of strategy and coordination"
+HOMEPAGE="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/"
+SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/${P}.tgz"
+
+LICENSE="xbattle"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Since this uses similar code and the same binary name as the original XBattle,
+# we want to make sure you can't install both at the same time
+RDEPEND="
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	x11-libs/libX11
+	x11-libs/libXext
+	!games-strategy/xbattle"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sandbox.patch
+)
+
+src_prepare() {
+	default
+	rm -f xbcs/foo.xbc~ || die
+}
+
+src_install() {
+	DOCS="CONTRIBUTORS README README.AI TODO xbattle.dot" \
+		default
+	mv "${D}/usr/bin/"{,xb_}gauntletCampaign || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-strategy
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)