reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /games-simulation
103 files changed, 4181 insertions, 0 deletions
diff --git a/games-simulation/bcs-demo/Manifest b/games-simulation/bcs-demo/Manifest
new file mode 100644
index 000000000000..d2c00dcbc801
--- /dev/null
+++ b/games-simulation/bcs-demo/Manifest
@@ -0,0 +1,7 @@
+DIST bcsdemo_v1_3.sh.bin 5965217 SHA256 1e23f1fd2ec95e27c56037761c25e3af1ef1f23365540434b12e8b31527dbad7 SHA512 b3916ac72d21e80a09b80a406ea18ab4365d9c1b8139eec848f2e5d697d3d5afb6f27de5dac31c6b6fd860e3b406a3eae8a28aac0e00134629dbd5906bde816d WHIRLPOOL 25d2b12b9bdf6acd6695ae78f72e7712b1c0df4b99fb54c6c4621f1005d9375d265a1451955819c0d58630568533919439000f94c3adbd51ac68f6e0c7f205af
+DIST openal-alan-hack-0.0.1.tar.gz 86168 SHA256 86e09a5d43461031094c1a09382b369c6f8e231e644dde9d98b7b35fb2e0767a SHA512 1794461cb917dcf2130977bd0ac9f09bf93cd235dd742d29e50a3e2666e6db60865bacd1927fc4607a4b308dcdf421fa2a186ad2a06eea778069ce712a89d943 WHIRLPOOL 4daec7dcabacde0494ba9b4f3cf245201d6e755fd432a8edc6a73105688a1e87ac1f33334afc546617bfb45b6560cc67e150873c982b7d2b38a79ecec203e056
+EBUILD bcs-demo-1.3-r1.ebuild 1380 SHA256 121218f5f70293e56b44ecc7d3f2d10a5dc54eefd779f09709ccf6f6ff4e86e4 SHA512 a0073df4c848a2c33827072348d1ad2c7de3fdaf5a2b9f3270dae3eadd8fdf2a9ff832b7e32b3ff53a834af4ecf3dcda35250100543834fa81918dbbf3048b5d WHIRLPOOL eadaa49e13878be2dc2854ddbfffdd499d85285a5f59a7fad145fa199eb12e36f9dc853d7428e9b40ae16503f258641cd9d9902826123fd90147910f2e2763c3
+EBUILD bcs-demo-1.3.ebuild 1431 SHA256 cb2694e09a667a52cec6589e35010766d543d8e0b0c42fc34ddaee4ab6a325b1 SHA512 bf0743231b4edf0f5752b8d07a0c1280b2f3053b9b4789848bb3e4a75b479e1d631f474860fe9968b742a13cb044fa8017ec50291add7dbaf8ef7fc74e97f986 WHIRLPOOL ab3ec7b851b98c9473d715efc9a6e5f146a25e8194959d10b4efaa3de19c5417db6ffe5b83d9db421239f11a7f381448a655bc03a7d5b0b2e62e816487173574
+MISC ChangeLog 2684 SHA256 b5d30f2db73e61b89fc04c6d75b99bcae282d8708ff1a851900fa7748051aed3 SHA512 c60651c0031a9d3b92c7945d3780041869da5a05dcc5ce9045b1c963fb27c9f3d87b14e35713da9741ad30cc33c71e932fa5051c2b7b24cdd1681214f6bb7121 WHIRLPOOL 725026e13d8676c75ecb67f5704ccf5584be61c0127883bd4d06e759d3eb33490baba85a9eedc4facd787ff0360d19d8e9895f7ef126df46f61e8fe6cb4ae119
+MISC ChangeLog-2015 2373 SHA256 0e2b4d9fa5c45c28fef03fca515463f2842f237839c047010bd253f2093d6dfa SHA512 c1242f296a7e95ee6b2ba2abf8f93432cb80d7f75d75b8eb4276b4e453d9f28d1b0f084e89d76d0bef7f76eaa79c34950cd9e5000abc4b97405f3de92e8e0919 WHIRLPOOL a5e9dbca0959262edd8706eec7650849dd93dc693e315bf27a1e81ea2f0fe1ffe2e40394ea584553dd76784cb1728fd193a3de1d88fe014a1ee28d49870c086e
+MISC metadata.xml 1473 SHA256 3940c6fbe2c39b3f70a44552f5f34cd64abaecd467856af7df5f1935a1a8802e SHA512 2813c65cdae4aa2f8e0d0cb15e3b45af6d842e2ad02bc45783d3eb9fc8acbbd8467241ce7af2fa420bedc39b7c449b398f339cdc868fb6e45e0b5cec68b538c2 WHIRLPOOL 516de441f2e432320c690e5401346e7bf50b94f5120d85503f709793c7a97e01543d2f752993b4f10d831ca90d4af01cd5b14bf2ba86435e5c6afdd0a4b831eb
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
new file mode 100644
index 000000000000..106a657357f5
--- /dev/null
+++ b/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="design and build bridges and then stress test them with trains"
+HOMEPAGE="http://www.chroniclogic.com/pontifex2.htm"
+SRC_URI="ftp://ggdev-1.homelan.com/bcs/bcsdemo_v${PV/./_}.sh.bin
+	http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz"
+
+LICENSE="BCS"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="
+	media-libs/libsdl[abi_x86_32(-)]
+	sys-libs/glibc
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir=/opt/${PN}
+Ddir=${D}/${dir}
+QA_PREBUILT="${dir:1}/*"
+
+src_unpack() {
+	unpack_makeself bcsdemo_v${PV/./_}.sh.bin
+	unpack openal-alan-hack-0.0.1.tar.gz
+}
+
+src_install() {
+	dodir "${dir}"
+
+	tar -zxf bcsdemo.tar.gz -C "${Ddir}" || die
+	rm -f "${Ddir}"/bcs-linux-openal-fixer.sh || die
+
+	exeinto "${dir}"
+#	doexe bin/Linux/x86/rungame.sh
+#	exeinto ${dir}/lib
+	mv "${Ddir}"/bcs "${Ddir}"/bcs-bin
+	newexe libopenal.so.0.0.6 libopenal.so.0
+	echo '#!/bin/bash' >> "${Ddir}"/bcs
+	echo 'LD_PRELOAD="./libopenal.so.0" ./bcs-bin' >> "${Ddir}"/bcs
+	fperms 755 "${dir}"/bcs
+	make_wrapper bcs-demo ./bcs "${dir}" "${dir}"
+
+	insinto "${dir}"
+	doins *.cfg
+	dodoc readme*
+}
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
new file mode 100644
index 000000000000..572f72495628
--- /dev/null
+++ b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker games
+
+DESCRIPTION="design and build bridges and then stress test them with trains"
+HOMEPAGE="http://www.chroniclogic.com/pontifex2.htm"
+SRC_URI="ftp://ggdev-1.homelan.com/bcs/bcsdemo_v${PV/./_}.sh.bin
+	http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz"
+
+LICENSE="BCS"
+SLOT="0"
+KEYWORDS="-* ~amd64 x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="sys-libs/glibc
+	media-libs/libsdl[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+QA_PREBUILT="${dir:1}/*"
+
+src_unpack() {
+	unpack_makeself bcsdemo_v${PV/./_}.sh.bin
+	unpack openal-alan-hack-0.0.1.tar.gz
+}
+
+src_install() {
+	dodir "${dir}" "${GAMES_BINDIR}"
+
+	tar -zxf bcsdemo.tar.gz -C "${Ddir}" || die
+	rm -f "${Ddir}"/bcs-linux-openal-fixer.sh || die
+
+	exeinto "${dir}"
+#	doexe bin/Linux/x86/rungame.sh
+#	exeinto ${dir}/lib
+	mv "${Ddir}"/bcs "${Ddir}"/bcs-bin
+	newexe libopenal.so.0.0.6 libopenal.so.0
+	echo '#!/bin/bash' >> "${Ddir}"/bcs
+	echo 'LD_PRELOAD="./libopenal.so.0" ./bcs-bin' >> "${Ddir}"/bcs
+	fperms 750 "${dir}"/bcs
+	games_make_wrapper bcs-demo ./bcs "${dir}" "${dir}"
+
+	insinto "${dir}"
+	doins *.cfg
+	dodoc readme*
+
+	prepgamesdirs
+}
diff --git a/games-simulation/bcs-demo/metadata.xml b/games-simulation/bcs-demo/metadata.xml
new file mode 100644
index 000000000000..6955d95241d3
--- /dev/null
+++ b/games-simulation/bcs-demo/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>
+Building a bridge that doesn't break is what its all about, although watching 
+your bridge creation break and plunge a train into the watery depths below can be 
+half the fun. In the Bridge Construction Set you design and build bridges and 
+then stress test them to see how your creations hold up under pressure. If when 
+test vehicles pass over your bridge they make it safely across you know you've
+succeeded. If they plummet into the river you know you need to go back to the 
+drawing board.
+
+The robust physics deployed in the Bridge Construction Set let you build a wide 
+variety of bridges that can span the river. The 3D graphics allow you to view 
+your bridge from any angle including a first person train view - its like being 
+strapped to the front of the train when your bridge is first tested (if this 
+happened in real life I think we might have engineers checking all their bridges 
+in a simulator).
+
+The Bridge Construction Set includes many types of bridge building levels in 
+varying degrees of difficulty from simple to complex with a tutorial secition to 
+get you started. A Level Editor is also included so you can create your own 
+levels and trade them with others.
+</longdescription>
+</pkgmetadata>
diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
new file mode 100644
index 000000000000..0b2b0b3ac822
--- /dev/null
+++ b/games-simulation/cannonsmash/Manifest
@@ -0,0 +1,10 @@
+AUX cannonsmash-0.6.6-flags.patch 520 SHA256 a63c6d3ebb8407899e19f624a9e5c41b6a8a3f2b22270d8b10c910eaf9e3a115 SHA512 017f3117755e907438b923813e7df9864f8f6c8f5c917afde9f67ca87262402ca6b643551541374e8389f133993d51d4819fec2bd3d70a11cc4a2c0b2301b5a6 WHIRLPOOL 60f44d332ae510fcc13b01a4862c33b1cf00fa07b7bbf5d3d9f8aca6ff8104d01f8cfb893e3c7eb4e67a769d3d9dde5995c971edc6d5aeac56f6c6e125bd1a6a
+AUX cannonsmash-0.6.6-gcc41.patch 586 SHA256 8f8f53f8eb715984fd65409d178bc586e9610842a4f2a2a9249e3bf6adeacf62 SHA512 b93042c728ce93a515fd43e0b1fb9306ca83da697fde932da7c1c0536bc560fd8bcb17d7a306f51ef20a058690354b2bd19cfc62ca413398e318e0a39f6c26b9 WHIRLPOOL 3c46bf3e590f54b56c0ddbee1dfcd57d05a29ba7e937693a15f870a74a8ecda43c71733c6b53d6942f8d2f999cf78ff9d361ce9198798eff4be5639b7ea939f0
+AUX cannonsmash-0.6.6-sizeof-cast.patch 358 SHA256 a896a7f05317080500663aa49a6f61642c41e690b5889095f1f193a82cd4cbe6 SHA512 23d8764c900e78a6c3205b4fa444bd94a4a50990edfb45ef2dc764871b1d9f2359a8ee38da25ba8c392ef0000fd2da1340ce41093b4e4b8bdb818a1363941b90 WHIRLPOOL 38c79db58da57010a823d211d10f08443d5b1435daa28e1ca61b5f4cfd466e11ca547ee2423a8123b0dd63c00d4e05dc04b3970bee90a4a32591347c8a71e8df
+AUX cannonsmash-0.6.6-x-inc.patch 305 SHA256 29a261f5a92764061870fcafc84d4517f6d80249453a4daa2cfdb898833a2b7b SHA512 b7dcd8415a7f5ad773141a7b9fe048121e4f93862d8354bfde9637137858948d6791a87a3f44d53f69246fb3d539a9f5f6bd3fb667b48be8c147dcccb810d692 WHIRLPOOL 3b10c3a453d2106ca6d3d77848bd24a40aa4e332250df08fb15de1bca402c3ec13ea2c0cfa920df086a4f0ffecd088a62899ee9e9e57b9fdc6506c51a7996705
+DIST csmash-0.6.6.tar.gz 1989943 SHA256 1be0b27dac46ba891b955bf8f122151baea6ee05b3c29616a09423250cfd9d3d SHA512 e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916 WHIRLPOOL 0b0af9343bdf47fdca52b3f91b7cd137c5731c41ee00b077e86efcfc13057cdc66bfc5601124bc983813ad9cfc3fbe3e0da101cc62de6b2cb3a0428cb8a535ba
+DIST danslatristesse2-48.ogg 1070787 SHA256 aab5b276bc55ecad65c4b2e17f11daa6d173fc077e982e42997f10695f070bfe SHA512 5cbc457d511bdc736f3b359a8ddd3a514bd0d14418f2dbd68409394baadfcd9fd7630b228e4e9654b14b513e158e9a46b67bc58c5c04bfe382ee6e624dd16834 WHIRLPOOL dc87627a79900c9747ae620d3339a809cc72d7fc3b8a9fa05ab6b2423c02531600a4761c966b29bda5f531de96a68f58978d269f96c9603aae82ed87a0f52924
+EBUILD cannonsmash-0.6.6.ebuild 1422 SHA256 eac6065f08072fb5c79f614722e73115847626d38bd325c3adb5302cf63188a5 SHA512 17d6b3229a6aa70f89f67c5bfae0eaa462b1e2705edc4941cef0875b6081ec0878bdf878d92dfb56c3ca27b897879ce3f1dd34207f17b6700fdbbdf7b629e6e6 WHIRLPOOL faee13ea6aefd521722de3a6bb4ed63e5372020626d43506625af753fb59d6f16c2bbb8d0d733266e1e6f2fe80e23ac49a89bc05cbcf6ac0906befa907efeb78
+MISC ChangeLog 2611 SHA256 f10224389aef15ef7bc57724270732b5194c9c834122c712346aad78c49f4870 SHA512 167928b3fbe1b7178f8617cf04915cbe480450a2aa46a8d7778c9e6f4aab59200b65a6e5ef90bc6f5e1e44150f27ae83e0083f7f95e4ea2e2874a6d6f9c54410 WHIRLPOOL 74931306a2f66996278af0b5acc36e06d2d2bb7ddf6ddfc42b36a1a8b91b205656a88e8f7958a16bd113c90ab7af287be2f61606604790afec88cae5058ea290
+MISC ChangeLog-2015 3673 SHA256 e3e3b36e3e7a367252d64ca8399d4245e5d2a933ce568b05ebb0cd1e3fa5c748 SHA512 4d72c375c72e54157fcf6a9349aa89f75a98692333cba50b3ab785b8350a1458e41466cc90138473445f6de875f1604c1bb28e65ea396bfd951b64aae9dd5a8d WHIRLPOOL bb1b0351c135a0bea021e9162c0d5fbef3bbeb389e409acfb6d3e50bd89b918c8c015fe9781d06cb9d926f5ee582148ba73a0d82d87362cfdcfa59fa0a269c3e
+MISC metadata.xml 334 SHA256 1eeff58590bd5a18c7f0062b9ffdcf5c9251120099dda9ce7e6b01235ebf4532 SHA512 feb36e586e7e460e47a342dccf7cc812319860809033b31a8597c8df12f7c09e725af4e5536933a50341e22e921009557600801bcf64d9bf13e88b24d4b53e34 WHIRLPOOL 2f00a182a9ae6e84603377a11d27a76c9f68b308b370f8cccd9bf8bbaa8c3859df610a16d6d8e41bbfb3b139278f6102d06b6886bf893ab062fe19d4726a2aa1
diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
new file mode 100644
index 000000000000..689ff819dff4
--- /dev/null
+++ b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+MY_OGG=danslatristesse2-48.ogg
+DESCRIPTION="3D tabletennis game"
+HOMEPAGE="http://cannonsmash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/csmash-${PV}.tar.gz
+	vorbis? ( http://nan.p.utmc.or.jp/${MY_OGG} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="vorbis nls"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer[vorbis?]
+	media-libs/sdl-image[jpeg,png]
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/csmash-${PV}
+
+src_unpack() {
+	unpack csmash-${PV}.tar.gz
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-x-inc.patch \
+		"${FILESDIR}"/${P}-sizeof-cast.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-flags.patch
+	if use vorbis ; then
+		sed -i \
+			-e "s:${MY_OGG}:${GAMES_DATADIR}/csmash/${MY_OGG}:" ttinc.h \
+			|| die "sed failed"
+	fi
+}
+
+src_configure() {
+	egamesconf \
+		$(use_enable nls) \
+		--datadir="${GAMES_DATADIR_BASE}"
+}
+
+src_compile() {
+	emake \
+		localedir="/usr/share"
+}
+
+src_install() {
+	default
+	if use vorbis ; then
+		insinto "${GAMES_DATADIR}"/csmash
+		doins "${DISTDIR}"/${MY_OGG}
+	fi
+	newicon win32/orange.ico ${PN}.ico
+	make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico
+	prepgamesdirs
+}
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
new file mode 100644
index 000000000000..85612b929c59
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
@@ -0,0 +1,21 @@
+--- configure.old	2010-10-18 15:05:02.000000000 +0200
++++ configure	2010-10-18 15:05:31.000000000 +0200
+@@ -5516,12 +5516,12 @@
+ 
+ 
+ if test "x$x_includes" != "x"; then
+-  CFLAGS="-I $x_includes"
+-else
+-  CFLAGS=""
+-fi
+-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+-CXXFLAGS="$CFLAGS -Wall"
++  CFLAGS="${CFLAGS} -I $x_includes"
++else
++  CFLAGS="${CFLAGS}"
++fi
++LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
++CXXFLAGS="${CXXFLAGS} -Wall"
+ 
+ 
+ echo "$as_me:$LINENO: checking for main in -lXmu" >&5
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
new file mode 100644
index 000000000000..0f3e511f09cc
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
@@ -0,0 +1,22 @@
+--- BallView.h.old	2006-04-11 00:10:37.000000000 +0200
++++ BallView.h	2006-04-11 00:10:53.000000000 +0200
+@@ -32,7 +32,7 @@
+ 
+   static GLuint m_number[10];
+ private:
+-  void BallView::DrawTargetCircle();
++  void DrawTargetCircle();
+   GLUquadricObj *m_quad;
+ 
+   void DrawBall();
+--- matrix.old	2006-04-11 00:13:18.000000000 +0200
++++ matrix	2006-04-11 00:19:34.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ /* __BEGIN__BEGIN__ */
+ //__NAMESPACE_BEGIN(ese);
+-#if (!defined __GNUG__) || (__GNUC__ == 3)
++#if (!defined __GNUG__) || (__GNUC__ >= 3)
+ template<typename T>
+ void swap(T& a, T& b)
+ {
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
new file mode 100644
index 000000000000..9237f95978ef
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
@@ -0,0 +1,11 @@
+Don't typecast otherwise C++ will fail to match on some arches.
+
+http://bugs.gentoo.org/84187
+
+--- loadparts.cpp
++++ loadparts.cpp
+@@ -247,3 +247,3 @@
+             // concat next line(s)
+-	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
++	    int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1);
+ 	    fgets(&line[l-2], bufsize, fp);
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
new file mode 100644
index 000000000000..99c1e2f944fa
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
@@ -0,0 +1,18 @@
+Patch by Jason Bucata.
+http://bugs.gentoo.org/84187
+
+--- configure
++++ configure
+@@ -5515,7 +5515,11 @@
+ fi
+ 
+ 
+-CFLAGS="-I $x_includes"
++if test "x$x_includes" != "x"; then
++  CFLAGS="-I $x_includes"
++else
++  CFLAGS=""
++fi
+ LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+ CXXFLAGS="$CFLAGS -Wall"
+ 
diff --git a/games-simulation/cannonsmash/metadata.xml b/games-simulation/cannonsmash/metadata.xml
new file mode 100644
index 000000000000..a7e14e54406d
--- /dev/null
+++ b/games-simulation/cannonsmash/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">cannonsmash</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/crashtest/Manifest b/games-simulation/crashtest/Manifest
new file mode 100644
index 000000000000..6a2287d3f389
--- /dev/null
+++ b/games-simulation/crashtest/Manifest
@@ -0,0 +1,7 @@
+AUX crashtest-1.1-gentoo.patch 2907 SHA256 66c4203d91884f6a1c2785c065bc31175525c5562202a07af575384419c25278 SHA512 6b657329db9eba28de9dcbf33bfd46002e89e0a5a348a9109742cfa6b0ab6a431a8c5edd880201b40ab0dcc4cc5b27be16dc5e38e16621596ec62ea07676c716 WHIRLPOOL 822e4d565b2f92028018fb76b38ff8ff2454633478658441c5065c0a80a79a321d7201b276f3a93b236a781cdd895e67494d79e69ebb50241244ea45d1033cfc
+DIST crashtest-1.1.tar.gz 134769 SHA256 55c5ce29857263ceebc1c3f42c153f275dfc47711e9248395fd4398d6ef52ab9 SHA512 f361b5f202cdcdca871357eb2a2158af2958f4058b6754c63dc5a20c3e08e2ef532e984596d0daac073f2321b2db02e3f8c2a0a4998450fc953c1661d712d59c WHIRLPOOL 272352015016844afe6f02fff92be96b6f52e0c2cdfb2e545cc3a2f6e5196f4825bd99c971b89c371be18c6b983e5b04a1bbe739df5cae7c8579ac6319ea80cd
+EBUILD crashtest-1.1-r1.ebuild 831 SHA256 8172334612c5833f21930348ecead144a14f618aaf71eaea9b9098ebf666f362 SHA512 312efd5ef21b25f35c8f78e1088d909afdf8ec56beb7dc2c3c043c5db18c3d68b726ca9590fd4e484299fe508c7b9e6f0eb6c898becd8c49cc2f7be607346112 WHIRLPOOL 526c9f3a7a1e56282e966205a5a525605bdec0ff87fe170777752f9a175377104eefe233f54da52f0036b5593da849a0acabab46ee4108a6f3708f6e911dcd7f
+EBUILD crashtest-1.1.ebuild 844 SHA256 26b308b3b5001fdb3624fbf6ea711bcacfe36e113f050ebe851eba067bd6b56a SHA512 9f253eea71562a3591c4d93cd534275865c880f6badb018d37077ece9c8fff392613378d329b30b74a35cc4d72f7fa81864a34e409fadea2c8bd5541fab1011f WHIRLPOOL f7a74eb8d1e0f9c59ce8d59d1348bcf43fadbefadfdff76901fd57794abd37ba704bf4a266d16309d43488cf47ea02d07bb7bd9f4137001cff3961de38a81f87
+MISC ChangeLog 2760 SHA256 0eb92d652a9b77df7e2faec68b6f710da110f226e0f1bfcf344fef9ca99b2c61 SHA512 e3201f9638e41861c0c7a5076d0980df396337787a15ec5e06e71b90833e8f06384817f38c0c58f4515e0c221290d3eee692ad3e632c5c16c2d09af41b8dcbca WHIRLPOOL 0ff2a4f1d6e84014c573c58b8d6d5c0baff7316a653660a04874c4d5c7b46387d97a3ef734cc5228b98562f4e67e39a3335a488425a7c2ae806f0b67acb8e1af
+MISC ChangeLog-2015 1915 SHA256 5c1457cae8a5fa958412460921f207fdbfbf38426a4c03a0df061358d03f4c8f SHA512 a4e2b1d4fff069cec170f921152e5122f2fb42ddcfc315334d0499de90b390bb702bd7a3dd0ef9ccc35374ba99c8739dd77e4cd7c819afb26c33fa611945ada0 WHIRLPOOL 9b555993871b7690be2fd857d5f3b689b4ae3548b7d021e4f83d59ead458f9a83ecf2b7b903eb68c56579aae914814c34c7bbaafe4619cdc8059b096b472902d
+MISC metadata.xml 562 SHA256 d287dc709217840a7d173841b00361e201df2f5d46bc0888ddefc4979c8bc9ab SHA512 94005d1dd7a8f13dc37e0c81290486eb34dfda05a2808eb9b4908b5ba7ba722e0435acdde3d2da082e61a70e60eb2e6df70cd0d59589ccb913a6e6e87b81bc55 WHIRLPOOL a037331d056825014c96704ebf2307ddd0c922eb5ac7b57fc466a8ca757cba08d63ad2492dc1af09f706cd722b626f20b424722d612d8471f5a1044bc19bba99
diff --git a/games-simulation/crashtest/crashtest-1.1-r1.ebuild b/games-simulation/crashtest/crashtest-1.1-r1.ebuild
new file mode 100644
index 000000000000..1faed8379238
--- /dev/null
+++ b/games-simulation/crashtest/crashtest-1.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic
+
+DESCRIPTION="Educational car crash simulator"
+HOMEPAGE="http://www.stolk.org/crashtest/"
+SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-games/ode
+	media-libs/alsa-lib
+	media-libs/freeglut
+	x11-libs/fltk:1[opengl]
+	virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}
+	>=media-libs/plib-1.8.4"
+
+S=${WORKDIR}/${P}/src-${PN}
+
+PATCHES=(
+	"${FILESDIR}/${P}"-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
+		Makefile ${PN}.cxx || die
+	append-cppflags -DHAVE_ISNANF
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN} Crashtest
+}
diff --git a/games-simulation/crashtest/crashtest-1.1.ebuild b/games-simulation/crashtest/crashtest-1.1.ebuild
new file mode 100644
index 000000000000..d8dc29b604c5
--- /dev/null
+++ b/games-simulation/crashtest/crashtest-1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic games
+
+DESCRIPTION="Educational car crash simulator"
+HOMEPAGE="http://www.stolk.org/crashtest/"
+SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/fltk:1[opengl]
+	dev-games/ode
+	media-libs/alsa-lib
+	virtual/opengl
+	virtual/glu
+	media-libs/freeglut"
+DEPEND="${RDEPEND}
+	>=media-libs/plib-1.8.4"
+
+S=${WORKDIR}/${P}/src-${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}"-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
+		Makefile ${PN}.cxx || die
+	append-flags -DHAVE_ISNANF
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN} Crashtest
+	prepgamesdirs
+}
diff --git a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
new file mode 100644
index 000000000000..b384c87278c2
--- /dev/null
+++ b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
@@ -0,0 +1,94 @@
+diff -ru a/Makefile b/Makefile
+--- a/Makefile	2009-02-15 17:11:31.000000000 -0500
++++ b/Makefile	2009-10-14 01:00:13.900627555 -0400
+@@ -1,34 +1,12 @@
+-# EDIT THESE SETTINGS
+-
+-PLIBPREFIX=/usr
+-ODEPREFIX=/usr
+-CXX=g++
+-
+-#PLIBPREFIX=$(HOME)
+-#ODEPREFIX=$(HOME)
+-#CXX=g++-4.0
+-
+-# END OF CUSTOM SETTINGS
+-
+-CXXFLAGS=\
+-  -I$(ODEPREFIX)/include \
+-  -I$(PLIBPREFIX)/include \
+-  -I../src-common \
+-  -O2 -g -Wall
+-
+-LFLAGS=\
+-  -L$(PLIBPREFIX)/lib \
+-  -L/usr/X11R6/lib
+-
+ OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o
++CXXFLAGS+=-I `fltk-config --includedir` `ode-config --cflags`
+ 
+-LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
+-
++LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL -lasound `fltk-config --use-gl --use-images --ldflags` -lglut
+ 
+ all: crashtest
+ 
+ crashtest: $(OBJS)
+-	$(CXX) -o crashtest $(OBJS) $(LFLAGS) $(LIBS)
++	$(CXX) -o crashtest $(OBJS) $(LDFLAGS) $(LIBS)
+ 
+ staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
+ 	$(CXX) -c $(CXXFLAGS) ../src-common/staticworldobject.cxx
+@@ -37,10 +14,10 @@
+ 	$(CXX) -c $(CXXFLAGS) ../src-common/dynamicobject.cxx
+ 
+ cartobject.o: cartobject.cxx cartobject.h
+-	$(CXX) -c $(CXXFLAGS) cartobject.cxx
++	$(CXX) -c $(CXXFLAGS) -I../src-common cartobject.cxx
+ 
+ crashtest.o: crashtest.cxx crashworld.h ../src-common/modelmap.h cartobject.h bipedobject.h ../src-common/brickwall.h ../src-common/stereocontext.h ../src-common/usercam.h
+-	$(CXX) -c $(CXXFLAGS) crashtest.cxx
++	$(CXX) -c $(CXXFLAGS) -I../src-common crashtest.cxx
+ 
+ 
+ 
+@@ -48,13 +25,13 @@
+ 	PLODE_DATADIR=`pwd` ./crashtest
+ 
+ 
+-GAMEDIR=$(DESTDIR)/usr/share/games/crashtest
++GAMEDIR=$(DESTDIR)@GENTOO_DATADIR@
+ install: crashtest
+ 	# Directories
+-	mkdir -p $(DESTDIR)/usr/games/
++	mkdir -p $(DESTDIR)@GENTOO_BINDIR@
+ 	mkdir -p $(GAMEDIR)/models/
+ 	# Binary
+-	install crashtest $(DESTDIR)/usr/games/crashtest
++	install crashtest $(DESTDIR)@GENTOO_BINDIR@
+ 	# Models
+ 	install -m 644 models/testground.3ds $(GAMEDIR)/models/testground.3ds
+ 	install -m 644 models/biped_torso.3ds $(GAMEDIR)/models/biped_torso.3ds
+diff -ru a/crashtest.cxx b/crashtest.cxx
+--- a/crashtest.cxx	2009-02-15 17:08:24.000000000 -0500
++++ b/crashtest.cxx	2009-10-14 01:01:25.822753522 -0400
+@@ -615,13 +615,7 @@
+ 
+ int main(int argc, char *argv[]) 
+ {
+-  char *bindirname  = dirname(argv[0]);
+-  if (!strcmp(bindirname,"."))
+-    dirprefix="/usr/share/games/crashtest";
+-  else
+-  {
+-    dirprefix = dirname(bindirname) + std::string("/share/games/crashtest");
+-  }
++  dirprefix="@GENTOO_DATADIR@";
+   if (getenv("PLODE_DATADIR"))
+     dirprefix = getenv("PLODE_DATADIR");
+   modelmap = new ModelMap(dirprefix);
+@@ -745,4 +739,3 @@
+   Fl::add_idle(idle, &simwin);
+   Fl::run();
+ }
+-
diff --git a/games-simulation/crashtest/metadata.xml b/games-simulation/crashtest/metadata.xml
new file mode 100644
index 000000000000..3dc7fa0644b5
--- /dev/null
+++ b/games-simulation/crashtest/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">
+Crashtest simulates car crashes. This is an educational tool that can be used to
+acquire much insight into this complex process. The user can learn about the
+relation between speed, reaction-time and stopping distance. Also, many physical
+properties can be studied.
+</longdescription>
+</pkgmetadata>
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
new file mode 100644
index 000000000000..a04e64fb4f90
--- /dev/null
+++ b/games-simulation/crrcsim/Manifest
@@ -0,0 +1,8 @@
+AUX crrcsim-0.9.13-buildsystem.patch 2183 SHA256 78fe600bec7d2fcf55a1e21dc44c4a68f3e283a6e8c7559b386ec21c59ff6887 SHA512 9b28fe63ea4bd3d21559306bd110eaa2c518dc933a572a93dc21182464ee4f95bf7d8bc3f21ebe78addbcc2e432fcd2992587925f97d633270ce9d47ff2e228b WHIRLPOOL 472d1295bd33c3dbc12781f2191e43c52a4fb3aa263aab5971413470d27acf1d83a2e27dbaeff665bba51ee3622e27d2cc0a3543d5f5e061530aaac9634b44f6
+AUX crrcsim-0.9.13-gcc6.patch 461 SHA256 2e155453369674543cd8106ba544f83c20f808453e6a1e0e3bcdf792634d5140 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9 WHIRLPOOL 6dfe1465b2d7329259d471fb71b48e110cc365dad0999b50a9e14943b4d006129d3e484ff48e83f1c959acb5f956a54ffc02786ec3f9831c3cd80075038240f1
+AUX crrcsim-cgal_gmp.patch 352 SHA256 f79c80467c5bd704a5ddb3d7de185037569d939a06d745211b1c6ea99afc899a SHA512 1b8302f71e220df54b73819988f866a7e35ec6b11d271a6a57ad886372fba4eb1a02367ab9942030baf04fbeb5fa093d23e38de2614c39c2c75e76795ec69274 WHIRLPOOL 6b28070c1cf67e1714271b960464b1ec6a40aacddacb64604cf6a1d1a5e44f97e5599e62826c05abae5d35da454af48db957a0f4dd5434212df66ea8f6599074
+DIST crrcsim-0.9.13.tar.gz 8337392 SHA256 abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698 SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab WHIRLPOOL 2af5b8aa79f8e1edead4ff982392314d659e6f5fbb31f0a4438ecc986898c6026e05d9dc417c6ff88a7a3bba9d10b122e3bf09b8bb274354fe4e531bd86f7b2f
+EBUILD crrcsim-0.9.13.ebuild 1232 SHA256 cae2a1a5d0bedc84de5079a4ff56bb29e148fcc737321b4e5b601018cf7dd2ee SHA512 ab16d675e3135e65b649ab7cc9a912c84e4d90881042531b89a06e9ce25cfa44fd5e23f525a6b41396c2b907c25db867e7329e96f0f015bc8c0b1c85098c5adb WHIRLPOOL 9bcf51df2b2d414be5e5c761386c73f006d6a5b4f4b406176e87e3798442798b3a99ed1a07f3554134fc4a5745f917886d274770fbf2f4bd15b9019ca0a5f157
+MISC ChangeLog 2882 SHA256 ab1ef5b53dadc9268b789c70f3137023d3bf4856a314cb58bf8975fd103f2281 SHA512 242f810db3530ceb1f5dbf2b9f3ef922e74d67447c49a42bef73144036a1cfe68757ae21922a7903cea2816b1cc03e5fe38f965f340ee6c3b85f315d9abd82d9 WHIRLPOOL df66776c9d8aa26d7b5fe2e7189c53c160b9020bc15d6790d7c58560537a0d76fbd7ee19f44649a203729818266a3125262320a93b8e74f2a2c5903d926dd767
+MISC ChangeLog-2015 1802 SHA256 e405fd330ff127273d0eb54fa8b315157315e40d2ac56f2a093ec7f68ecafd58 SHA512 5e6f571c1cdee4e6e310d5dbfd7f43187ad45ab88715d46aeedc220f58eb421b264e90388e676eef5a4290347dcd46e31b46835c95da1d3cf2576ba9de1371fb WHIRLPOOL 6b357a20d84bce1143627bfc5decd09009bd61ef24264de8f0e3d3a4cb5d70d7841fbe5cd151cee42924898f343939f7ba37ea976a60516100e843e0df8848fe
+MISC metadata.xml 434 SHA256 6134745f367329fcd8f23085b8ca0b8a24d540fd24e8b9a0eb1e427b3ac79acd SHA512 bb752783e5e310b3a0f321dda5ffb813df1b54c9dbd4b062f3a42ab41466751d4029f02bd56eb70d025b6087487782eee4e2b0aedd683d13e99336b512b2cbec WHIRLPOOL 47c1a851c2f85ef149d8b100d5274b8787ec698c7d6f2a1d46f67d6ea6c6d50db007914822fb5affbb240c6e4f8a80cf102454a33bf7858226a65211d355eb0d
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
new file mode 100644
index 000000000000..ef5b5ce752df
--- /dev/null
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOMAKE="1.10"
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="model-airplane flight simulation program"
+HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portaudio"
+
+RDEPEND="media-libs/libsdl[X,sound,joystick,opengl,video]
+	media-libs/plib
+	sci-mathematics/cgal
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-buildsystem.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+
+	if has_version "sci-mathematics/cgal[gmp(+)]" ; then
+		eapply "${FILESDIR}"/${PN}-cgal_gmp.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datadir="/usr/share" \
+		--datarootdir="${EPREFIX%/}/usr/share" \
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		$(use_with portaudio)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS HISTORY NEWS README
+	doicon -s 32 packages/icons/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
new file mode 100644
index 000000000000..396fd573ec90
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
@@ -0,0 +1,62 @@
+--- crrcsim-0.9.11/configure.ac
++++ crrcsim-0.9.11/configure.ac
+@@ -79,8 +79,12 @@
+ dnl Default is: no portaudio present
+ portaudio=0
+ 
++AC_ARG_WITH([portaudio], AS_HELP_STRING([--without-portaudio], [Build without portaudio library (default: test)]))
++
++AS_IF([test "x$with_portaudio" != "xno"], [
+ dnl Check for the Portaudio header file
+ AC_CHECK_HEADER([portaudio.h])
++])
+ 
+ if  (test "x$ac_cv_header_portaudio_h" = "xyes"); then 
+   dnl Check for Portaudio 18
+--- crrcsim-0.9.13/src/mod_misc/filesystools.cpp
++++ crrcsim-0.9.13/src/mod_misc/filesystools.cpp
+@@ -113,8 +113,8 @@
+   // $USERPROFILE/.crrcsim                (WIN32)
+   // $HOME/.crrcsim                       (LINUX)
+   // CRRC_DATA_PATH                       (LINUX)
+-  // /usr/local/share/games/crrcsim       (LINUX)
+-  // /usr/share/games/crrcsim             (LINUX)
++  // /usr/local/share/crrcsim             (LINUX)
++  // /usr/share/crrcsim                   (LINUX)
+ 
+   // cwd
+   if (dirname != "")
+@@ -154,13 +154,13 @@
+     s.append(dirname);
+     pathlist.push_back(s);
+     #endif
+-    s = "/usr/local/share/games/" + appname + "/";
++    s = "/usr/local/share/" + appname + "/";
+     if (s != data_path)    // avoid adding this path twice
+     {
+       s.append(dirname);
+       pathlist.push_back(s);
+     }
+-    s = "/usr/share/games/" + appname + "/";
++    s = "/usr/share/" + appname + "/";
+     if (s != data_path)    // avoid adding this path twice
+     {
+       s.append(dirname);
+@@ -172,13 +172,13 @@
+     #ifdef CRRC_DATA_PATH
+     pathlist.push_back(data_path);
+     #endif
+-    if (data_path != "/usr/local/share/games/" + appname)  // avoid adding this path twice
++    if (data_path != "/usr/local/share/" + appname)  // avoid adding this path twice
+     {
+-      pathlist.push_back("/usr/local/share/games/" + appname);
++      pathlist.push_back("/usr/local/share/" + appname);
+     }
+-    if (data_path != "/usr/share/games/" + appname)  // avoid adding this path twice
++    if (data_path != "/usr/share/" + appname)  // avoid adding this path twice
+     {
+-      pathlist.push_back("/usr/share/games/" + appname);
++      pathlist.push_back("/usr/share/" + appname);
+     }
+   }
+   #endif
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
new file mode 100644
index 000000000000..b11550f3dff6
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/610560
+Upstream commit: https://sourceforge.net/p/crrcsim/code/ci/28ed9ba57011371cab8b637550acc716b973c47d
+
+--- a/src/mod_video/crrc_animation.cpp
++++ b/src/mod_video/crrc_animation.cpp
+@@ -84,7 +84,7 @@
+       else
+       {
+         std::cerr << "createAnimation: unknown animation type \'"
+-                  << type << "\'" << std::cerr;
++                  << type << "\'" << std::endl;
+       }
+       
+       if (anim != NULL)
diff --git a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
new file mode 100644
index 000000000000..10d6bff6b769
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
@@ -0,0 +1,11 @@
+--- crrcsim-0.9.11/configure.ac
++++ crrcsim-0.9.11/configure.ac
+@@ -229,7 +229,7 @@
+       has_CGAL="yes  (found CGAL v3)"
+     fi   
+     CGAL_CFLAGS=-frounding-math
+-    CGAL_LIBS=-lCGAL
++    CGAL_LIBS="-lCGAL -lgmp"
+     AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable])
+ else
+     has_CGAL="no   (CGAL not found)"
diff --git a/games-simulation/crrcsim/metadata.xml b/games-simulation/crrcsim/metadata.xml
new file mode 100644
index 000000000000..9bc28cff4765
--- /dev/null
+++ b/games-simulation/crrcsim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">crrcsim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/dangerdeep/Manifest b/games-simulation/dangerdeep/Manifest
new file mode 100644
index 000000000000..585019f78020
--- /dev/null
+++ b/games-simulation/dangerdeep/Manifest
@@ -0,0 +1,11 @@
+AUX dangerdeep-0.3.0-build.patch 1516 SHA256 bb319cb89a4d5b049114768880c4dfa20b2ce65d22e73f7654307af4d4e768c5 SHA512 074e520d59fb483d4f15301fbae4bce7776a24f12d5522db1b1239177433095e663a5839ac2663ac2b6f4090e5d9e779ba1249607bbd47be9f7ddc6bd326318b WHIRLPOOL f086ecd9d78c0942d8f5ffe7bda7d67a969110bba94457b009573f2b62ad066aeebc4d97b7ac07e3b706d1aee07aeb13d3f5033c5afc01ca3b21230d70181338
+AUX dangerdeep-0.3.0-gcc43.patch 1704 SHA256 0699f53e7d51c5fc660613dceffb2a441c87b5716eb72bf2902e35d31b8b3082 SHA512 aa3c26e08475d1a6262712caceb25839bb86c18d23d7fb1a14c84fbe960c0596440f6b20e7a1921dc1c04c6adba44c317e4aeac1b13a80e21ecc44a513efc05f WHIRLPOOL e4ad1ef6bba202b1c51a74ed4d196ac88270d1db5d6b6d738c3cd01097bb2b3f16aa4cc4ee68c3dad22d8086885cd591fa4d157ebdbc391a129bf51452039f90
+AUX dangerdeep-0.3.0-gcc44.patch 339 SHA256 030ce07756d2a420541306180e508810329c511ba3daceb8b66bc36d86bad042 SHA512 3a17a8e577e9e3e6ac66a14e1c55a612e567286a6a7141592399a8f914999adb16c346ad9b7e4366e41885f4af4887795644e92e3796f522844d90651ea9128e WHIRLPOOL da75f0dcde1119e6953a88296b9c897baa1a024b358bb7f6a8188b9ecbc5f9499d49d956da91b1804ce30177a828106e83a20a04cf6cfb74b7f019ba48ac0c69
+AUX dangerdeep-0.3.0-gcc47.patch 311 SHA256 a9fb67c4835c2b708822c1095cb82f97d11deff5a29c71ca271274093c318d0f SHA512 f071856eec5c1643e1915e48f68175ca61ce7447f3801dd859476b0e7d400ffdfd1a359851f176d971565d480405395566c330348acf9b7b5f6af202cad3a649 WHIRLPOOL 515481812241635079b7716bad1020a34504860782c96966c1713baf7395914f9772e04361416db7f52a9f09ccf0ce554972e97a8ce82066447b9791b559fca1
+AUX dangerdeep-0.3.0-gcc6.patch 898 SHA256 39d36e19a79b931e1169b9f4a7a2e8b8c90b66fc4c6640ecd189678ed5034499 SHA512 4bd3d6e9077ae408feaf38de6f0b9c484f345e87bc79bdcebfb7d8a73c4686dafabc4617b08a1532fdb2fe6ca2afb2a8932f486f54134c891972ef1882650fb3 WHIRLPOOL 05cef2dc1d1a74d40049c1a20648bda28eba8decf2cb30accf66e3f74fb70096e4dcf7cebe35bb00585f8c2c39cd7e02ddfc99cb6bf5f935668bef3308e84b7b
+DIST dangerdeep-0.3.0.tar.gz 1100972 SHA256 bdab6b9b1c2b5f8e618f5c346965ec1f48c9edc9bff1d4f5ff7c8d235464283f SHA512 97d47654d6d3728365ec0f7955f360a35ad105442663f5dd05f0a37ae6ae67216eb33f183df788c3cd0ba9878dbef22d607ddac86bf43159e87ef1c2429b7f87 WHIRLPOOL bdd7c2b089fe50500a16a2ff882a9b72236e69f5218fe1bfd8d2443edf851aeafd03deb3c8c6269ce1219ae8d2e83300251d8fbda5df93b13169bdcd6480cdb3
+DIST dangerdeep-data-0.3.0.zip 61914764 SHA256 00412a4f8f571a9291df48fa40fbbe846680b4fcb1de2f168539b1606cb4fb81 SHA512 c6d7de055abc77c1c61d0f999d885f44121934d66f89c8e4e55231cc20605ef679cd278bebadc879862e3da07d46bae3ab02f97d3ee4179762efd895e8f91b3e WHIRLPOOL 47eeca4f4c0ff4f573b26938c5db8f0c4f9f8c2f4d77de34fa2362a1cfa396a176553efb3928818d61c96b0c6f915a9157b8cc97918821875bdefff2cf10b3c7
+EBUILD dangerdeep-0.3.0.ebuild 1385 SHA256 96517448d9eb984f9e77c9f3d274f7c160072af8a32e5e4f1df3409706c409d2 SHA512 f031617e4cd9020610682a39633b8ae7667b58876fe4a4c2ccadf60fdf0ae621a7a6ea754a95b615e725c8660a9b49d1137af84ae520909b135f671bafdf2663 WHIRLPOOL fbe564b2345458c75cbb34c43c0e6fce786a9e8f2cae74bda3eb9c93d38365e5a98fcfbb779238e8a6ecbb953f66ae658820e8a2f2d68646e5655dddb536ec2c
+MISC ChangeLog 2596 SHA256 a4c68c6448a185f797688d4c479bd337b22eeb5f745424d36f11295c8eafb864 SHA512 39c7f324876ac844fb03271f86b6979db3e7cb19bccfb1505195469d2212a3fd3db5bc0030842d718707609dfdae306fa3ca2ef950a5a3677d8e72c65aee65ff WHIRLPOOL c8a9ae1ca0e9f39c2e82bd4cbd4f634241958e228bbc2a3f19f60bf7dd1dcac35cda16a9db6f3b5d278e07ca70aedd9ca62f2c3bbd3dfda060668d1e8e8c7872
+MISC ChangeLog-2015 2633 SHA256 d26fe510cab2df4e9201d35e7f5a7f2e9788290199f2921c4555bb386ad7f4ef SHA512 795ce4f2d5ac8ddac649c891feb4fa7913e0458988dee26d6666674b95eb48ed4e4470007f2c91836689238f82c8228ee9e70ad10aef8d1e7a36b131fc45b1b0 WHIRLPOOL 7a7121d8bb1e0a44c6bac7e1e9112ec0d3173b28c57be935ab67d7d1a26b107bff1d1be33a78508d07cc5fd18b9c72773dacf46f8176cab87aac41232b3af190
+MISC metadata.xml 333 SHA256 de02038c590d30d48863bf1fccc7c90dc192d9592cee83f63b0b74e439c33216 SHA512 399d1439cce706aad93bcaf11f84e4e0481e104549468b007c09c8592c9ebe4309a12293724f622bd44c7812f77ba21b85571636ff9559ae0bae77a6cae1acc1 WHIRLPOOL a1349ddb25ba3b8d44e5868c8cd0e4ad79537ed8e7d9964b2db2c89490f110308ff552c002e2c8410cb53fc24ab7b9b8d895b769959356cd2a08e1179143c804
diff --git a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
new file mode 100644
index 000000000000..8534a6930714
--- /dev/null
+++ b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils scons-utils games
+
+DESCRIPTION="a World War II German submarine simulation"
+HOMEPAGE="http://dangerdeep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${PN}-data-${PV}.zip"
+
+LICENSE="GPL-2 CC-BY-NC-ND-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cpu_flags_x86_sse debug"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	sci-libs/fftw:3.0
+	media-libs/libsdl[joystick,opengl,video]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-net"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gcc6.patch
+	sed -i -e "/console_log.txt/ s:fopen.*:stderr;:" src/system.cpp || die
+}
+
+src_compile() {
+	local sse=-1
+
+	if use cpu_flags_x86_sse ; then
+		use amd64 && sse=3 || sse=1
+	fi
+
+	escons \
+		usex86sse=${sse} \
+		datadir="${GAMES_DATADIR}"/${PN} \
+		$(use_scons debug)
+}
+
+src_install() {
+	dogamesbin build/linux/${PN}
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r ../data/*
+
+	newicon dftd_icon.png ${PN}.png
+	make_desktop_entry ${PN} "Danger from the Deep"
+
+	dodoc ChangeLog CREDITS README
+	doman doc/man/${PN}.6
+
+	prepgamesdirs
+}
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
new file mode 100644
index 000000000000..367db1cfbb96
--- /dev/null
+++ b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
@@ -0,0 +1,39 @@
+--- SConstruct
++++ SConstruct
+@@ -119,6 +119,7 @@
+ 
+ else:
+ 	print "Compiling for Unix/Posix/Linux Environment"
++	SConsignFile()
+ 	env = Environment(ENV = os.environ)
+ 	env.Append(CPPPATH = ['/usr/include/SDL', '/usr/include/GL'])
+ 	libpath = ['/usr/X11R6/lib']
+@@ -126,13 +127,18 @@
+ 	sdllibs = ['SDL', 'SDL_image']
+ 	ccflags = '-Wall `sdl-config --cflags` `pkg-config --cflags x11`'
+ 	env.Append(LINKFLAGS = '`pkg-config --libs-only-L x11`')
++	if os.environ.has_key('CXX'):
++		env['CXX'] = os.environ['CXX']
++	if os.environ.has_key('CXXFLAGS'):
++		ccflags += os.environ['CXXFLAGS']
++	if os.environ.has_key('LDFLAGS'):
++		env.Append(LINKFLAGS = os.environ['LDFLAGS'])
+ 	if (debug >= 3):
+ 		ccflags += ' -g -pg -O3'	# profiling
+ 	elif (debug == 2):
+ 		ccflags += ' -g -O0'
+ 		env.Append(CPPDEFINES = ['DEBUG'])
+ 	elif (debug == 1):
+-		ccflags += ' -g -O1'
+ 		env.Append(CPPDEFINES = ['DEBUG'])
+ 	elif (debug == -1):
+ 		ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow'
+@@ -140,8 +144,6 @@
+ 		ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
+ 	elif (debug == -3):	# special g++4.0+ auto vectorization
+ 		ccflags += ' -g -O3 -march=athlon64 -mfpmath=sse -mmmx -msse -msse2 -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
+-	else:
+-		ccflags += ' -g -O2' # debug symbols will be stripped by the linker for a debian package
+ 	# choose specific architecture if requested
+ 	if archflag != '':
+ 		ccflags += ' -march=' + archflag
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
new file mode 100644
index 000000000000..1588b0bbae07
--- /dev/null
+++ b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
@@ -0,0 +1,80 @@
+--- src/bspline_test.cpp
++++ src/bspline_test.cpp
+@@ -1,6 +1,7 @@
+ // some test code for the 2d bsplines!
+ #include "bspline.h"
+ #include <fstream>
++#include <cstdlib>
+ using namespace std;
+ 
+ double rnd() { return double(rand())/RAND_MAX; }
+--- src/convoy.h
++++ src/convoy.h
+@@ -27,6 +27,7 @@
+ #include "vector2.h"
+ #include <new>
+ #include <list>
++#include <memory>
+ class ship;
+ 
+ ///\brief Grouping of ships and other objects with central control.
+--- src/date.cpp
++++ src/date.cpp
+@@ -21,6 +21,7 @@
+ // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE
+ 
+ #include <iomanip>
++#include <cstdlib>
+ #include "date.h"
+ #include "texts.h"
+ 
+--- src/ocean_wave_generator.h
++++ src/ocean_wave_generator.h
+@@ -29,6 +29,7 @@
+ #include "environment.h"
+ #include <complex>
+ #include <vector>
++#include <cstdlib>
+ 
+ // use float fftw (faster) or double (default) ?
+ #ifdef WITH_FLOAT_FFTW
+--- src/ptrlist.h
++++ src/ptrlist.h
+@@ -25,6 +25,7 @@
+ 
+ #include <list>
+ #include <stdexcept>
++#include <memory>
+ 
+ // same as std::list regarding the interface (partly), but handles pointers.
+ template <class T>
+--- src/ptrvector.h
++++ src/ptrvector.h
+@@ -25,6 +25,7 @@
+ 
+ #include <vector>
+ #include <stdexcept>
++#include <memory>
+ 
+ // same as std::vector regarding the interface, but handles pointers.
+ template <class T>
+--- src/sea_object.h
++++ src/sea_object.h
+@@ -27,6 +27,7 @@
+ #include "ptrvector.h"
+ #include <new>
+ #include <stdexcept>
++#include <memory>
+ 
+ #include "vector3.h"
+ #include "angle.h"
+--- src/widget.cpp
++++ src/widget.cpp
+@@ -32,6 +32,7 @@
+ #include "datadirs.h"
+ #include <set>
+ #include <sstream>
++#include <algorithm>
+ using std::vector;
+ using std::list;
+ using std::string;
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
new file mode 100644
index 000000000000..23d3c470c900
--- /dev/null
+++ b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
@@ -0,0 +1,20 @@
+--- src/date.cpp
++++ src/date.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <iomanip>
+ #include <cstdlib>
++#include <cstdio>
+ #include "date.h"
+ #include "texts.h"
+ 
+--- src/filehelper.cpp
++++ src/filehelper.cpp
+@@ -23,6 +23,7 @@
+ #include "filehelper.h"
+ #include "error.h"
+ #include <vector>
++#include <cstdio>
+ using namespace std;
+ 
+ #ifdef WIN32
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
new file mode 100644
index 000000000000..54adcec10daf
--- /dev/null
+++ b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
@@ -0,0 +1,10 @@
+--- src/faulthandler.h.old	2012-07-25 14:37:32.000000000 +0200
++++ src/faulthandler.h	2012-07-25 14:38:16.000000000 +0200
+@@ -50,6 +50,7 @@
+ #include <signal.h>
+ #include <string>
+ #include <sstream>
++#include <unistd.h>
+ 
+ // Note: use --export-dynamic as linker option or you won't get function names here.
+ 
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
new file mode 100644
index 000000000000..1634aa763e4c
--- /dev/null
+++ b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
@@ -0,0 +1,38 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=610654
+Upstream Ticket: https://sourceforge.net/p/dangerdeep/patches/26/
+
+--- a/src/system.cpp
++++ b/src/system.cpp
+@@ -178,7 +178,7 @@
+ 	instance = this;
+ }
+ 
+-system::~system()
++system::~system() DTOR_NOEXCEPT
+ {
+ 	if (!instance) {
+ 		SDL_Quit();
+--- a/src/system.h
++++ b/src/system.h
+@@ -52,6 +52,12 @@
+ #define ASSERT(a,...)
+ #endif
+ 
++#if __cplusplus >= 201103L
++#define DTOR_NOEXCEPT noexcept(false)
++#else
++#define DTOR_NOEXCEPT
++#endif
++
+ class font;
+ class texture;
+ 
+@@ -61,7 +67,7 @@
+ public:
+ 	enum button_type { left_button=0x1, right_button=0x2, middle_button=0x4, wheel_up=0x8, wheel_down=0x10 };
+ 	system(double nearz_, double farz_, unsigned res_x=1024, unsigned res_y=768, bool fullscreen=true);
+-	~system();
++	~system() DTOR_NOEXCEPT;
+ 	void set_video_mode(unsigned res_x_, unsigned res_y_, bool fullscreen);
+ 	void swap_buffers();
+ 
diff --git a/games-simulation/dangerdeep/metadata.xml b/games-simulation/dangerdeep/metadata.xml
new file mode 100644
index 000000000000..461e3ba8e89b
--- /dev/null
+++ b/games-simulation/dangerdeep/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">dangerdeep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
new file mode 100644
index 000000000000..67613482b245
--- /dev/null
+++ b/games-simulation/flightgear-data/Manifest
@@ -0,0 +1,12 @@
+DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668 SHA512 e9a8dfb17c03fb2961e4d031ef63d56c580f029a7ceee816e67c3944a3a79f476ee1c6ad40ce8af530c8551497d9e1329b00805499ad85c4610c07bfaf22d3aa WHIRLPOOL 249ba21e7ad58c885a92094ec403d99bc8879e9c6638b8ebc2e48053c5524c62383c95ddb9bac3039ddbcd50a90b4a690676df642125e4219fc3c7e94f793717
+DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650
+DIST FlightGear-2017.1.3-data.tar.bz2 1460527272 SHA256 bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365 SHA512 eb6140612920b190cec7f2879e4789cfb1ab41ab3c2d463948c592347bfd8f042bb62b499abf94d51e550bc472afe334c77ad750930d954067dc1f6bab66efac WHIRLPOOL c2de9906a0d4f88bafd85edb9b217b1ee766f128c0b6e95f82a6c6a98313c63e26113e5798b5be7e8714831db94bb5c95afc0cbdd570b0c2313dcf856e944523
+DIST FlightGear-2017.2.1-data.tar.bz2 1590727949 SHA256 c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4 SHA512 a6f6ff55d5ff866626b98fdfd77610fcde567aa53f74ccffb22c0580d1b6cc7c50fbc65b9c8b1f75ccfb07434b830b230c73a165c095f9367b67cd37b60018fc WHIRLPOOL dec850a9c1db5d6dec1682671f12b7d8015b29590100ce43f20724eb3d907da37b114f76f51cca4f1cde9e2c0e365cd913d9a42a2f51f91d8a32eef5e98146bc
+EBUILD flightgear-data-2016.4.4.ebuild 516 SHA256 b44cf60ee084202db360b47ac12e16f32238c40652053a1a62ae589915b21e49 SHA512 ae6c1f4c13d4dd776fabfbafcc3b733a300b2f7e43846309cc96f5632d9d76c84103b3606cf5aee94c7970d8e47c1785f018f7c82747ddaeeb66cac70813cf8c WHIRLPOOL 64d619e38e7334f77a4290e70c6e62a56aa7cb8ba2585604273596bcd5f6462f4c6f58b0eb76c323f0606c29a8374f8f11f70997365c5f6606e729d401ac6535
+EBUILD flightgear-data-2017.1.2.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
+EBUILD flightgear-data-2017.1.3.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
+EBUILD flightgear-data-2017.2.1.ebuild 518 SHA256 7f44cda315b809e48dd6baa2753a9b2e612dafb8a3ff5700be7b4096d18d82f4 SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f WHIRLPOOL c8f1d06fd36a4359c053731c7d78683ba2332033922d1ca93869bb65477d429105b4db5d0fa630366775850a32b338573ae06ffbf8e09639c1f007f969dc1949
+EBUILD flightgear-data-9999.ebuild 546 SHA256 4145f97d16b28243830a29d2a8780a2e0505f1103b22abd8609953e14e0ee3d2 SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508 WHIRLPOOL bee0d1836bfe1cf9bf0c45eef3b2412f8a1cc84f2b4adc41ff7633faca0c7bf6c0b9ab3b580bc3dc0f07b839fae0caa8aaee43b72266bce32f4fe9a86656e23e
+MISC ChangeLog 3414 SHA256 08069d29c580931bcce75597ff354c5254e77a90ada53a16b336f66b1ede42a4 SHA512 119d1ed5392f20abe434ab9ceaad010c0113eac3ad139a2d6db26aa45095951a6001c00e0629e5c54238cdd68fd4599b74ff86e30a3e066df3592e03a2361f31 WHIRLPOOL 0b4faae37385bb9b343ed28d3719863e813929e2ff17aee717af8697fedb9e154708256b8964289ab82fe12c1f27e71f97245d328b31910f5d3245f010667eab
+MISC ChangeLog-2015 2399 SHA256 f6b1553db81a37763a7bff18ce113ad72b74cb7c1cc80d7add73aa47553537db SHA512 f235ad5a943659554f42ddb0aed4298324be936e6d3b80df54f54c152a8dfe52c1f3ae406893a5da220f3e4be2370791e8947808a638c484ae6ecabfeb2eea5a WHIRLPOOL 9de9afd13530bc1d6e0b66a9f19a6385dac980ca26cb821051e24e4d8b5ff91d8971b0c6aa91f26531158fd4950f7a83fb40ad87b196e6c9abc60c477cdc6c49
+MISC metadata.xml 445 SHA256 6e0617de604e2010dde3d20a7094d976f9417a8489d586c0d518bd8bffd71d62 SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466 WHIRLPOOL 532dae887d626972e2d921e7b4b46a6e6faaf1e8bd9341523d94ae5352c791f5e7ee8a67ec0620c5b65892e64ac23f391b4f341f9cdfc081930be670cc9e0a54
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
new file mode 100644
index 000000000000..b62a3ff22450
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild
new file mode 100644
index 000000000000..f835ef53253b
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.1.3.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.1.3.ebuild
new file mode 100644
index 000000000000..f835ef53253b
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.2.1.ebuild
new file mode 100644
index 000000000000..f835ef53253b
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2017.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
new file mode 100644
index 000000000000..3e99ac372dbe
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
+	git://mapserver.flightgear.org/fgdata"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear-data/metadata.xml b/games-simulation/flightgear-data/metadata.xml
new file mode 100644
index 000000000000..40aacc328d8e
--- /dev/null
+++ b/games-simulation/flightgear-data/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">flightgear</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
new file mode 100644
index 000000000000..11fe8a7c5961
--- /dev/null
+++ b/games-simulation/flightgear/Manifest
@@ -0,0 +1,14 @@
+AUX ac3d.vim 45 SHA256 fce013503a5a902f19909baf9848387c7ef6ec253bd32eb86613838bc8762b1d SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da WHIRLPOOL 2cd5d63cac76d87bf5da1fbb201c1eee3717b44a9e81a771986bb539acb7d7e3f0fb7e04b383c9c7d51769027900841e3686ba245db25c9f945f00542944fc7b
+AUX nasal.vim 47 SHA256 57ceefdda4970e6f347c0df2aefddd36c15522781e4a2d28ba9f8a249b72a28b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb WHIRLPOOL 10558327431b1818c6e366ee074bd0ef37ebfbddd4abf17783825fe1ec8877b88dc518f58d95fc545ef0403e50d294fb93dd87bc7b6b5fcfd5383e76ad3fadaf
+DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc SHA512 3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0 WHIRLPOOL 0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226
+DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c
+DIST flightgear-2017.1.3.tar.bz2 8056402 SHA256 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad SHA512 93aa27a976bcdd79c76eb9751ba90a79a6146d8f3961c3bdf1db136a99cb9a0ab644c7409a26267181be0476fa455bf739b78cb7028e3e12d5509f96a1d3f303 WHIRLPOOL 55592116f730eaefb57f1d1eb684629c3cfa4e4167ed4f3a17203b1ce7eacb9885f389cb934a4e3f9d10230ce45410ec09dd2b81220a5077f4c4c545dd8a116c
+DIST flightgear-2017.2.1.tar.bz2 8054033 SHA256 c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b SHA512 d4063d93d70046532c061cc6e09e0c6514cd8138c3baac1652b098a9196e5b435eee4e5ed19082a9e1994f95738114d13fe043290e7efb1539c70b107bbd33ea WHIRLPOOL 63e0c461551a361a2204f66fb0460d1884b3b078afc86681983ad843fb0a1fb944f26d23926563785211f2cd87b237adc5776c9d1eea4cb30fb0bd6d9907ed27
+EBUILD flightgear-2016.4.4.ebuild 3573 SHA256 769e4b50ac69ec1b30628f0626ed996233087cbbed769a83e536854b7cb7d6f2 SHA512 55d5b3c0dfee272cef2e2ee20deee26a230b3b339eecb6555cc79605131714c31ceaa5914960b88da3bcde6bf2f01728958b4190217f3da7efbeb67ec03929dd WHIRLPOOL 32f1439c6c93ca52adcdf11dbb2fb1766822a9540eb80f21876e692aedbc74d8f6e95fb64794f4ff61415bbbc993ad2a9e06247ec7929cb3389b014e1924b81c
+EBUILD flightgear-2017.1.2.ebuild 3691 SHA256 52ca76f6110bd6c1a3018dfe4075f722162fc1c8a0318a16c2521083994192d9 SHA512 e53ab6ac5332c118d7292487d9b4ccd17fb6100ebc5588b87de9df84ea622af797236969bc16a7fee287ac63e4a1cd14b9d49e628b4734a2c3a40df3725d3b0c WHIRLPOOL b09741deb57c32c49a72ff89100b9d2c33e45f9f27d7c072b8b129b2027762c516c3a63d899251d4346736aa30ee5c224bbb6112d78eaa2e8bad386416ee20fa
+EBUILD flightgear-2017.1.3.ebuild 3691 SHA256 52ca76f6110bd6c1a3018dfe4075f722162fc1c8a0318a16c2521083994192d9 SHA512 e53ab6ac5332c118d7292487d9b4ccd17fb6100ebc5588b87de9df84ea622af797236969bc16a7fee287ac63e4a1cd14b9d49e628b4734a2c3a40df3725d3b0c WHIRLPOOL b09741deb57c32c49a72ff89100b9d2c33e45f9f27d7c072b8b129b2027762c516c3a63d899251d4346736aa30ee5c224bbb6112d78eaa2e8bad386416ee20fa
+EBUILD flightgear-2017.2.1.ebuild 4015 SHA256 5ccb0ec422cf891d312717df5991b756e5c361337b1224d4cdaebd0b197df9b2 SHA512 446c5bc1a9ac429d14991387704f9d5d40a94c01a0dad1f9cc4a42a79300a70332ddd23e882cd33bf1cc54e92e854bece7629a50c7bce128ddedde5f7221807c WHIRLPOOL 51347a022e789d846f5c3d9e07a2d9df9d2b1282e2783dbbce2069b744a9feaf2a0d4bdd73d1dc60bea16726abdfcd86c8622a0f4a564e714385c471ef23c79f
+EBUILD flightgear-9999.ebuild 4065 SHA256 36fa6d94baa75ae24fe6d6511ec666ce7e475f3c5062aac907bfbf6238a88dd6 SHA512 f7d24c76900b8c265ab6ddddf52a8f7de9359670f061384f16d1467a8ab86bf0fc45d4eea35b63095ac58f975859563b1bf613bc46936dd1237c8c891f150e96 WHIRLPOOL 468c77c47ea1b7618069f80c127fb6909f48cb2475f86bcab1afb5d4c0031b14e923305cc0eb73d0013df09744b4b1253fbc2289fda2739946797963f1aea223
+MISC ChangeLog 3416 SHA256 c4c271c041eca9d091125c23918c8aa393f787190d8a79f675cd475661f8c1cc SHA512 d02d259f509359b07c3188542abad3dee052eb5cb57a3e75652f45a1b10b9cd965562a91f2ef27170289d512e07f93ad8490a889d5334087dece5214530df65b WHIRLPOOL caf3cef2cf84cff047ee04b9fbf9b8eb5c3f3160c18e319d876c07a84ccdc22025803c03595dceeb0f3b1d921ae33f51de1472a7b9874610b0c01233f9838ffd
+MISC ChangeLog-2015 13813 SHA256 f4912ce531c377cf9c5d71c08db3e419e63e9783b2f7858fa410a2d5119aaab3 SHA512 b090c22881f5bee0262349f3aa63dc6500fe51c69e08d834d0bf72cd5919dd82f6593e6c2cd62dfa4ea91198b5c75c36e723a602ad89f376fcc174ef5abc69b5 WHIRLPOOL 7ffffda05c252ff7162b334ef441c16cb868d8f587213e67de22eb55e33ab7ab5a56cdd79abbfac6701232e49b4c177946cf4ecdc287eca9e320e2172ec280a3
+MISC metadata.xml 867 SHA256 0454c6cb95bbffc7e40e1a8606e0bdb6a7f6d2fdcbda849fd02b5ad4e9a69452 SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943 WHIRLPOOL 54f54ea9a9e81d4ff8799d0ec1b45b236042897029fc010a694a99a1227bad57fe36711051db4a5840ad66951b95d955a3eb9d28c3068c367a6505e592e9384d
diff --git a/games-simulation/flightgear/files/ac3d.vim b/games-simulation/flightgear/files/ac3d.vim
new file mode 100644
index 000000000000..6477d949b762
--- /dev/null
+++ b/games-simulation/flightgear/files/ac3d.vim
@@ -0,0 +1 @@
+au BufRead,BufNewFile *.ac set filetype=ac3d
diff --git a/games-simulation/flightgear/files/nasal.vim b/games-simulation/flightgear/files/nasal.vim
new file mode 100644
index 000000000000..65a2ed17fc26
--- /dev/null
+++ b/games-simulation/flightgear/files/nasal.vim
@@ -0,0 +1 @@
+au BufRead,BufNewFile *.nas set filetype=nasal
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
new file mode 100644
index 000000000000..27b7a3f6366b
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}
+	media-libs/openal
+	|| (
+		(
+			>=media-libs/speex-1.2.0:0
+			media-libs/speexdsp:0
+		)
+		<media-libs/speex-1.2.0:0
+	)
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/libpng:0
+		virtual/opengl
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install icons and menu entry
+	local s
+	for s in 16 22 24 32 48 64 128; do
+		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+	done
+	doicon -s scalable icons/scalable/${PN}.svg
+	use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+	newmenu package/${PN}.desktop ${PN}.desktop
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-2017.1.2.ebuild b/games-simulation/flightgear/flightgear-2017.1.2.ebuild
new file mode 100644
index 000000000000..caf3f423149a
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.1.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install icons and menu entry
+	local s
+	for s in 16 22 24 32 48 64 128; do
+		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+	done
+	doicon -s scalable icons/scalable/${PN}.svg
+	use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+	newmenu package/${PN}.desktop ${PN}.desktop
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-2017.1.3.ebuild b/games-simulation/flightgear/flightgear-2017.1.3.ebuild
new file mode 100644
index 000000000000..caf3f423149a
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.1.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install icons and menu entry
+	local s
+	for s in 16 22 24 32 48 64 128; do
+		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+	done
+	doicon -s scalable icons/scalable/${PN}.svg
+	use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+	newmenu package/${PN}.desktop ${PN}.desktop
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-2017.2.1.ebuild b/games-simulation/flightgear/flightgear-2017.2.1.ebuild
new file mode 100644
index 000000000000..058c18d7f7b1
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2017.2.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtdeclarative-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtnetwork-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Release
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install icons and menu entry
+	local s
+	for s in 16 22 24 32 48 64 128; do
+		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+	done
+	doicon -s scalable icons/scalable/${PN}.svg
+	use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+	domenu package/org.flightgear.FlightGear.desktop
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
new file mode 100644
index 000000000000..a4ad24d989ca
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
+	git://mapserver.flightgear.org/${PN}"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.4.1:5
+		>=dev-qt/qtdeclarative-5.4.1:5
+		>=dev-qt/qtgui-5.4.1:5
+		>=dev-qt/qtnetwork-5.4.1:5
+		>=dev-qt/qtwidgets-5.4.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_LOGGING=$(usex test)
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Nightly
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install icons and menu entry
+	local s
+	for s in 16 22 24 32 48 64 128; do
+		doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+		use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+	done
+	doicon -s scalable icons/scalable/${PN}.svg
+	use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+	domenu package/org.flightgear.FlightGear.desktop
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
new file mode 100644
index 000000000000..2f0f827b8840
--- /dev/null
+++ b/games-simulation/flightgear/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="dbus">Enable screensaver DBus interaction</flag>
+		<flag name="gdal">Enable alternative terrain engine based on pagedLOD using <pkg>sci-libs/gdal</pkg></flag>
+		<flag name="qt5">Build Qt5 launcher application</flag>
+		<flag name="udev">Enable event-based Input devices through <pkg>virtual/udev</pkg></flag>
+		<flag name="utils">Build various utilities (fgpanel, fgviewer among others)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">flightgear</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/gl117/Manifest b/games-simulation/gl117/Manifest
new file mode 100644
index 000000000000..e0e4bfcf1fe5
--- /dev/null
+++ b/games-simulation/gl117/Manifest
@@ -0,0 +1,7 @@
+AUX gl117-1.3.2-mode.patch 394 SHA256 8720ef21cf7c219a4494338a2e68fbd903e897f390e7e81afcb90b41d7fc0c03 SHA512 b6bdfa938f19481dff3f4d275826f1308aea99c1a2fc78df6f2b49096ecabce6c476cbf7de64afd0ac0903ea0ac3b5d84e43a876ae333bd0db20b39a0085ca11 WHIRLPOOL 16578bd11e70457849ba3ef6dca313cdb03e535403b925c3fcaf79adf95edb25dc2defb9107d397eb02a9f266109306ad2fb602ffa7ef993de82a701b6c3b6b6
+DIST gl-117-1.3.2-src.tar.bz2 2411075 SHA256 64bd0190a102725c76eba4983a5d79a0979ec42a087c56c8025b461f6e0e6ffb SHA512 1d2382576c6399d8c84d56ddc7eb2b11b9e1e3ffeebcc1bd30e258ef231626d15d1be649f8c791f30e4f2f78aca2b4290c5d08036c5f482eef01eda8f4f48b5f WHIRLPOOL a94ec54e7b4d436f65932c53e24da96223de93a2382188f0b449282de20f132899d519dec898682c9a0e07a0a8621b403bb74a416454a0da86811f1066889ef1
+EBUILD gl117-1.3.2-r1.ebuild 790 SHA256 326e2ed655aabd30a48a0ea561f59d0888d454a4c8ed7e441d822854ea2f1f5e SHA512 dfa801635069584401af3e9b7fed23ed79cd54217dfffe1a5f3666704d666a11fd470adfd437fe02d05e46179477981ab3b9128edacbc6663c635b069faa02f8 WHIRLPOOL ba6171c5f71bbcf485ef76b6e6c46b6deebaba1d82312031310c576cce1247433e91b723fa7f48e5366e2ecdb3a703eeb439b6c5a17d95e3ce03eda9de2fcad4
+EBUILD gl117-1.3.2.ebuild 820 SHA256 ae55c331ab8ad967190bc5c95c63761d3b46191186f9d4d6d5a8969dd2d62f72 SHA512 effe0b1f8bcf8fe67136a9341c3ee1d9cc70391ab03f0bc62ce06842b4c44af725ff7a17b0aad7665dc57368c20ba7afb8fbfd1bc5621378c209c2306b5bb163 WHIRLPOOL 02a3e9bd371e43e52635b6df819d9b05322ca9ba94b77df3613181d9638b35e39d5601382625834048340c96322708a0205192d9b3fb6008f916e9cdfa08c63e
+MISC ChangeLog 2740 SHA256 ceb1592e33eae8c88eeb25f16f9d8654d95d0fd2416356c7b79b0f97f6201d9a SHA512 41eaa1d8530ea7d3706f4755da481b906921173ca65def02e333a1707cf3b070f79b8e549807cfd2fd54f468d2f33f4e118dd4cc0bef73e53b8647fdc3b9466d WHIRLPOOL 49c71f840e20cda0d585b3372d2a61798f72f6d5cd5daba0537664b848236546dde6bca21d04c60d62d2bf2fb8c3cbe556ef170144bca696a24c261b9a99f147
+MISC ChangeLog-2015 3337 SHA256 b0f29d479f84dada96ac4f84c0c89dd50bd39ce904cb9ff6ce32775593f0bd88 SHA512 9315e6515141c5943027735b490ba6c2d4c20e16744eff00a3e053141fdc0bded464012c39458f6fb7a5854cdc3a477d93dd92de58d17a1f73573d12d9f9d74a WHIRLPOOL 42ec44294f65c2a755531d442f15a88b4445013063239be44b59602db8fee2ff9149b945d7ff3427e4ee312d6b9a662c989d81ddf067894b8ae4369378fafc95
+MISC metadata.xml 329 SHA256 75a3a0ec0e7050e60b2c64673c0d2b203336a7bfb84beed014f5a5b5f27d340e SHA512 a2756adb5a9afa30e93c7f7726706ed9b435f76631d268685f9fea734a4ef6e643a8f8fdae8f59cc979a1bfcb91e2778496828db50458d6adacd789b3b3763f9 WHIRLPOOL df28f8076b2900d1512226e7e4b362bfa9ec2bb4bd919fcf216e73f2e699041d772d40ab4e48a1873fec9eadbcabe2fd840ade85834d1883286be641ec248aca
diff --git a/games-simulation/gl117/files/gl117-1.3.2-mode.patch b/games-simulation/gl117/files/gl117-1.3.2-mode.patch
new file mode 100644
index 000000000000..d3f13084a96f
--- /dev/null
+++ b/games-simulation/gl117/files/gl117-1.3.2-mode.patch
@@ -0,0 +1,12 @@
+--- a/src/main.cpp	2010-07-13 09:35:18.374122609 +0100
++++ b/src/main.cpp	2010-07-13 09:35:45.334955120 +0100
+@@ -71,8 +71,7 @@ int mode = 0;
+ 
+ // pre-defined screen resolutions (x, y, bpp, fullscreen)
+ int resolution [4] [4] =
+-        { { 1024, 768, 32, 1 },
+-          { 800, 600, 32, 1 },
++        { { 800, 600, 32, 1 },
+           { 640, 480, 32, 1 },
+           { 640, 480, 32, 0 } };
+ 
diff --git a/games-simulation/gl117/gl117-1.3.2-r1.ebuild b/games-simulation/gl117/gl117-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..f5c52f6068ab
--- /dev/null
+++ b/games-simulation/gl117/gl117-1.3.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+MY_P="gl-117-${PV}-src"
+DESCRIPTION="An action flight simulator"
+HOMEPAGE="http://www.heptargon.de/gl-117/gl-117.html"
+SRC_URI="mirror://sourceforge/gl-117/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/freeglut
+	media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/sdl-mixer[mod]
+	virtual/glu
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mode.patch
+)
+
+src_install() {
+	DOCS="doc/gl-117.pdf AUTHORS ChangeLog FAQ NEWS README" \
+		default
+	newicon doc/src/falcon.jpg ${PN}.jpg
+	make_desktop_entry gl-117 GL-117 /usr/share/pixmaps/${PN}.jpg
+	doman doc/gl-117.6
+}
diff --git a/games-simulation/gl117/gl117-1.3.2.ebuild b/games-simulation/gl117/gl117-1.3.2.ebuild
new file mode 100644
index 000000000000..6225adb3ebfa
--- /dev/null
+++ b/games-simulation/gl117/gl117-1.3.2.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
+
+MY_P="gl-117-${PV}-src"
+DESCRIPTION="An action flight simulator"
+HOMEPAGE="http://www.heptargon.de/gl-117/gl-117.html"
+SRC_URI="mirror://sourceforge/gl-117/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/sdl-mixer[mod]
+	virtual/opengl
+	virtual/glu
+	media-libs/freeglut"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mode.patch
+}
+
+src_install() {
+	DOCS="doc/gl-117.pdf AUTHORS ChangeLog FAQ NEWS README" \
+		default
+	newicon doc/src/falcon.jpg ${PN}.jpg
+	make_desktop_entry gl-117 GL-117 /usr/share/pixmaps/${PN}.jpg
+	doman doc/gl-117.6
+	prepgamesdirs
+}
diff --git a/games-simulation/gl117/metadata.xml b/games-simulation/gl117/metadata.xml
new file mode 100644
index 000000000000..e991eac66f1d
--- /dev/null
+++ b/games-simulation/gl117/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">gl-117</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
new file mode 100644
index 000000000000..9d305eceafde
--- /dev/null
+++ b/games-simulation/lincity-ng/Manifest
@@ -0,0 +1,6 @@
+AUX lincity-ng-2.0-build.patch 886 SHA256 61566cc74c941676f12826736f74ac4fad4146e905772e12c193cb6b2ba141ac SHA512 0ac99a14e61ec3341dbe2d46f5a36e0a4d9e2dca4fceb2ddc8754a901eebdb2a8251c66fac36359688c77a2243ad4388142215bc57d6acd762723aee73c5f3d5 WHIRLPOOL b71cd4e55e8f1d1e67c34f4c812d18b189f25af3e5e91543acbe9782d1abd9d5ce57c446de2f81cbe7b1e78f85331add1b8cefdda10f4e7aa0c64ee82b84a439
+DIST lincity-ng-2.0.tar.bz2 39475719 SHA256 a6b206a5dfc7a817669f4fc7cbc012bd4a7073c42f918ceb2f1f484cc0b06606 SHA512 d85cd398145d1591f8640458c076f2a0b55713c39ede28b67d99adc7b76d38f09b58cd2ec84d9acac11bbaa794f6d97f6200f54efcdd4286315e6b3133284c55 WHIRLPOOL d218d0475198c9852abf18caab55df57c2dc0026c74db3215c66c4915758c9f4e608906ccdeb8ff9b83eace67ad4cdcb3e5d5d7dd5d1a7aa4c18131e03646d91
+EBUILD lincity-ng-2.0.ebuild 1104 SHA256 bcffd85c23c1f8c51cfe79b4bfa62b2d1019fa2fbdf97377b47567e5a00b74d1 SHA512 1b389aa3e895337012cebf602849c5c5ac645ce6cd254f3efa2b90367f78387bfcfe3338da7d92ab6f0c5c97d72f9b9cba659c99d607c222211c6878c4af0483 WHIRLPOOL 7a417fe65d5ed1d5187958146d9057476c5c219624371d1cd7ec3ecb19be207820e6f15ce60a7339c729b94b4c43d5da98483405e0aaced676a93881536235d9
+MISC ChangeLog 2588 SHA256 7a6e8560246e4c8a9850c9b9e33cd34d813722c609837a69a9af4440894d5721 SHA512 62952c99e191e1cbd0cd9bc68bd910aced3e59a32b1cbd30a41d2da7ba4acda4a5f6b0885bc762346bb204aaa1d781c642cb9e3f9f32c5c0c0c4d1d14d4cbf41 WHIRLPOOL cfb8068e81f796fe8d2d40db7023c90bbc2727f98901388f4800555a1eebafb6390920412b0e510477ef3ab4dae59803313c6768d5a2b2157305e8456ce568dc
+MISC ChangeLog-2015 3520 SHA256 d0033fdf5c8363be5cc419139ec3e7c8cc31953ea020b70de47adcaf318e20b8 SHA512 ea7028d41da3913a7033fd097760b98ac8faba1eaeada12f7c1250bcd18c970cab0fd05ff77e9a48513f9d04d6749c62181754762fc53ef4818c7f39ac70a21b WHIRLPOOL 6690727497b19200439d913ef581ee988f7989a50f8624cd0ae4073f4a9eb04f41d36ea12cf88c967f520547090b6e754a7dbf82524b6d7c9c85238183cdbd66
+MISC metadata.xml 341 SHA256 83b753295a334d277cab7f0595e341bf7f8c1446e3e79c19bd4bd44ce851bf53 SHA512 0c2607743dbc1b832fad2d9edf774b51c9e816cca447c5991cd3958f001fded11bfd0fd0b90316ddab7c3371b0ec98d6f4ada27054e5d74e3295cf2cd1beeb90 WHIRLPOOL 1fabc42622b701923778ed62ba53f5fa30d29aad9d016bc373f0b3af3b816a2a3dee4a6b478b5d1df29d13e63e56a93a59a4e1f754306bf6a5be0102a56b5d34
diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
new file mode 100644
index 000000000000..ad2f2eeaff8d
--- /dev/null
+++ b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
@@ -0,0 +1,35 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Jul 30 07:06:54 UTC 2012
+Subject: build system
+
+arguments to AR would be overwritten if we export AR
+
+--- lincity-ng-2.0.orig/lincity-ng.desktop
++++ lincity-ng-2.0/lincity-ng.desktop
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+ Type=Application
+ Version=1.0
+-Encoding=UTF-8
+ Name=Lincity-NG
+ GenericName=City Simulation Game
+ GenericName[de]=Stadtsimulationsspiel
+ Comment=Plan and Build a city and take care of transport, economics, electricityand others.
+-Icon=lincity-ng.png
++Icon=lincity-ng
+ Exec=lincity-ng
+ Terminal=false
+ StartupNotify=false
+--- lincity-ng-2.0.orig/mk/jam/unix.jam
++++ lincity-ng-2.0/mk/jam/unix.jam
+@@ -45,4 +45,10 @@
+     $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
+ }
+ 
++# jam Archive action seems to include the arguments which will break our AR export
++actions Archive
++{
++  $(AR) ru $(<) $(>)
++}
++
+ 
diff --git a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
new file mode 100644
index 000000000000..23fc4c1cd3e5
--- /dev/null
+++ b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multiprocessing games
+
+DESCRIPTION="city/country simulation game for X and opengl"
+HOMEPAGE="https://sourceforge.net/projects/lincity-ng.berlios/"
+SRC_URI="mirror://sourceforge/lincity-ng.berlios/${P}.tar.bz2"
+
+LICENSE="GPL-2 BitstreamVera"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT=mirror
+
+RDEPEND="virtual/opengl
+	sys-libs/zlib
+	dev-libs/libxml2
+	media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf
+	media-libs/sdl-gfx
+	dev-games/physfs"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/ftjam"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	jam -q -dx -j $(makeopts_jobs) || die "jam failed"
+}
+
+src_install() {
+	jam -sDESTDIR="${D}" \
+		 -sappdocdir="/usr/share/doc/${PF}" \
+		 -sapplicationsdir="/usr/share/applications" \
+		 -spixmapsdir="/usr/share/pixmaps" \
+		 install \
+		 || die "jam install failed"
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
+	prepgamesdirs
+}
diff --git a/games-simulation/lincity-ng/metadata.xml b/games-simulation/lincity-ng/metadata.xml
new file mode 100644
index 000000000000..7dd75a46b634
--- /dev/null
+++ b/games-simulation/lincity-ng/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">lincity-ng.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest
new file mode 100644
index 000000000000..62dcb8da919c
--- /dev/null
+++ b/games-simulation/lincity/Manifest
@@ -0,0 +1,7 @@
+AUX lincity-1.13.1-build.patch 2196 SHA256 c816e3723244fe2e158b23611a1b70d90b34d38a70cc6835379032de9689c24e SHA512 c0590673e7f04e16ffb6c9a25ce0f00d25dcaf689908117647e00989ed6db3a2c5d1db63abeb23e5c9a0f0999219515a53994ed4400f2712a8dea5b6eca5a8b3 WHIRLPOOL 872e9bad67c0e98afffd1960a79304db60f512f50a38ac3d7927417c64fb850797839004c150fa00885f197c38712d51532d6f7d07ba1aad46c5076b1d5e6bdb
+DIST lincity-1.13.1.tar.gz 1064236 SHA256 7b4cbd11ffd4cbed79a0aadb25f2b1c34e25a8201182fbb259ce2f450fe5015d SHA512 bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc WHIRLPOOL b2065c73fda1f1ce3fc7803653a3ee9acadd58ad3d1f6b040cca7fe0c58df9d27d72894688b932013124ab0b866fc1fab68b94c25ab3fbf02c7f0b2a21d700c5
+EBUILD lincity-1.13.1-r1.ebuild 946 SHA256 abf9735b5508cb66349487136b3953c804a5b01e4af9e7ddbe41e94515081bbd SHA512 7a47b905d33c64cfd627af661a66ab3224e4c508e9857bc6cf054621097089eb3d7d21c138a83786f038ce860e3c4fc4a1d7dd131200fdc4886c530d7ccf6aeb WHIRLPOOL 600914ef518133eca62d199658360f626889d2d363694da370f3189a1e241dc63deeaf06137ac21eaf5e5c6df4bc787fe785e2c4ae4937b58576c2a16d3cde5e
+EBUILD lincity-1.13.1.ebuild 959 SHA256 9137444b4e7424fa4b8680b85914e43571beff2323cf232deb5360db78a4aa5b SHA512 e92c5af61afb163420da0212e7024de53c1a1e14abf20251a87f05272337636ddb4b71e119714dd32c842a8d52d305185abe3c11f1d4c502b7f39a637f4cfb7a WHIRLPOOL bf34c926d9f07b9bd5fff5e616b007de5d5f0119bd7f59eade6c184b1af685d7a69ca7f7c186b88025d1b117eb3bf3bbb267dd9d68b07430dfdecd7a55338843
+MISC ChangeLog 3029 SHA256 5bb0511d817dc4bd18b61e8662d72b2077509ca810b0e813d6f66e3962355948 SHA512 b730a57bf0674662cb63cb73580da848747e97c77ef7c0519872afdb07898fb6f4f0b5747fd147e22a26fbfa29bf6941b44967ff9ca6ff5e334ca2332abf1292 WHIRLPOOL 84ad576ab1a805bac4099d05ca2bfc17d3353d8af2d2509965b5890760fd83dfe0416f99faadbc45fdfa7e47b4e5cf7241a8ee5270b13373114310fedd2d9408
+MISC ChangeLog-2015 3777 SHA256 f79bb9fa541d9d68fa61fcfcff2ffed881a0e35a103e3a0a5b1fd19b6cee3e44 SHA512 1c625ae5ec3fe945b1a01c2b44d963bbf4e907bb07ae938e0b3b7a51b84cc606c82c7cfd5a493474a043336ca595aaa12f9e04afad47e0497891c3d395bd56a0 WHIRLPOOL e9afdcc2d361e8049f6225b767821642b570cb2266b4b5bf3110803928f4815d4458ff63d9c6764b30b2869c1849d0602f2bbb596980b0402e1bb5f968b8ba79
+MISC metadata.xml 330 SHA256 d08ac9bf2de2516402c92e9dc9d059da0abb95c278cff4b8308518169b7e7d5c SHA512 c36fecc06a5c84b3a93dfd25ffeb05bb14a5a96676eb1d7e976903ef7892a10c22ee7afa894c581c0bc3079ce2e30574143cc6b49195b346463c48f3e34ff1c0 WHIRLPOOL 98d05323eb7de2d3e2312a787932af5071f1ea6f3bd916d16c05d3dc14635dc3ecf43e216980110aefff2a85ca82a970679c2d4261b78d0107b268b165564d12
diff --git a/games-simulation/lincity/files/lincity-1.13.1-build.patch b/games-simulation/lincity/files/lincity-1.13.1-build.patch
new file mode 100644
index 000000000000..f7f41f954baf
--- /dev/null
+++ b/games-simulation/lincity/files/lincity-1.13.1-build.patch
@@ -0,0 +1,74 @@
+--- lincity-1.13.1.orig/intl/Makefile.in
++++ lincity-1.13.1/intl/Makefile.in
+@@ -32,7 +32,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/intl
+ aliaspath = $(localedir)
+ subdir = intl
+--- lincity-1.13.1.orig/mouse.c
++++ lincity-1.13.1/mouse.c
+@@ -1057,7 +1057,7 @@
+    and set to 1 if the existing transport if the more expensive sort
+    (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
+ */
+-inline int
++int
+ mt_erase(int x, int y)
+ {
+     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
+--- lincity-1.13.1.orig/pixmap.c
++++ lincity-1.13.1/pixmap.c
+@@ -390,7 +390,7 @@
+ 		  likes it in the file.  Still need to fix this in autoconf,
+                   but for now this will do. */
+ #if !defined (WIN32)
+-inline int 
++int 
+ pixmap_index (int x, int y)
+ {
+     return y*pixmap_width + x;
+--- lincity-1.13.1.orig/pixmap.h
++++ lincity-1.13.1/pixmap.h
+@@ -19,7 +19,7 @@
+ void initialize_pixmap (void);
+ void resize_pixmap (int new_width, int new_height);
+ int pixmap_getpixel (int x, int y);
+-inline int pixmap_index (int x, int y);
++int pixmap_index (int x, int y);
+ int pixmap_getpixel (int x, int y);
+ void pixmap_setpixel (int x, int y, int col);
+ void pixmap_hline (int x1, int y1, int x2, int col);
+@@ -33,7 +33,7 @@
+  * Public Inline Functions
+  * ---------------------------------------------------------------------- */
+ #if defined (WIN32)
+-inline int 
++int 
+ pixmap_index (int x, int y) {
+     return y*pixmap_width + x;
+ }
+--- lincity-1.13.1.orig/po/Makefile.in.in
++++ lincity-1.13.1/po/Makefile.in.in
+@@ -21,7 +21,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+--- lincity-1.13.1.orig/readpng.c
++++ lincity-1.13.1/readpng.c
+@@ -3,6 +3,7 @@
+  * This file is part of lincity (see COPYRIGHT for copyright information).
+  * ---------------------------------------------------------------------- */
+ #include <stdlib.h>
++#include <string.h>
+ #include "png.h"
+ #include "malloc.h"
+ #include "lin-city.h"
diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
new file mode 100644
index 000000000000..02968c06f2ed
--- /dev/null
+++ b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic
+
+DESCRIPTION="city/country simulation game for X and Linux SVGALib"
+HOMEPAGE="http://lincity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+# dep fix (bug #82318)
+RDEPEND="media-libs/libpng:0
+	x11-libs/libSM
+	x11-libs/libXext
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+	default
+
+	append-cflags -std=gnu89 # build with gcc5 (bug #570574)
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-gzip \
+		--with-x
+}
+
+src_compile() {
+	# build system logic is severely broken
+	emake
+	emake X_PROGS
+}
+
+src_install() {
+	default
+	dodoc Acknowledgements CHANGES README* TODO
+	make_desktop_entry xlincity Lincity
+	dobin xlincity
+}
diff --git a/games-simulation/lincity/lincity-1.13.1.ebuild b/games-simulation/lincity/lincity-1.13.1.ebuild
new file mode 100644
index 000000000000..96430e5e40d9
--- /dev/null
+++ b/games-simulation/lincity/lincity-1.13.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic games
+
+DESCRIPTION="city/country simulation game for X and Linux SVGALib"
+HOMEPAGE="http://lincity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+# dep fix (bug #82318)
+RDEPEND="media-libs/libpng:0
+	x11-libs/libXext
+	x11-libs/libSM
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	append-cflags -std=gnu89 # build with gcc5 (bug #570574)
+}
+
+src_configure() {
+	egamesconf \
+		$(use_enable nls) \
+		--with-gzip \
+		--with-x
+}
+
+src_compile() {
+	# build system logic is severely broken
+	emake
+	emake X_PROGS
+}
+
+src_install() {
+	default
+	dodoc Acknowledgements CHANGES README* TODO
+	make_desktop_entry xlincity Lincity
+	dogamesbin xlincity
+	prepgamesdirs
+}
diff --git a/games-simulation/lincity/metadata.xml b/games-simulation/lincity/metadata.xml
new file mode 100644
index 000000000000..41975d1ec190
--- /dev/null
+++ b/games-simulation/lincity/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">lincity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/metadata.xml b/games-simulation/metadata.xml
new file mode 100644
index 000000000000..9a1d4a49170f
--- /dev/null
+++ b/games-simulation/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-simulation category contains simulation games.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-simulation enthält Simulatoren.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-simulation contiene juegos de simulación.
+	</longdescription>
+	<longdescription lang="ja">
+		games-simulationカテゴリーにはシミュレーション・ゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-simulation categorie bevat simulatiespellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-simulation chứa các trò chơi mô phỏng.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-simulation contiene giochi di simulazione.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria games-simulation contém jogos de simulação.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria games-simulation zawiera gry symulacyjne.
+	</longdescription>
+</catmetadata>
+
diff --git a/games-simulation/micropolis/Manifest b/games-simulation/micropolis/Manifest
new file mode 100644
index 000000000000..40fc153e4214
--- /dev/null
+++ b/games-simulation/micropolis/Manifest
@@ -0,0 +1,7 @@
+DIST micropolis-activity-source.tgz 7676438 SHA256 1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc SHA512 fe65966c43d044e01a63a3cfe3cad48466eb1e5ec8b13c03abb52d582395a8ab527332d4d04454a4f32e85b65e55d72fe5e4d53a3f37b422d90e9208f00d9976 WHIRLPOOL 2bc497ce79b9041a6e3a2dcd84b4e135c844652afe23d546ad7aa5c66dee3422151329a04bbbc105a199427b4ed0580f79d3232d0b13f09a89b013e006321f3e
+DIST micropolis_git.patch 83549 SHA256 13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592 SHA512 9d1801478a27184c48d327094cad8238f7972c2cf3624c7c196375f2dd20c3374575b393d44cb2fb99613e19d66c4cc4fb27ae52df9fddf4e42adb42523bdc17 WHIRLPOOL fde6ad3bf7395ef51f482aba816d99bb5af302f357e4d9cd218d9ba7e4a0d78f8927e33c76cf0e340c5ff3b9b5b16f5e26495b07b5d80f701f560a1a7c7730ad
+EBUILD micropolis-1.0-r1.ebuild 1190 SHA256 1ac01c3ce074f6f51503061937d74e9317aebae993a441e9558bf242194c589e SHA512 227c999dffdd95f89123d987d0eaece6672899147db634181e6080399d83fceb2eac6565601e6baa79dacfc0f137b0a3a20a7ee10b1fd5986c87645e573e7574 WHIRLPOOL f54f840b975a47ed48042bb4ae41fcfd65035a0a859f957793dfe37244b70aadc0ec5b1ddde46d12440d1f9af3741c02f934c49e6c58b325abb9c81ba2d37dba
+EBUILD micropolis-1.0.ebuild 1204 SHA256 88b2402b6e69089bb07621b1e260012b5f2d99c6410aa765d53359a62aed0d88 SHA512 9e43fedefeee51043ffd3889970d69b68ca05b4a53cc64a71989ca8f2ab220f109cbe25ad1a79d8503b6da00168f4262fa84da2b0e740946850c2fabc9e25149 WHIRLPOOL cd6205ef2a18b3affbe927a2bcee04d04f67ddf7d5272ecfe38e56d74d5ecf220891fbefa605d17a965403e3fdddf6e77c76ff76f937f001e3e27ee87e1c1b71
+MISC ChangeLog 2696 SHA256 2399b791975f77362769f3707acf94fa6e857f577a6f5dba954dc9bead3b5cd0 SHA512 d8a7b6b7af74214225562dee913991ec4d1a15304635dadbdc08773877c283094f3c049b3010564df8f17c057b5f3201adc4e28054fd2cf9824e6aeeb033b6fa WHIRLPOOL 20f0819bd76b2e237f1bfa10b47b942645efc7940394458861950ea6bc2635b9a0d0a89969481c4ce4c5a1aac60e634e7ba97c5b397349da534e52e8a9882e40
+MISC ChangeLog-2015 1084 SHA256 004676ba89592958d1455881fd724a9be0c44ff3326aba799f6f7413201fdfbd SHA512 f1a9b241068fbc34e8011dec37d86b58ed59cd0b69e8545ff11c879b75f424af14e5510d2a61ce2d4f92827a62af3d2043ed5feb0a49290725d596dce0bf99e4 WHIRLPOOL 05e7bd5adae9b7eb488173ba6b2c7cb0f691466dab758e66c848fa0a3e2415b0695705a91748edfa97643cbfb967fc67b1d0cdc4bcd001cb8a41c154e2b36844
+MISC metadata.xml 318 SHA256 e85ec4a9347569e677d85c643dfc1b766d50db1f8d37a3adae9e6108e75e84c7 SHA512 7dde0fe493b040693af161ef449f7d5bce64988568d7fdf5eae0f9c7e8e404386a498da6aaae768e60ebc84bc948e8a65642cbb6ad8f128bd52163722ba129bc WHIRLPOOL 412ee46dd326e731e97f7b17710cecc813b72ee83adf349398289d2c4b5a56a38f9f6f6288f6275df14f7345a7622301c0a9e43316e016e88a9b74428737ec8f
diff --git a/games-simulation/micropolis/metadata.xml b/games-simulation/micropolis/metadata.xml
new file mode 100644
index 000000000000..eac64a74f324
--- /dev/null
+++ b/games-simulation/micropolis/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
+<maintainer type="project">
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-simulation/micropolis/micropolis-1.0-r1.ebuild b/games-simulation/micropolis/micropolis-1.0-r1.ebuild
new file mode 100644
index 000000000000..b6f6a4e58bd3
--- /dev/null
+++ b/games-simulation/micropolis/micropolis-1.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Free version of the well-known city building simulation"
+HOMEPAGE="http://www.donhopkins.com/home/micropolis/"
+SRC_URI="http://www.donhopkins.com/home/micropolis/${PN}-activity-source.tgz
+	http://rmdir.de/~michael/${PN}_git.patch"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	x11-libs/libX11
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+S=${WORKDIR}/${PN}-activity/
+
+PATCHES=(
+	"${DISTDIR}"/${PN}_git.patch
+)
+
+src_unpack() {
+	unpack ${PN}-activity-source.tgz
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s:-O3:${CFLAGS}:" \
+		src/tclx/config.mk src/{sim,tcl,tk}/makefile || die
+	sed -i -e "s:XLDFLAGS=:&${LDFLAGS}:" \
+		src/tclx/config.mk || die
+}
+
+src_compile() {
+	emake -C src LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local dir=/usr/share/${PN}
+
+	exeinto "${dir}/res"
+	doexe src/sim/sim
+	insinto "${dir}"
+	doins -r activity cities images manual res
+
+	make_wrapper micropolis res/sim "${dir}"
+	doicon Micropolis.png
+	make_desktop_entry micropolis "Micropolis" Micropolis
+}
diff --git a/games-simulation/micropolis/micropolis-1.0.ebuild b/games-simulation/micropolis/micropolis-1.0.ebuild
new file mode 100644
index 000000000000..8bbcfaa349d1
--- /dev/null
+++ b/games-simulation/micropolis/micropolis-1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Free version of the well-known city building simulation"
+HOMEPAGE="http://www.donhopkins.com/home/micropolis/"
+SRC_URI="http://www.donhopkins.com/home/micropolis/${PN}-activity-source.tgz
+	http://rmdir.de/~michael/${PN}_git.patch"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	media-libs/libsdl
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+S=${WORKDIR}/${PN}-activity/
+
+src_unpack() {
+	unpack ${PN}-activity-source.tgz
+}
+
+src_prepare() {
+	epatch "${DISTDIR}"/${PN}_git.patch
+	sed -i -e "s:-O3:${CFLAGS}:" \
+		src/tclx/config.mk src/{sim,tcl,tk}/makefile || die
+	sed -i -e "s:XLDFLAGS=:&${LDFLAGS}:" \
+		src/tclx/config.mk || die
+}
+
+src_compile() {
+	emake -C src LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local dir=${GAMES_DATADIR}/${PN}
+
+	exeinto "${dir}/res"
+	doexe src/sim/sim
+	insinto "${dir}"
+	doins -r activity cities images manual res
+
+	games_make_wrapper micropolis res/sim "${dir}"
+	doicon Micropolis.png
+	make_desktop_entry micropolis "Micropolis" Micropolis
+
+	prepgamesdirs
+}
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
new file mode 100644
index 000000000000..8f3042e2ef75
--- /dev/null
+++ b/games-simulation/openrct2/Manifest
@@ -0,0 +1,5 @@
+DIST openrct2-0.1.1.tar.gz 6284135 SHA256 5d7a6c7f3c770e7de506958f86789c438c543c27d312fd096322cde4e89f50ad SHA512 fd84907819ac317af88c0446afcb04acdb43cd6671f0837f1294191aacf58e93887d46e6eb28d86f558577f4e7c834bc42a9ec486f67e0b64cb7bc0cc1bda427 WHIRLPOOL 9e673852d653fe8e1839db96d124b1cc1e7e4f7a594ec05c1a895c883da234e536851025c75e0fcacb3be776cb3dd1dea9ad7ac028cfda6434095146ba68c5e7
+DIST openrct2-title-sequence-v0.1.0.zip 1766393 SHA256 1df6ad253896bd09b728616f7bf12f4b797ef9db2b9bab8465b08662f47f4bef SHA512 0d1b47c5fc5d1d9e5580b30d0f43d5532b388f1a5685060ca9313ec2f76c61a5fc96b8aa37689072b71edd9fb1aedddd46fa38c237ccb7198841d7bc33bf2a2b WHIRLPOOL f78612445dda2c55aa224e4df0ece92a5f762049ca1b6bcf4e00f72f6aaf900fb944a6a1dd358900b1968a63b301af8bf4b1ca0a645c43c0ca2221279efabd9a
+EBUILD openrct2-0.1.1.ebuild 2194 SHA256 5400935c6c56738442075138232962710102a4cd2dcda78541ac16f52bcaa371 SHA512 2ee0e9cba059dfb1d91e2a2f05ed8a3ef55a3356c2436adce8e4bb4d9a25d6ae9c4003ff8543c8a65e400ec1afc09fff97d7f524d7253f6ce2597865a825ed79 WHIRLPOOL 03d865ddb0a4c4448f7c8adef6630efb1b77d7cf908c64b723709b728cb50c11ac7bf74dbfa87b6cb72e2c9487435b3b905a0a74edc19612b88b29d9043430f0
+EBUILD openrct2-9999.ebuild 2194 SHA256 5400935c6c56738442075138232962710102a4cd2dcda78541ac16f52bcaa371 SHA512 2ee0e9cba059dfb1d91e2a2f05ed8a3ef55a3356c2436adce8e4bb4d9a25d6ae9c4003ff8543c8a65e400ec1afc09fff97d7f524d7253f6ce2597865a825ed79 WHIRLPOOL 03d865ddb0a4c4448f7c8adef6630efb1b77d7cf908c64b723709b728cb50c11ac7bf74dbfa87b6cb72e2c9487435b3b905a0a74edc19612b88b29d9043430f0
+MISC metadata.xml 967 SHA256 6d1c405d192156877093949d290f582f10b0b9c13a93087b9ff00944e75a50a5 SHA512 874ed9f406c5219bc5c6102b775a53b4e2526ff0f7cfa0dd9b5511717d10ee1fd63012cd19a926904b556195a12a7e2328548de9d1000605afdc471db513198f WHIRLPOOL 52366c931a73bda3260fd0ea7f0ae684e2bd65c54f6f93fc375eb93d9dea24d52378420ae32730085a287e3aea4bd8f659b2793cb13d167004e8bf143b2dbd63
diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
new file mode 100644
index 000000000000..e6ebc48e755d
--- /dev/null
+++ b/games-simulation/openrct2/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="person">
+		<email>jan@segre.in</email>
+		<name>Jan Segre</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>hendrik@consetetur.de</email>
+		<name>Hendrik v. Raven (lorem_ipsum)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		An open-source re-implementation of RollerCoaster Tycoon 2. A construction and management simulation video game that simulates amusement park management.
+	</longdescription>
+	<use>
+		<flag name="multiplayer">Enable multiplayer functionality</flag>
+		<flag name="twitch">Enable Twitch support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">OpenRCT2/OpenRCT2</remote-id>
+		<bugs-to>https://github.com/OpenRCT2/OpenRCT2/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/openrct2/openrct2-0.1.1.ebuild b/games-simulation/openrct2/openrct2-0.1.1.ebuild
new file mode 100644
index 000000000000..c93e3088f8ac
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.website/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
+	EGIT_BRANCH="develop"
+	inherit git-r3
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/OpenRCT2-${PV}"
+fi
+
+TSV="0.1.0"
+SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl +multiplayer opengl test truetype +twitch"
+
+# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
+REQUIRED_USE="multiplayer? ( twitch )"
+
+RDEPEND="
+	>=dev-libs/jansson-2.5
+	>=dev-libs/libzip-1.0
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	|| (
+		media-libs/speexdsp
+		<media-libs/speex-1.2.0
+	)
+	multiplayer? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	opengl? ( virtual/opengl )
+	truetype? (
+		media-libs/sdl2-ttf
+		media-libs/fontconfig
+	)
+	twitch? ( net-misc/curl[ssl] )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
+		-DDISABLE_NETWORK="$(usex !multiplayer)"
+		-DDISABLE_OPENGL="$(usex !opengl)"
+		-DDISABLE_TTF="$(usex !truetype)"
+		-DWITH_TESTS="$(usex test)"
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DDISABLE_RCT2_TESTS=ON
+		-DSYSTEM_GTEST=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/openrct2/title
+	doins "${WORKDIR}"/*.parkseq
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn ""
+		ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
+		ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
+		ewarn ""
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
new file mode 100644
index 000000000000..c93e3088f8ac
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
+HOMEPAGE="https://openrct2.website/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
+	EGIT_BRANCH="develop"
+	inherit git-r3
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/OpenRCT2-${PV}"
+fi
+
+TSV="0.1.0"
+SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="libressl +multiplayer opengl test truetype +twitch"
+
+# This is needed because of this bug: https://github.com/OpenRCT2/OpenRCT2/issues/5469
+REQUIRED_USE="multiplayer? ( twitch )"
+
+RDEPEND="
+	>=dev-libs/jansson-2.5
+	>=dev-libs/libzip-1.0
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	|| (
+		media-libs/speexdsp
+		<media-libs/speex-1.2.0
+	)
+	multiplayer? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	opengl? ( virtual/opengl )
+	truetype? (
+		media-libs/sdl2-ttf
+		media-libs/fontconfig
+	)
+	twitch? ( net-misc/curl[ssl] )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
+		-DDISABLE_NETWORK="$(usex !multiplayer)"
+		-DDISABLE_OPENGL="$(usex !opengl)"
+		-DDISABLE_TTF="$(usex !truetype)"
+		-DWITH_TESTS="$(usex test)"
+		-DDOWNLOAD_TITLE_SEQUENCES=OFF
+		-DDISABLE_RCT2_TESTS=ON
+		-DSYSTEM_GTEST=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/openrct2/title
+	doins "${WORKDIR}"/*.parkseq
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn ""
+		ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
+		ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
+		ewarn ""
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
new file mode 100644
index 000000000000..03949a6d1610
--- /dev/null
+++ b/games-simulation/openttd/Manifest
@@ -0,0 +1,8 @@
+AUX openttd-1.6.0-cflags.patch 1028 SHA256 8a26bfb808fd14f45328255df11e7f3867111fd06570302a43a2807cfc06154e SHA512 e29ef624562c717b37496ca2e8353c1c065f776548878e3863420df5431743a6dc80f952699c3738f3fa1dbe77c9a6bf457a7c21241c723db5b1f7865afa180f WHIRLPOOL f6117b87252bf166c433982cfb7424cb297a633e0f9b74b24b198d028e94158a427dcaac3e0df4944923a08f6c7067a2a36eecd3748c0b7c2e3aa98e4d3e57b3
+AUX openttd.initd 412 SHA256 33636c93caf64d887c6546125f2228baa982d2284f1f2b8cf0d18f958854fce5 SHA512 eb14a32baa8a6601945e5f0cd844e2dc9620661ee4ab841d5085b75a0fb4a1ea8698b9292a489d63792d1163a13c7843795ef843fe0babdeac0a0468313667a3 WHIRLPOOL d1bed260829f85edaf8b149f9306661cabdfcf9569a130709644538989fe237ba952990785527af5d0bfdc8438866a0e97a08c6c3e88caa232d832a7294df682
+AUX openttd.initd-r1 306 SHA256 c12af8baf0a8e00805cedfa8509cc5a3718727c43488ca69991954e0ade95877 SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc WHIRLPOOL b7245a1dc98679d71e1f6150dd3ff0f673a4349b85d1d06c7835b879eb7074cb4633cab609fa17410f47f066bc6abc07fe9bc58376b703ad09c970ebe6b2687d
+DIST openttd-1.7.1-source.tar.gz 10090311 SHA256 9f7a5f5051dc9f43e8eec00bd56755a20846c8738ffcd4bb1f2e1eae334f3371 SHA512 4a0d2ee424374b50fe0d089b86ff16b5de3159848a38143ca6745e349b6126567f1e4beda9afe2e6bc21ffffce1166acf719d3f5c95703a14c1379f8857e83d3 WHIRLPOOL 65d0ee93dad5b865b1de362dc2259e8528bed273f640a9ec9097cf177cd507068f2fc093bfca1b55b0fa2865b9f7f3b68cf4d2caf1f9290ecaa61e46af2c60d9
+EBUILD openttd-1.7.1-r1.ebuild 4809 SHA256 27c3668eef1a47becac18b716ed0b052d5a176416a66e5b9a6ecc48549b89734 SHA512 364f66566e5fff2362684b90b58a5cde95e6d4c66c6b09280de17a7b789c97f96f4902f359cdfb0a5d22283d9f10a1bce10c3f64f6548b6b9a29058bc2981963 WHIRLPOOL 946a6d9d2bc231458d623c84b3c51b89c9889a56a3ff9f6d845b44f77693faf266b2fe7f1a97944ab53de79ab83aabf08f5aca4f8a48885265e4b5b02cf99c7f
+MISC ChangeLog 5625 SHA256 fbe6d1d032a0926401127fa5a2982be98726aea143da83eafa5ee4c2bfe7e66f SHA512 7d9a94be3322d3da6a5276e5dfc542a243ed00fec85ba9870fd102a5bec6888e43db30130b880c908aaad382fb287595bbde8d1b8415d367dcd89599e9f8adea WHIRLPOOL d9025dd3a67f69986137a07a0ac4a232d16c5854a9697b06e1aa015fcc3467bf9084e83c5662523cb19f3f5e12a51a24e652defc0bad4870b0edd164e03a8ff8
+MISC ChangeLog-2015 21727 SHA256 6b6c6dc3d30edde71ca1ac8170eb30a12244520a28ffad70da43e31261f44b90 SHA512 13e5a75ee2354087f8d83ce99f02e82a4ccffd9da27ddd522ce7546c22242a451c0ae7162cd928e8d168d391b016893f88c8c3edb2ae99162cb52985d282a155 WHIRLPOOL 8a15ea4fa4ea3d3ac6f159cf2a7f2b8d813285821b53e1ee12cbb1a19977591487af1e762d8d47e2ed860afdfdcb25a64cffbafea93a51ef9c76714fca84e4ea
+MISC metadata.xml 752 SHA256 ba1994fc2b479775b9975087608a39691f6be59143b37eb297711a2c1e52ee8f SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56 WHIRLPOOL ee7764113e5045feca77fa8a5962f57790725f4752a46eea5e531c20eb62cebf5053741eeb8a24baf4917424e158ace9ddb57c751557f458fcc1c7ea222e18a8
diff --git a/games-simulation/openttd/files/openttd-1.6.0-cflags.patch b/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
new file mode 100644
index 000000000000..bb7f768b3798
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
@@ -0,0 +1,42 @@
+--- openttd-1.4.4/config.lib
++++ openttd-1.4.4/config.lib
+@@ -1450,12 +1450,6 @@
+ 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
+ 			LDFLAGS="$LDFLAGS -noixemul"
+ 		fi
+-
+-		if [ "$enable_profiling" = "0" ]; then
+-			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
+-			CFLAGS="-fomit-frame-pointer $CFLAGS"
+-		fi
+-		CFLAGS="-O2 $CFLAGS"
+ 	else
+ 		OBJS_SUBDIR="debug"
+ 
+@@ -1466,14 +1460,6 @@
+ 				CFLAGS="$CFLAGS -G0"
+ 			fi
+ 		fi
+-		if [ $enable_debug -ge 2 ]; then
+-			CFLAGS="$CFLAGS -fno-inline"
+-		fi
+-		if [ $enable_debug -ge 3 ]; then
+-			CFLAGS="$CFLAGS -O0"
+-		else
+-			CFLAGS="$CFLAGS -O2"
+-		fi
+ 	fi
+ 
+ 	if [ $enable_debug -le 2 ]; then
+@@ -1498,11 +1484,6 @@
+ 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
+ 	fi
+ 
+-	if [ "$enable_profiling" != "0" ]; then
+-		CFLAGS="$CFLAGS -pg"
+-		LDFLAGS="$LDFLAGS -pg"
+-	fi
+-
+ 	if [ "$with_threads" = "0" ]; then
+ 		CFLAGS="$CFLAGS -DNO_THREADS"
+ 	fi
diff --git a/games-simulation/openttd/files/openttd.initd b/games-simulation/openttd/files/openttd.initd
new file mode 100644
index 000000000000..7a719587c7d6
--- /dev/null
+++ b/games-simulation/openttd/files/openttd.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting OpenTTD dedicated server"
+	start-stop-daemon --start -q --exec /usr/games/bin/openttd -- -D -f > /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping OpenTTD dedicated server"
+	start-stop-daemon --stop -q -n openttd
+	eend $?
+}
diff --git a/games-simulation/openttd/files/openttd.initd-r1 b/games-simulation/openttd/files/openttd.initd-r1
new file mode 100644
index 000000000000..0bfeefddf6d6
--- /dev/null
+++ b/games-simulation/openttd/files/openttd.initd-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+description="OpenTTD dedicated game server"
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/bin/openttd"
+command_args="-D"
+command_background="true"
+
+depend() {
+	need net
+}
diff --git a/games-simulation/openttd/metadata.xml b/games-simulation/openttd/metadata.xml
new file mode 100644
index 000000000000..a5465cd55c4a
--- /dev/null
+++ b/games-simulation/openttd/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="aplaymidi">Enables midi music in game, using aplaymidi as an external player</flag>
+
+		<flag name="openmedia">Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag>
+		<flag name="lzo">Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag>
+		<flag name="dedicated">Build only the openttd server, and not the client.</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-simulation/openttd/openttd-1.7.1-r1.ebuild b/games-simulation/openttd/openttd-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..db191da82343
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.7.1-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils
+
+DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
+HOMEPAGE="http://www.openttd.org/"
+SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
+RESTRICT="test" # needs a graphics set in order to test
+
+RDEPEND="!dedicated? (
+		media-libs/libsdl[sound,X,video]
+		icu? (
+			dev-libs/icu-layoutex
+			dev-libs/icu-le-hb
+			>=dev-libs/icu-58.1:=
+		)
+		truetype? (
+			media-libs/fontconfig
+			media-libs/freetype:2
+			sys-libs/zlib
+		)
+	)
+	lzo? ( dev-libs/lzo:2 )
+	iconv? ( virtual/libiconv )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="
+	!dedicated? (
+		openmedia? (
+			games-misc/openmsx
+			games-misc/opensfx
+		)
+		aplaymidi? ( media-sound/alsa-utils )
+		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
+	)
+	openmedia? ( >=games-misc/opengfx-0.4.7 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
+)
+
+src_configure() {
+	local myopts=()
+	# there is an allegro interface available as well as sdl, but
+	# the configure for it looks broken so the sdl interface is
+	# always built instead.
+	local myopts+=( --without-allegro )
+
+	# libtimidity not needed except for some embedded platform
+	# nevertheless, it will be automagically linked if it is
+	# installed. Hence, we disable it.
+	myopts+=( --without-libtimidity )
+
+	use debug && myopts+=( --enable-debug=3 )
+
+	if use dedicated ; then
+		myopts+=( --enable-dedicated )
+	else
+		use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
+		myopts+=(
+			$(use_with truetype freetype)
+			$(use_with icu)
+			--with-sdl
+		)
+	fi
+	if use png || { use !dedicated && use truetype; } || use zlib ; then
+		myopts+=( --with-zlib )
+	else
+		myopts+=( --without-zlib )
+	fi
+
+	# configure is a hand-written bash-script, so econf will not work.
+	# It's all built as C++, upstream uses CFLAGS internally.
+	CFLAGS="" ./configure \
+		--disable-strip \
+		--prefix-dir="${EPREFIX%/}/usr" \
+		--binary-dir="bin" \
+		--install-dir="${D}" \
+		--menu-group="Game;Simulation;" \
+		${myopts[@]} \
+		$(use_with iconv) \
+		$(use_with png) \
+		$(use_with cpu_flags_x86_sse sse) \
+		$(use_with lzo liblzo2) \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	default
+	if use dedicated ; then
+		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
+	fi
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use lzo ; then
+		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
+		elog "required, disabling it does mean that loading old savegames"
+		elog "or scenarios from ancient versions (~0.2) will fail."
+		elog
+	fi
+
+	if use dedicated ; then
+		ewarn "Warning: The init script will kill all running openttd"
+		ewarn "processes when triggered, including any running client sessions!"
+	else
+		if use aplaymidi ; then
+			elog "You have emerged with 'aplaymidi' for playing MIDI."
+			elog "This option is for those with a hardware midi device,"
+			elog "or who have set up ALSA to handle midi ports."
+			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
+			elog "Available ports can be listed by using 'aplaymidi -l'."
+		else
+			if ! use timidity ; then
+				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
+				elog "in USE. Music may or may not work in-game. If you happen"
+				elog "to have timidity++ installed, music will work so long"
+				elog "as it remains installed, but OpenTTD will not depend on it."
+			fi
+		fi
+		if ! use openmedia ; then
+			elog
+			elog "OpenTTD was compiled without the 'openmedia' USE flag."
+			elog
+			elog "In order to play, you must at least install:"
+			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
+			elog "following 6 files from a version of Transport Tycoon Deluxe"
+			elog "(windows or DOS) to ~/.openttd/data/ or"
+			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog
+			elog "From the WINDOWS version you need: "
+			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
+			elog "OR from the DOS version you need: "
+			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
+			elog
+			elog "File names are case sensitive, but should work either with"
+			elog "all upper or all lower case names"
+			elog
+			elog "In addition, in-game music will be unavailable: for music,"
+			elog "install games-misc/openmsx, or use the in-game download"
+			elog "functionality to get a music set"
+			elog
+		fi
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-simulation/pmars-sdl/Manifest b/games-simulation/pmars-sdl/Manifest
new file mode 100644
index 000000000000..69d3686936e7
--- /dev/null
+++ b/games-simulation/pmars-sdl/Manifest
@@ -0,0 +1,6 @@
+AUX pmars-sdl-0.9.2e-format.patch 1976 SHA256 59cd7357901560bb84b623522f97ae4f18a0147f65d98f9043f41861bbbed548 SHA512 dbf068f6fe9993c5917c1be5ace48c5def932365fe558f893a3bdb3e5d35e6ce25e8e46ef074d214da5c2ba65a4bc7e9e8cbf806370bb225d5ecba9a4133387f WHIRLPOOL 002b971c319e0d82ffa4f0e7c79fb6f411fe196689e5e3d6494cb0ee8d7bc3e311dde4ffe54e1ef485d8c63804a2c2d9555db035d995ea996bb30f75bf7bcb45
+DIST pmars-0.9.2-5.tar.gz 200966 SHA256 a8518ec8cc13728dc202c34fe73657123454b9fc76bcddf6b299201143e6fee3 SHA512 197d1967507199ed5eb075fb232a2f15d9bdf4bec03fc6b1d6df5d6259d6627eb40338c5787852ea10d96858029144348128b08e86c7079d96f10fd09dafc315 WHIRLPOOL b588f0381a201b5d3b440626adb8b72ec4b89f68951ce57fd9d4ede604ee2599b5db4443dab18d9dca6c958145515e2f911b9fcd48a8243a841d0276f1b0a581
+EBUILD pmars-sdl-0.9.2e.ebuild 1826 SHA256 bda76f7af603cebe512513c72906f6c6cabd40773858c7f16d293452de4346bb SHA512 78a3ffae78f9d80aa198df883a51ab2d65eb5bb0ea6b021f59609f01b70d1501060689d214706b5414c856256874be597014834c97b38b6425b1dc6cb4afaed5 WHIRLPOOL f16a36376c96d254ff439e4f4f457e06958f950430703fc903e34076f2374764e8a72755011637c2a48e125351f8f10bc7ca6a32f2bfc06ed3b02bb7b42218b1
+MISC ChangeLog 2921 SHA256 340546598702931b9002f004ab04914cc08b3662c81361a69c8aef874d76ea20 SHA512 ef1a075bb4c33ad55fa35978a5be9767b0af03b4b1f79acd721ef58704a03fded62319fe7cec5b2743ff75c31b0c65e42c62647aa29607417c865d1f298dc1d9 WHIRLPOOL 04d543e81f192dd6e7bbd87db860ebfd2c8bbef1cfc92e3de68dadbe6070f3ae144873ed4bc7d82253f823dfbd749b9d6bbc953b4c8d4b28158657c203bcca1c
+MISC ChangeLog-2015 1582 SHA256 954c88be9602d3923da7878bf22832a85fd3ad01fa5807957343cd0d5f2f73f9 SHA512 e40560893dfea911db8a4f341e5f81cb4010df08556dafa4bb38b12aafd625df0c68987948c7f15eeb4b3b2bdcfeaf9fbf70b98118b8c02bfde313794eb3e5da WHIRLPOOL 9fbd3995879cbd0d3f4cb9242da1de126160de50e631b280253349a3f94632fa2367e6434d63c415b68ffb90cdaa01729a8008db82264ed18bda017c3c093367
+MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch
new file mode 100644
index 000000000000..d8c588a32206
--- /dev/null
+++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch
@@ -0,0 +1,65 @@
+--- src/asm.c.old	2015-10-28 13:23:53.465014342 +0100
++++ src/asm.c	2015-10-28 13:23:10.502813377 +0100
+@@ -652,7 +652,7 @@
+   macputs(str);
+ #else
+   if (!inCdb)
+-    fprintf(stderr, str);
++    fprintf(stderr, "%s", str);
+ #if defined DOSALLGRAPHX
+   else {
+     if (displayMode == TEXT)
+@@ -833,7 +833,7 @@
+ #ifdef __MAC__
+     textout(notEnoughMemErr);
+ #else
+-    fprintf(stderr, notEnoughMemErr);
++    fprintf(stderr, "%s", notEnoughMemErr);
+ #endif
+     Exit(MEMERR);
+     break;
+@@ -916,7 +916,7 @@
+   }
+ 
+   if (ierr >= ERRMAX) {
+-    sprintf(outs, tooManyMsgErr);
++    sprintf(outs, "%s", tooManyMsgErr);
+ #ifndef VMS
+     textout(outs);
+ #else
+--- src/cdb.c.old	2015-10-28 13:24:04.669805966 +0100
++++ src/cdb.c	2015-10-28 13:23:10.502813377 +0100
+@@ -2760,7 +2760,7 @@
+       fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName,
+               scrV[idxV[i]]);
+       if (warriors > 2) {
+-        fprintf(outp, resultsAre);
++        fprintf(outp, "%s", resultsAre);
+         for (j = 0; j < warriors; ++j) {
+           fprintf(outp, " %d", warrior[idxV[i]].score[j]);
+         }
+--- src/clparse.c.old	2015-10-28 13:24:10.648694768 +0100
++++ src/clparse.c	2015-10-28 13:23:10.502813377 +0100
+@@ -289,7 +289,7 @@
+               if (next_input(filep, inputs)) {
+                 if (!strcmp(inputs, "-")) {
+                   newFile = stdin;
+-                  fprintf(stderr, readingStdin);
++                  fprintf(stderr, "%s", readingStdin);
+                 } else {
+                   if ((newFile = fopen(inputs, "r")) == NULL) {
+                     code = FILENAME;        /* command file not found */
+@@ -430,11 +430,11 @@
+     errout(outs);
+     break;
+   case MEMORY:
+-    sprintf(outs, outOfMemory);
++    sprintf(outs, "%s", outOfMemory);
+     errout(outs);
+     break;
+   case FILENAME:
+-    sprintf(outs, cannotOpenParameterFile);
++    sprintf(outs, "%s", cannotOpenParameterFile);
+     errout(outs);
+     break;
+   }
diff --git a/games-simulation/pmars-sdl/metadata.xml b/games-simulation/pmars-sdl/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-simulation/pmars-sdl/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-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
new file mode 100644
index 000000000000..95d0aced75e8
--- /dev/null
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs eutils games
+
+MY_PN="${PN/-sdl/}"
+MY_PV="${PV/e/-5}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Portable redcode simulator's sdl port for core war"
+HOMEPAGE="http://corewar.co.uk/pihlaja/pmars-sdl/"
+SRC_URI="http://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="sdl X"
+
+DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] )
+	X? ( x11-libs/libX11 )
+	!sdl? ( !X? ( sys-libs/ncurses:0 ) )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format.patch
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE"
+	LFLAGS="-x"
+
+	if use sdl ; then
+		CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`"
+		LIB=`sdl-config --libs`
+	elif use X ; then
+		CFLAGS="${CFLAGS} -DXWINGRAPHX"
+		LIB="-L/usr/X11R6/lib -lX11"
+	else
+		CFLAGS="${CFLAGS} -DCURSESGRAPHX"
+		LIB="-lcurses"
+	fi
+
+	cd src
+
+	SRC="asm.c
+		 cdb.c
+		 clparse.c
+		 disasm.c
+		 eval.c
+		 global.c
+		 pmars.c
+		 sim.c
+		 pos.c
+		 str_eng.c
+		 token.c"
+
+	for x in ${SRC}; do
+		einfo "compiling ${x}"
+		$(tc-getCC) ${CFLAGS} ${x} -c || die
+	done
+
+	echo
+	einfo "linking with LIB: ${LIB}"
+	$(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die
+}
+
+src_install() {
+	dogamesbin src/${MY_PN}
+	doman doc/${MY_PN}.6
+
+	dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref
+
+	insinto "${GAMES_DATADIR}/${MY_PN}/warriors"
+	doins warriors/*
+
+	insinto "${GAMES_DATADIR}/${MY_PN}/macros"
+	doins config/*.mac
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	ewarn "There are some macros in ${GAMES_DATADIR}/${MY_PN}/macros"
+	ewarn "which you should make accessible to pmars by typing"
+	ewarn "export PMARSHOME=${GAMES_DATADIR}/${MY_PN}/macros\n"
+}
diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
new file mode 100644
index 000000000000..7c6eadcbd369
--- /dev/null
+++ b/games-simulation/searchandrescue/Manifest
@@ -0,0 +1,8 @@
+AUX searchandrescue-1.5.0-build.patch 2110 SHA256 4c9bb535ae59dcea9d6d8973f79750a8469daab31ad3657439e17421297a77a8 SHA512 9162d53482d1a364ff8991a318aa19322399c939e657b568e8e9d621d8ab9e462db7c14c0f350e03e6f8a6d5059d11f038485a91b92869bb7800aa77640954f8 WHIRLPOOL 9b4b0e545ea723c85dfbeb574c6f33a53b9bcf03fe936e493bfd7219f7775dc14ee7ee8c887e696a831e35b53f2cce35645e6e3a845e01572685072cd66e6346
+DIST SearchAndRescue-1.5.0.tar.gz 1473765 SHA256 a49bfdcbf43e3161f82895fe30d0d14c4a61a535d40fa1b7b223144abb020b77 SHA512 72a8e5c375bb2f5d11d1346bb3c81ea4678a9c58c36f53c048e9a16d32a926ff93c3ec9756867f0869aa2a8da5fb0bfe7764f704c4e79519ee0834d225513657 WHIRLPOOL 9827f06ced0d293265e7457ae6997ae1cf09dade783b7f3ec0d010dec1edd2bcc67eb8ae9af6f94edc5b03c31d708cec84c44e34351fd9517e6b48a201d803ad
+DIST SearchAndRescue-data-1.3.0.tar.gz 52152370 SHA256 24e69e14b9d8c0683b3943d3fabe891e9b204c59dc1e8b47f4abd3db8cb29150 SHA512 5419376aeecb0f05570a8d2a0a6f830f3b22ce9d1d34a5e490485767546c6d0d1d2a2a3f37e5dfcef69e271a94a9c7dfc6b592e3c0dd62a8a6c38e4bf7d25ccd WHIRLPOOL 360ccfdc4f4222e06b344bb4660f97a13742c0fbad48bf4e1a2dff58b084ad2e485b540b3aa79d64f8a3b99bea16c517d6996a10a668f74c04193bf6abaf40dd
+EBUILD searchandrescue-1.5.0-r1.ebuild 1817 SHA256 4d21475edc224009c31777aaaf8cd38337348ab15a5b0dbc4a789150b0b36894 SHA512 80b663d969f47dd33d962b600b001dc06d51f969cb9f150dc43069f43bc59dd91b20148c19a199dba34bc60450ad9560d44432a0572b050f04fd26cc870819d1 WHIRLPOOL 3b77c8c20b933273290003f9c01bea8e1cbe0f8506357f0c1655b8157559e2b4c0bb247bb070d69f450bd1f9188953b7a3101cfe0258b2825456209ab58b70f4
+EBUILD searchandrescue-1.5.0.ebuild 1833 SHA256 e5f3c0d05c4e1886d4dd98921dff9fa9ebf8f098e3b40da9f97aaaf26e5216ea SHA512 6b41cdb96fbafe334e1856fb03e293ac7771417c2729818aadeb9612835c44bfe3dd2b6758cc9ebef9b919d7115a8348d5e038a87d04637d0ad240e71339c912 WHIRLPOOL 8ef2d17ebc2b35bd6e5ee18271a84d1e9d8f418edfea0bd4c18952c447a93a20bdd89a50f52825b1d33fd52a866abce666a05070e0fa90836a301b7066a25c7f
+MISC ChangeLog 2773 SHA256 e9ff8de797b2d1c16324ae46a04dfefbe267f4dbe4dec3a5263131a81c567381 SHA512 16c2391271b34ad6fed4249f1e4b118d792f99ea2feb8100486ab7aff469dfc1ef404228d8ad484560d13c2ce1d9da59b3a2b8c231f76c150e77029061edb69d WHIRLPOOL 8cdcb5451dca666f46df8b9acfa4479c97490fba6f9b97214b53efedbc92262480b654e7829cc1094d906ed2251b273a6e0922b5f9d0d8f68f1e1b1766911461
+MISC ChangeLog-2015 6008 SHA256 d45fc136a08b7d5336bf6dbf010badd6812e7327ff58d45f4d64af696c07f974 SHA512 c096a6268bff5e8c23505b0f53464978e86e828fd04fabd34b0f241194cb22cff0d866565c1245debc0034f021ce0be3dbb06d0622017af4e1233ffc87e432a3 WHIRLPOOL 6a2afc45dea254d9a2a80de97935bc30e38fc64ef1e59537c49384d03d6672b2eb23acc9bf9b1ba4bf8d5720a90ac3a620d2d3e687707e41cd8ffe2e8bef3a38
+MISC metadata.xml 338 SHA256 edd4e2d4185073ec782fa86251d498da529285e4560100c7d6d2dcad938affcb SHA512 434ce984794eb43c0e4083cefe03dff01118cc3b9aa64d43c7bfbfccaae20212baa111dce95ac79a9b9e94f9fc405e30bd09bd7fc845bba749e5659ae26ce388 WHIRLPOOL 52e4e67bc70e56f94f5e1c265cab279e941d7fb8d88370d7d70ab8cda66bfd403beabf3c956b91c320c371b7abbf9693f865c1eb2394ad5c6aed68cd21b9e333
diff --git a/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch b/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch
new file mode 100644
index 000000000000..40428bade2d7
--- /dev/null
+++ b/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch
@@ -0,0 +1,66 @@
+--- searchandrescue_1.3.0.orig/sar/makefile_append.ini
++++ searchandrescue_1.3.0/sar/makefile_append.ini
+@@ -3,7 +3,7 @@
+ 
+ 
+ # C++ flags:
+-CPPFLAGS = -D__cplusplus -Dc_plusplus
++CPPFLAGS += -D__cplusplus -Dc_plusplus
+ 
+ 
+ # Source files list:
+@@ -16,14 +16,12 @@
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+ 	@echo "Compiling module $*.o"
+-	@$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+ .cpp.o:
+ 	@echo "Compiling module $*.o"
+-	@$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
++	$(CPP) -c $*.cpp $(INC_DIRS) $(CPPFLAGS)
+ 
+ # Programs
+-LS      = ls
+-LSFLAGS = -s -h -c --color=auto
+ RM      = rm
+ RMFLAGS = -f
+ 
+@@ -32,9 +30,8 @@
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
+ 	@echo -n "Linking modules..."
+-	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
++	$(CPP) $(OBJ_C) $(OBJ_CPP) $(LDFLAGS) -o $(BIN) $(LIBS) $(LIB_DIRS)
+ 	@echo -n "   "
+-	@-$(LS) $(LSFLAGS) $(BIN)
+ 
+ prebuild:
+ 	@echo "Building program \"$(BIN)\"..."
+@@ -54,5 +51,5 @@
+ clean:
+ 	@echo "Cleaning program \"$(BIN)\"..."
+ 	@echo "Deleting all intermediate files..."
+-	@$(RM) $(RMFLAGS) a.out core *.o $(BIN)
++	$(RM) $(RMFLAGS) a.out core *.o $(BIN)
+ 	@echo "Clean done."
+--- searchandrescue_1.3.0.orig/sar/platforms.ini
++++ searchandrescue_1.3.0/sar/platforms.ini
+@@ -102,7 +102,7 @@
+                 FeatureDepend = xf86vidmode-lib
+                         DependType = Library
+                         MustExist = Yes
+-                        DependPath = libXxf86vm.a
++                        DependPath = libXxf86vm.so
+                         DependGrepString = XF86VidModeQueryExtension
+                 FeatureDepend = xf86vidmode-devel
+                         DependType = Header
+@@ -223,7 +223,7 @@
+                 FeatureDepend = xf86vidmode-lib
+                         DependType = Library
+                         MustExist = Yes
+-                        DependPath = libXxf86vm.a
++                        DependPath = libXxf86vm.so
+                         DependGrepString = XF86VidModeQueryExtension
+                 FeatureDepend = xf86vidmode-devel
+                         DependType = Header
diff --git a/games-simulation/searchandrescue/metadata.xml b/games-simulation/searchandrescue/metadata.xml
new file mode 100644
index 000000000000..2ddbf0d5866c
--- /dev/null
+++ b/games-simulation/searchandrescue/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">searchandrescue</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..9c1b51183004
--- /dev/null
+++ b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_DATA_PV=1.3.0
+MY_PN=SearchAndRescue
+DESCRIPTION="Helicopter based air rescue flight simulator"
+HOMEPAGE="http://searchandrescue.sourceforge.net/"
+SRC_URI="mirror://sourceforge/searchandrescue/${MY_PN}-${PV}.tar.gz
+	mirror://sourceforge/searchandrescue/${MY_PN}-data-${MY_DATA_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXxf86vm
+	virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${PN}_${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_unpack() {
+	unpack ${MY_PN}-${PV}.tar.gz
+	mkdir data && cd data && \
+		unpack ${MY_PN}-data-${MY_DATA_PV}.tar.gz
+	bunzip2 "${S}"/sar/man/${MY_PN}.6.bz2 || die
+}
+
+src_prepare() {
+	default
+
+	rm pconf/pconf || die
+	sed -i -e '/Wall/s/$/ $(CFLAGS)/' pconf/Makefile || die
+}
+
+src_configure() {
+	emake CC=$(tc-getCC) -C pconf pconf # Needed for the configure script
+
+	append-cppflags -DNEW_GRAPHICS -DHAVE_SDL_MIXER
+	export CPP="$(tc-getCXX)"
+	export CPPFLAGS="${CXXFLAGS}"
+	# NOTE: not an autoconf script
+	./configure Linux --prefix="/usr" || die
+	sed -i -e 's/@\$/$/' sar/Makefile || die
+}
+
+src_compile() {
+	emake -C sar
+}
+
+src_install() {
+	dobin sar/${MY_PN}
+	doman sar/man/${MY_PN}.6
+	dodoc AUTHORS HACKING README
+	doicon sar/icons/SearchAndRescue.xpm
+	newicon sar/icons/SearchAndRescue.xpm ${PN}.xpm
+	dodir /usr/share/games/${PN}
+	cp -r "${WORKDIR}"/data/* "${D}/usr/share/games/${PN}/" || die
+	make_desktop_entry SearchAndRescue "SearchAndRescue" /usr/share/pixmaps/${PN}.xpm
+}
diff --git a/games-simulation/searchandrescue/searchandrescue-1.5.0.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0.ebuild
new file mode 100644
index 000000000000..3a3bce9c7d63
--- /dev/null
+++ b/games-simulation/searchandrescue/searchandrescue-1.5.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs games
+
+MY_DATA_PV=1.3.0
+MY_PN=SearchAndRescue
+DESCRIPTION="Helicopter based air rescue flight simulator"
+HOMEPAGE="http://searchandrescue.sourceforge.net/"
+SRC_URI="mirror://sourceforge/searchandrescue/${MY_PN}-${PV}.tar.gz
+	mirror://sourceforge/searchandrescue/${MY_PN}-data-${MY_DATA_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXxf86vm
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXpm
+	virtual/opengl
+	virtual/glu
+	media-libs/libsdl
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${MY_PN}-${PV}.tar.gz
+	mkdir data && cd data && \
+		unpack ${MY_PN}-data-${MY_DATA_PV}.tar.gz
+	bunzip2 "${S}"/sar/man/${MY_PN}.6.bz2 || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	rm pconf/pconf || die
+	sed -i -e '/Wall/s/$/ $(CFLAGS)/' pconf/Makefile || die
+}
+
+src_configure() {
+	emake CC=$(tc-getCC) -C pconf pconf # Needed for the configure script
+
+	append-flags -DNEW_GRAPHICS -DHAVE_SDL_MIXER
+	export CPP="$(tc-getCXX)"
+	export CPPFLAGS="${CXXFLAGS}"
+	# NOTE: not an autoconf script
+	./configure Linux --prefix="${GAMES_PREFIX}" || die
+	sed -i -e 's/@\$/$/' sar/Makefile || die
+}
+
+src_compile() {
+	emake -C sar
+}
+src_install() {
+	dogamesbin sar/${MY_PN}
+	doman sar/man/${MY_PN}.6
+	dodoc AUTHORS HACKING README
+	doicon sar/icons/SearchAndRescue.xpm
+	newicon sar/icons/SearchAndRescue.xpm ${PN}.xpm
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r "${WORKDIR}"/data/* "${D}/${GAMES_DATADIR}/${PN}/" || die
+	make_desktop_entry SearchAndRescue "SearchAndRescue" /usr/share/pixmaps/${PN}.xpm
+	prepgamesdirs
+}
diff --git a/games-simulation/senken/Manifest b/games-simulation/senken/Manifest
new file mode 100644
index 000000000000..2b66e40e4876
--- /dev/null
+++ b/games-simulation/senken/Manifest
@@ -0,0 +1,8 @@
+AUX senken-0.3.0-as-needed.patch 947 SHA256 fa6d58741720474cbafa0118aea8d94518434898cbaeb96a2b8918468e9cf0c7 SHA512 6f1f5ae454b9f186624a2ac9d3d5d802c973fadcedf236d83b47020302645c197683ee8765c9b3536866d5281fd37ce94ebdafebde5b5653c1a2188a81fd6a44 WHIRLPOOL ee83805c25685a6897a18ab314504b090cfb2fc23e3d9278b1f302ac62ea39079920350d3a8fe71c7cd5d6e069b86a181e53123dea1ac532332448f7cbda64cb
+AUX senken-0.3.0-warnings.patch 1099 SHA256 0775fd63808f156de3d5f890ce0a56c77e6bd57e3e2b7d48e91a0166ee0c0084 SHA512 5e48805adcec08e8deab671df7bf5a8303c29d8d2679bf9ce6608674d225e5acafc3f0f66b07c0362f9da735263773259db8f77dfe7028f268dbe13ce67e6b10 WHIRLPOOL f3e62ca2de28ab22ec9b843bbba2d8fd6177be628b5fc05c5b3ccdd347e5777c42e29c5f480a1c5663df4c4f163d68cc127890a6b755ffc9487155f1055caf48
+DIST senken-0.3.0.tar.gz 1391010 SHA256 2b0c6c0f08a9dcc1c15d2c94f7c5f494953cb83bc387749fe46c1dc6fb7cb880 SHA512 df0c15cabf667fb7b56db40baf03fcae6695aa9ec0e42a7db682ff20877a5b89ee67e7799e762b4a78cf0f3fdee7f001419091f0683df74ba1bbe6b9501f0272 WHIRLPOOL fec07f5237c6b0961611caf7e6a3398f0dc5366ff391008668179af470a3bb6069aadea6a5d938cc943a30bc83e6a63e8f006be743a181aa53dadd69ddfbe204
+EBUILD senken-0.3.0-r1.ebuild 1060 SHA256 422de1b12b2a74c02a1dfb86aeb5f26b9f9d308649ddedb14a7eace524548e2d SHA512 7e472b25ed6b5a45bf287dde998787117a2399b4092669ffef9954c5b401b37ce61d8c5734e9667ddeaf72b7e6f9df82e9bf6ee8226973189015cc9e41d042d8 WHIRLPOOL 29c1d3ad8cf27630fb3e8aec5b30654d82267f7470d714d01b5d87eed3617fb3ce7b67f5e5a723f8529ab39d6a8f65db3fe10d004370181539eee54f7d835afd
+EBUILD senken-0.3.0.ebuild 1099 SHA256 52315b8dfff94acc94c202c4ae4c1a387d7846d6e47c893eb7230832fa566cd8 SHA512 c8c4b8229ee9aaec7cf15331a7a7ae338526443434bd5e6e436eb46e76d35cde7502fb2684e1b1a8f3dedcca3f0c1011d9873ab6fc1e522717103704a3940852 WHIRLPOOL a5287e3e2768809c0907de8f799999bd9cc2ec945cd43e414b9b49a1045b2c9b055d709b5a3885b8fb05d45bf69326580c3fcdba29d3c36945a8fda057ed8cb7
+MISC ChangeLog 2862 SHA256 168c1699779a29ba731d02419aa1c171f09a30b129cbd42bc5e26d8339134489 SHA512 7043c3de2c9ef8e6329a6daf9292e50c974090750fc79c5bd55397d3c5f974711fa64a9418329e444dfc63e053751b439bff5750e30e35f5b425b16b0f1a537c WHIRLPOOL a3dca4134bf83e9f54791a006a8c95a92ef7331abcde95b70aac4817fa9ba5c345db73fbcc4fbfbad162d11a9845397a1c532ef9bd1ce08ed66a75146f773bdb
+MISC ChangeLog-2015 1687 SHA256 78428aec7696242e958b43ce2ab92689e21891e753bb929acca6fafb78872736 SHA512 236646b0476996fb30f53bfd5b09d0e3c362afa1b040841b59d368335b0f37422408041da4a87c2cb64aba9f94c7555225b802f2dd561c2ba9b0f6c93d36a403 WHIRLPOOL c77b6555213b7a683bf7d133a49ae7d259134ba2e57e6535d5bc5a73442327b66aa1d668489a076a3cfb6dc9ecb86cbbdabc3c580efbf5c49efeacc1f5cc91f2
+MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-simulation/senken/files/senken-0.3.0-as-needed.patch b/games-simulation/senken/files/senken-0.3.0-as-needed.patch
new file mode 100644
index 000000000000..428cbc9ee4c6
--- /dev/null
+++ b/games-simulation/senken/files/senken-0.3.0-as-needed.patch
@@ -0,0 +1,24 @@
+diff -ru senken-0.3.0.orig/server/Makefile.in senken-0.3.0/server/Makefile.in
+--- senken-0.3.0.orig/server/Makefile.in	2003-11-20 02:30:15.000000000 -0500
++++ senken-0.3.0/server/Makefile.in	2014-10-30 10:58:51.202157036 -0400
+@@ -10,7 +10,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@
+-LIBS = ../lib/libsenken.a @LIBS@ @LIBINTL@
++LIBS = ../lib/libsenken.a @LIBS@ @LIBINTL@ -lm
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+diff -ru senken-0.3.0.orig/src/Makefile.in senken-0.3.0/src/Makefile.in
+--- senken-0.3.0.orig/src/Makefile.in	2003-11-20 02:30:16.000000000 -0500
++++ senken-0.3.0/src/Makefile.in	2014-10-30 10:59:05.154704393 -0400
+@@ -8,7 +8,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @GTK_CFLAGS@
+-LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@
++LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@ -lm
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
diff --git a/games-simulation/senken/files/senken-0.3.0-warnings.patch b/games-simulation/senken/files/senken-0.3.0-warnings.patch
new file mode 100644
index 000000000000..b15565ad0a90
--- /dev/null
+++ b/games-simulation/senken/files/senken-0.3.0-warnings.patch
@@ -0,0 +1,31 @@
+diff -ru senken-0.3.0.orig/server/protocol.c senken-0.3.0/server/protocol.c
+--- senken-0.3.0.orig/server/protocol.c	2003-11-20 02:30:15.000000000 -0500
++++ senken-0.3.0/server/protocol.c	2014-10-30 11:04:39.831848871 -0400
+@@ -294,7 +294,7 @@
+     /*
+      * If transaction active just save this for later
+      */
+-    if (connection_txn_active) {
++    if (connection_txn_active(conn)) {
+ 	set_op_t *op = calloc(1, sizeof(set_op_t));
+ 	int r;
+ 
+diff -ru senken-0.3.0.orig/src/gtkhelp_reports.c senken-0.3.0/src/gtkhelp_reports.c
+--- senken-0.3.0.orig/src/gtkhelp_reports.c	2003-11-20 02:30:16.000000000 -0500
++++ senken-0.3.0/src/gtkhelp_reports.c	2014-10-30 11:06:43.795828908 -0400
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ 
+diff -ru senken-0.3.0.orig/src/main.c senken-0.3.0/src/main.c
+--- senken-0.3.0.orig/src/main.c	2003-11-20 02:30:16.000000000 -0500
++++ senken-0.3.0/src/main.c	2014-10-30 11:06:28.147336339 -0400
+@@ -25,6 +25,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <string.h>
+ #include <unistd.h>
+ #include <signal.h>
+ #include <gtk/gtk.h>
diff --git a/games-simulation/senken/metadata.xml b/games-simulation/senken/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-simulation/senken/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-simulation/senken/senken-0.3.0-r1.ebuild b/games-simulation/senken/senken-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..9b4e0cb1e242
--- /dev/null
+++ b/games-simulation/senken/senken-0.3.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="city simulation game"
+HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.4
+	media-libs/sdl-image
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-warnings.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/share:/usr/share:" \
+		lib/utils.h || die
+}
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	#dodir "${GAMES_DATADIR}"
+	#mv "${D}/${GAMES_PREFIX}/share/senken" "${D}/${GAMES_DATADIR}/" || die
+	#rm -rf "${D}/${GAMES_PREFIX}"/{include,lib,man,share} || die
+
+	insinto /usr/share/senken/img
+	doins img/*.png
+
+	find "${D}/usr/share/" -type f -exec chmod a-x \{\} +
+	find "${D}/usr/share/" -name "Makefile.*" -exec rm -f \{\} +
+}
diff --git a/games-simulation/senken/senken-0.3.0.ebuild b/games-simulation/senken/senken-0.3.0.ebuild
new file mode 100644
index 000000000000..bea48ae52864
--- /dev/null
+++ b/games-simulation/senken/senken-0.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="city simulation game"
+HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2
+	>=media-libs/libsdl-1.2.4
+	media-libs/sdl-image
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr/local/share:${GAMES_DATADIR}:" \
+		lib/utils.h || die
+	epatch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-warnings.patch
+}
+src_configure() {
+	egamesconf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	dodir "${GAMES_DATADIR}"
+	mv "${D}/${GAMES_PREFIX}/share/senken" "${D}/${GAMES_DATADIR}/" || die
+	rm -rf "${D}/${GAMES_PREFIX}"/{include,lib,man,share} || die
+
+	insinto "${GAMES_DATADIR}/senken/img"
+	doins img/*.png
+
+	find "${D}/${GAMES_DATADIR}/" -type f -exec chmod a-x \{\} +
+	find "${D}/${GAMES_DATADIR}/" -name "Makefile.*" -exec rm -f \{\} +
+
+	prepgamesdirs
+}
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
new file mode 100644
index 000000000000..7973af7201f3
--- /dev/null
+++ b/games-simulation/simutrans/Manifest
@@ -0,0 +1,17 @@
+AUX simutrans-0.120.0.1-Makefile.patch 2048 SHA256 6d9baeb8f427ce1cc03d22691d63467297f095a552aecba0613614eb42bdd22f SHA512 174a93b8bb52273af849d20b32b286a2b16f7392b1572be4f71a430872d030dd829b4b99512c24bc619245e25701a39d233619305775a65e51db3af7298719f4 WHIRLPOOL a8249d853d71a821cae53bdae67e6786c8d14dd692963a1bd2179e65904fb7c6ebfd5292da64aed1e0b1241ab244055d84f2883f253845c0758d4ac795a92dd5
+AUX simutrans-0.120.1.3-Makefile.patch 2047 SHA256 43833208e9e5b382be044bc872156b1aec72234ee20e9722da156058a46b57d8 SHA512 154f32aff950973cf33fc05239c50e45196e0d1e22ce2dcca12423362eeaba74d92a15ec99faf2364c3efb9eed16fa53095352ba68a3cec4be4c8bc50ce8ba33 WHIRLPOOL afd50033b7f2d02907252826f744b3ad7d9eb6740e674c9bd54ec86cec01717e2b2d6ae3ef766fbce5f5cfceb640d1fd7e9da7dc4abab2f3015dc98efdd03266
+AUX simutrans-0.120.2.2-Makefile.patch 2015 SHA256 943a8b7417ca13c00dde40fab5cd9bd99776031175532e708f316dc23cc6596a SHA512 2d85d4a048a40c6a3581492f50f7d2364cfd36f6d0496fcf89406ed1d7ad091b218700b2e8d1f26e0bdd346b3f449e0c0d30ef4bffed30b351c1e424ce7a4439 WHIRLPOOL 6c7105156348e661b8520f6b8087d697164c4f84fa54f13051092e584fd11074d0114114f87cb5cae58e64b0ceb0d424e3a312a96176635861014e51e08b4662
+DIST language_pack-Base+texts.zip 1097263 SHA256 3d2e637eb6018ccb5da99614dae7fc6ae1bdb0d8db4b2beea85d7e36ea5edf7c SHA512 015caafaeace03bd5475e66c93bb433d9b07b600c3fcf125a4bda9b2856ba41dc43b923e032920df4a060087ead7180df59092f23ab6dcf12579b580827b1248 WHIRLPOOL 679efda1f4bfa0bf71b2f4aa955cee287ee6e9c10d6b3f9070cb799eae5c7acd3651e59f3d8d46688f56ee9781e102e485ab59b6a16a4ee556b18c95b2c35fb3
+DIST simupak64-120-0-1.zip 4051769 SHA256 02a709dfa4b0c22e0b463ebcbd9684548356de1c61566cff9c127a79990dbb78 SHA512 21badd251b9018bef55531923e23cb1935c3831784fab028febd3879384330e843329499ab08a08e71238fb92bf7db36e18ecbbc4e719a942e427f58fc634afc WHIRLPOOL 5ae84653b5a138b5a987b7ca6512994f3ba8dff48fffbb94f6fe0bf4845d5537e93734f73174eb328f20b6c9986235ae6c461c55b5efde53a4b81620a3b1da83
+DIST simupak64-120-1-2.zip 4308534 SHA256 125fa5c13a51bb0630ca651fddb8af06a823e8c4d4638bfa1bb2d89e92cc1d54 SHA512 ddc75ad1cafa23d9a7387dc38b14de7414ea7c8bb7caa2afde6d8cdf9c3f5251719966b2274c5bc4ecc9915ec764d517e24b79d5ef199904e3d9185214cba129 WHIRLPOOL 4f91de57be620849f2a278df5510ea390d737a4f063dc659ed2d5f488ce0e631b1c15d6282554574b89316b3b968e4b850db8764b24b714df1a3c5e642e34907
+DIST simupak64-120-2.zip 4453079 SHA256 b3ce4fc99468e6a2601a606251f156e554d2d78f2cc5679c0d9a64a5f50561e8 SHA512 c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357 WHIRLPOOL 332137593544e88e81f69ab1887a2388df07a8610805d6a77af7760ff42f49c11f55cdb7bc7879aa9840106f41e01b2c090859a2499422cdcb8b82555c5b8049
+DIST simutrans-src-120-0-1.zip 3909005 SHA256 010a6e3765891e1821364e54f6bcdfb2911b627ffca3acae8350e06e53113683 SHA512 6f32b6f1c12f45125de8a12c4a034387a784e21fd8cdedcf7b1daefd9174d9a94825e8f68effa2ff1436cce2e2bc8cb5707161f3fa004185ae158400840dc450 WHIRLPOOL 36155184f5806a9cfab742f26e3fc78d5d7d928f99cddabbaf36c7c90d065dab02bb174c07d9633958f8b891b0db8cc5c94e45fd4f22d917b9a037c51a99b69a
+DIST simutrans-src-120-1-3.zip 3447115 SHA256 2d29b849fc39d25a0580091e1377270bddb2cae36c0fc32bd7c2d0f1d7ccfb84 SHA512 ae31dda7bdbd057aaf9c40914eb7ec0c60b21d2790d1ca12aa8db698cd112043a291934f6f460b1d5a8a1984b7defb4a0c4bc9839c81c674834062cc1e49c8bd WHIRLPOOL 273aa58b6e6d7e53a67e092ff5d0a4ef9f00ef3c96bdaf8393a01511c8b655956085f6c94a3f74ab5eeffbe312a4d3d9596a4cfbef57a7053ddd7a1f4d4fbd1d
+DIST simutrans-src-120-2-2.zip 3900947 SHA256 7f22c144377abf1a0ee49432f3f6f5eb9a620567960df31d2ea6399b17cf26fa SHA512 db9797be132bb1936d8c3192e536523d1249d20a513f3758037097ef46c2bab40d4be8adb68cb21eda2b4820369e89bd0a6e2abc4fe2bbcefe40bb414a3d1ab2 WHIRLPOOL ebf7496939a79e58983ba81ff15e1f9118ec0d2ba6ca0aae177602505ef78e1d3c9747436cb2bc7653b3fb574934333da802962b048d2efd172000f3c4a05303
+EBUILD simutrans-0.120.0.1.ebuild 1209 SHA256 183cd34c54e54b0094005409fe78f39e370f5b8fc2363f8a06a77930df8da112 SHA512 583f6f2678d732db374aa6a26ee699aece12a81ed39603b336ee8805cdd3da82b53f4fd0a9868f2d66b45e6eaf09bcddecfdf732eb24ccb6a1d8a98e6258e32c WHIRLPOOL e9d06e7dac168ffa94995d84afaac62fb398a8a027a1d93cfe108dc74462579c2dbb12e70969d0e28e17c8afa5f2407472c664985b3980dd6ddd45878163dacb
+EBUILD simutrans-0.120.1.3-r1.ebuild 1519 SHA256 6bf7c1a6252b38b07973f6df9ddcbea3571f5ef842cec956df8302edcd9d780b SHA512 867aaa52e830bbce38ac2a7ff7b50340566407916bcc79c93f5d93e0faacec200d0f9f54034c98f97625a02e47ce51cf37c979973560cdaf88ea67f9e9ba61ba WHIRLPOOL ea05eff2386a6fc36ea3dc1ccac34ff4b8c1571dde81d14cc65224f11403244f1983195d18c2cabbc465f5aadcc6cb550ed1e0f0bcb5b17e438a1b6bad4d153b
+EBUILD simutrans-0.120.1.3.ebuild 1253 SHA256 e808d3b1c654be6e788e0fc25e34e9f2e8d9775c99de91cb88d4632fb85fc36c SHA512 519a67f78c0a0091de47af6b1bec8a9585db8cff6c769b68102a90c9196bd2c531f69ea83570295957605db022a6226e95269ab07ce0c90ac553dceb6fc01520 WHIRLPOOL 061425ef95004d6a70ee4aab100f694d8fca900c47acf8cf2e5e882fe0259183fdeffc4e825900a27202e9c5b41444a07c03a43e3abf46949f8fddec6a378c2b
+EBUILD simutrans-0.120.2.2.ebuild 1498 SHA256 3ef54e0337ef45011bef8396c4ed8bdb020d1e9c7cc5076af941a655b93ea66f SHA512 20cbfabc2f86bab1d741d6ccaab13070587e9e668db536cd48bcc1fde86b9b6e43e92da7daa51a77d573abdc345ddb40925660d72a2ac466ae93fc10e4cf0fc7 WHIRLPOOL 70ced6e79303cb983666c3e8d08ee2bed056360a90fe686023a8ef30b2e15e1f748989550a491967b4ce29d5ed17d276699704a971434b274717feedc371ef4c
+MISC ChangeLog 3094 SHA256 f952e31e2f6e04a2ba9fdbd6b8abaad5a147b526d05c01b1715890f9cd77e43e SHA512 90208034cc7bd9146f8fbd528bdc1dfa31f011b188903315b79ad31c73a7901ba2430d4e4b3a69341dd8c5e7d6aa611779ec72e74f7f893d09ee500eec5857b7 WHIRLPOOL b200de121241dc84727f82da42bdf914b393c3cc441f65f10d65dbc987f4355b8b8a1c665dbdca2507340ae6db51811e6320adad810dd094ce57d728f979da1e
+MISC ChangeLog-2015 7169 SHA256 2044db2dce438cc30320b9f73e9c5ddd7f7e44926c9d7bedc0f0e6457a505822 SHA512 b8250ce5fb434ef18bd03639aa8dbedf226ffb463fe9897cab5bad2d7d4d1d6e15429df0c10afc3e81f2ec8c77aaafe7a0aa536e345174a54de3ffdd9206ed10 WHIRLPOOL fc0c1f7f248092195191abb605d0d503999973c4be430aa86b98b8c1cc93a7a085e007d088f95648d385f103f36259c92b294ff28d11923c3d7dbe28ca177a16
+MISC metadata.xml 332 SHA256 0deb11633fe30bc2fc5478b388486d4d0a644cbff15b53a18368cb54bf0449c2 SHA512 c8e6f7d4963c82a5d993a6edc3d8dfc925ffc9df28fbbadf6d2fa91f5f34c9afb4fc8f821a8a7e2e99522ec9bf2d2bc0a7f620337d2097f13af77016846dad36 WHIRLPOOL de47d2c9fd48c9d3b376537dbf2764afe2f58f25ec423cbd0976b607180baa2241c559c12265ab27e5d497ab3dd573e660e5922a95b8bdde93d755e3d954ba45
diff --git a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
new file mode 100644
index 000000000000..d1ff41f33feb
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
@@ -0,0 +1,89 @@
+--- Makefile.orig
++++ Makefile
+@@ -81,8 +81,6 @@
+   ifeq ($(findstring $(OSTYPE), amiga haiku mac),)
+     CFLAGS += -minline-all-stringops
+   endif
+-else
+-  CFLAGS += -O
+ endif
+ 
+ ifdef DEBUG
+@@ -101,6 +99,7 @@
+   endif
+ else
+   CFLAGS += -DNDEBUG
++  CXXFLAGS += -DNDEBUG
+ endif
+ 
+ ifneq ($(PROFILE),)
+@@ -114,6 +113,7 @@
+ ifneq ($(MULTI_THREAD),)
+   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
+     CFLAGS += -DMULTI_THREAD
++    CXXFLAGS += -DMULTI_THREAD
+     ifeq ($(OSTYPE),mingw)
+ #use lpthreadGC2d for debug alternatively
+       LDFLAGS += -lpthreadGC2
+@@ -132,11 +132,13 @@
+     endif
+     ifneq ($(REV),)
+       CFLAGS  += -DREVISION="$(REV)"
++      CXXFLAGS  += -DREVISION="$(REV)"
+     endif
+   endif
+ endif
+ 
+ CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
++CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
+ CCFLAGS  += -Wstrict-prototypes
+ 
+ 
+@@ -492,6 +494,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+ endif
+ 
+@@ -523,6 +526,7 @@
+     SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+ endif
+ 
+@@ -538,6 +542,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer
+ endif
+ 
+@@ -564,6 +569,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lglew32
+   ifeq ($(OSTYPE),mingw)
+     LIBS += -lopengl32
+@@ -579,6 +585,7 @@
+ endif
+ 
+ CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
+ 
+ ifneq ($(findstring $(OSTYPE), cygwin mingw),)
+   SOURCES += simres.rc
+@@ -586,7 +593,6 @@
+ endif
+ 
+ CCFLAGS  += $(CFLAGS)
+-CXXFLAGS += $(CFLAGS)
+ 
+ BUILDDIR ?= build/$(CFG)
+ PROGDIR  ?= $(BUILDDIR)
diff --git a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
new file mode 100644
index 000000000000..d3d9aae5b4e1
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
@@ -0,0 +1,89 @@
+--- a/Makefile
++++ b/Makefile
+@@ -81,8 +81,6 @@
+   ifeq ($(findstring $(OSTYPE), amiga haiku mac),)
+     CFLAGS += -minline-all-stringops
+   endif
+-else
+-  CFLAGS += -O
+ endif
+ 
+ ifdef DEBUG
+@@ -101,6 +99,7 @@
+   endif
+ else
+   CFLAGS += -DNDEBUG
++  CXXFLAGS += -DNDEBUG
+ endif
+ 
+ ifneq ($(PROFILE),)
+@@ -114,6 +113,7 @@
+ ifneq ($(MULTI_THREAD),)
+   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
+     CFLAGS += -DMULTI_THREAD
++    CXXFLAGS += -DMULTI_THREAD
+     ifeq ($(OSTYPE),mingw)
+ #use lpthreadGC2d for debug alternatively
+       LDFLAGS += -lpthreadGC2
+@@ -132,11 +132,13 @@
+     endif
+     ifneq ($(REV),)
+       CFLAGS  += -DREVISION="$(REV)"
++      CXXFLAGS  += -DREVISION="$(REV)"
+     endif
+   endif
+ endif
+ 
+ CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
++CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
+ CCFLAGS  += -Wstrict-prototypes
+ 
+ 
+@@ -492,6 +494,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+ endif
+ 
+@@ -523,6 +526,7 @@
+     SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+ endif
+ 
+@@ -538,6 +542,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer
+ endif
+ 
+@@ -564,6 +569,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lglew32
+   ifeq ($(OSTYPE),mingw)
+     LIBS += -lopengl32
+@@ -579,6 +585,7 @@
+ endif
+ 
+ CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
+ 
+ ifneq ($(findstring $(OSTYPE), cygwin mingw),)
+   SOURCES += simres.rc
+@@ -586,7 +593,6 @@
+ endif
+ 
+ CCFLAGS  += $(CFLAGS)
+-CXXFLAGS += $(CFLAGS)
+ 
+ BUILDDIR ?= build/$(CFG)
+ PROGDIR  ?= $(BUILDDIR)
diff --git a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
new file mode 100644
index 000000000000..f9fb48ab682f
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
@@ -0,0 +1,89 @@
+--- a/Makefile	2017-03-29 12:04:15.000000000 +0300
++++ b/Makefile	2017-06-08 01:41:32.605031258 +0300
+@@ -87,8 +87,6 @@
+       CFLAGS += -minline-all-stringops
+     endif
+   endif
+-else
+-  CFLAGS += -O
+ endif
+ 
+ ifdef DEBUG
+@@ -110,6 +108,7 @@
+   endif
+ else
+   CFLAGS += -DNDEBUG
++  CXXFLAGS += -DNDEBUG
+ endif
+ 
+ ifdef MSG_LEVEL
+@@ -127,6 +126,7 @@
+ ifneq ($(MULTI_THREAD),)
+   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
+     CFLAGS += -DMULTI_THREAD
++    CXXFLAGS += -DMULTI_THREAD
+     ifneq ($(OSTYPE),haiku)
+       LDFLAGS += -lpthread
+     endif
+@@ -142,11 +142,13 @@
+     endif
+     ifneq ($(REV),)
+       CFLAGS  += -DREVISION="$(REV)"
++      CXXFLAGS  += -DREVISION="$(REV)"
+     endif
+   endif
+ endif
+ 
+ CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
++CXXFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
+ CCFLAGS  += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ 
+@@ -514,6 +516,7 @@
+     endif
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+ endif
+ 
+@@ -553,6 +556,7 @@
+     endif
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+ endif
+ 
+@@ -568,6 +572,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer
+ endif
+ 
+@@ -594,6 +599,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lglew32
+   ifeq ($(OSTYPE),mingw)
+     LIBS += -lopengl32
+@@ -609,6 +615,7 @@
+ endif
+ 
+ CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
+ 
+ ifneq ($(findstring $(OSTYPE), cygwin mingw),)
+   SOURCES += simres.rc
+@@ -616,7 +623,6 @@
+ endif
+ 
+ CCFLAGS  += $(CFLAGS)
+-CXXFLAGS += $(CFLAGS)
+ 
+ BUILDDIR ?= build/$(CFG)
+ PROGDIR  ?= $(BUILDDIR)
diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
new file mode 100644
index 000000000000..9d88e43fb074
--- /dev/null
+++ b/games-simulation/simutrans/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">simutrans</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/simutrans/simutrans-0.120.0.1.ebuild b/games-simulation/simutrans/simutrans-0.120.0.1.ebuild
new file mode 100644
index 000000000000..2ab54c24a91c
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic eutils games
+
+MY_PV=${PV/0./}
+MY_PV=${MY_PV//./-}
+DESCRIPTION="A free Transport Tycoon clone"
+HOMEPAGE="http://www.simutrans.com/"
+SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
+	mirror://sourceforge/simutrans/simupak64-${MY_PV}.zip"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[sound,video]
+	sys-libs/zlib
+	app-arch/bzip2
+	media-libs/libpng:0
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	strip-flags # bug #293927
+	echo "BACKEND=mixer_sdl
+COLOUR_DEPTH=16
+OSTYPE=linux
+VERBOSE=1" > config.default || die
+
+	# make it look in the install location for the data
+	sed -i \
+		-e "s:argv\[0\]:\"${GAMES_DATADIR}/${PN}/\":" \
+		simmain.cc || die
+
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	rm -f simutrans/{simutrans,*.txt}
+}
+
+src_install() {
+	newgamesbin build/default/sim ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r simutrans/*
+	dodoc documentation/*
+	doicon simutrans.ico
+	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
+	prepgamesdirs
+}
diff --git a/games-simulation/simutrans/simutrans-0.120.1.3-r1.ebuild b/games-simulation/simutrans/simutrans-0.120.1.3-r1.ebuild
new file mode 100644
index 000000000000..5860fcb55003
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.1.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils
+
+MY_PV=${PV/0./}
+MY_PV=${MY_PV//./-}
+DESCRIPTION="A free Transport Tycoon clone"
+HOMEPAGE="http://www.simutrans.com/"
+SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
+	http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
+	mirror://sourceforge/simutrans/simupak64-${MY_PV/3/2}.zip"  #FIXME: rev bump when .3 is released
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/bzip2
+	media-libs/libpng:0
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_unpack() {
+	unpack simutrans-src-${MY_PV}.zip
+	unpack simupak64-${MY_PV/3/2}.zip
+
+	# Bundled text files are incomplete, bug #580948
+	cd "${S}/simutrans/text" || die
+	unpack language_pack-Base+texts.zip
+}
+
+src_prepare() {
+	default
+
+	strip-flags # bug #293927
+	echo "BACKEND=mixer_sdl
+COLOUR_DEPTH=16
+OSTYPE=linux
+VERBOSE=1" > config.default || die
+
+	# make it look in the install location for the data
+	sed -i \
+		-e "s:argv\[0\]:\"/usr/share/${PN}/\":" \
+		simmain.cc || die
+
+	rm -f simutrans/{simutrans,*.txt}
+}
+
+src_install() {
+	newbin build/default/sim ${PN}
+	insinto /usr/share/${PN}
+	doins -r simutrans/*
+	dodoc documentation/*
+	doicon simutrans.ico
+	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
+}
diff --git a/games-simulation/simutrans/simutrans-0.120.1.3.ebuild b/games-simulation/simutrans/simutrans-0.120.1.3.ebuild
new file mode 100644
index 000000000000..0f9a043fd0f9
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic eutils games
+
+MY_PV=${PV/0./}
+MY_PV=${MY_PV//./-}
+DESCRIPTION="A free Transport Tycoon clone"
+HOMEPAGE="http://www.simutrans.com/"
+SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
+	mirror://sourceforge/simutrans/simupak64-${MY_PV/3/2}.zip"  #FIXME: rev bump when .3 is released
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[sound,video]
+	sys-libs/zlib
+	app-arch/bzip2
+	media-libs/libpng:0
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	strip-flags # bug #293927
+	echo "BACKEND=mixer_sdl
+COLOUR_DEPTH=16
+OSTYPE=linux
+VERBOSE=1" > config.default || die
+
+	# make it look in the install location for the data
+	sed -i \
+		-e "s:argv\[0\]:\"${GAMES_DATADIR}/${PN}/\":" \
+		simmain.cc || die
+
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	rm -f simutrans/{simutrans,*.txt}
+}
+
+src_install() {
+	newgamesbin build/default/sim ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r simutrans/*
+	dodoc documentation/*
+	doicon simutrans.ico
+	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
+	prepgamesdirs
+}
diff --git a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
new file mode 100644
index 000000000000..f175a36b9e03
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eutils
+
+MY_PV=${PV/0./}
+MY_PV=${MY_PV//./-}
+SIMUPAK="simupak64-${MY_PV%-[0-9]*}.zip"
+
+DESCRIPTION="A free Transport Tycoon clone"
+HOMEPAGE="http://www.simutrans.com/"
+SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
+	http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
+	mirror://sourceforge/simutrans/${SIMUPAK}"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib
+	app-arch/bzip2
+	media-libs/sdl-mixer
+	media-libs/libpng:0
+	media-libs/libsdl[sound,video]"
+
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_unpack() {
+	unpack simutrans-src-${MY_PV}.zip
+	unpack "${SIMUPAK}"
+
+	# Bundled text files are incomplete, bug #580948
+	cd "${S}/simutrans/text" || die
+	unpack language_pack-Base+texts.zip
+}
+
+src_prepare() {
+	default
+
+	strip-flags # bug #293927
+	printf "BACKEND=mixer_sdl\nCOLOUR_DEPTH=16\nOSTYPE=linux\nVERBOSE=1" \
+		> config.default || die
+
+	# make it look in the install location for the data
+	sed -i \
+		-e "s:argv\[0\]:\"/usr/share/${PN}/\":" \
+		simmain.cc || die
+
+	rm simutrans/*.txt || die
+}
+
+src_install() {
+	newbin build/default/sim ${PN}
+	insinto /usr/share/${PN}
+	doins -r simutrans/*
+	dodoc documentation/*
+	doicon simutrans.ico
+	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
+}
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
new file mode 100644
index 000000000000..6e9a649e8293
--- /dev/null
+++ b/games-simulation/singularity/Manifest
@@ -0,0 +1,7 @@
+DIST endgame-singularity-music-006.zip 28250705 SHA256 469697285c00564d831249898204d3e532f2685a17b4cf47ee4abc3ffc29276f SHA512 47e489112309cc742c2dcffec004aff25c54488fdf2a5f2dc67b7dcf67ca55996fe8e8403e4a16712fbc4e22289f12e612ad9d4322cd1d1aaab871f0ffb27e19 WHIRLPOOL bb94d4a5c50ef9fdc55e1384132c3ebb8788aa3746b70f8440b1855598682f7d6c99fb058d398012ca0b8bbe47d9b1362e070c3815ec96c05c9c9a66469da4bf
+DIST singularity-0.30c-src.tar.gz 2265133 SHA256 f4759fc059ef136c2d4d9668a021b14922dd7300ab5f37ed318ad6778c83f28f SHA512 ffca50c179b745561a25e3fb3525abb862d72f63f533f8a41472067d0ce94c8a236486c9c40a5040335d84e903c498805d591dc546a92d0a7651105103fe114f WHIRLPOOL f7b95b170df3aa5bd5080f1d7480b655fb63bb513a9b16b5e5d9873779bf478d8c19e537c1274bbdbd04cc688c1c9ce3ba1507c28a503904703afff678a0bf0b
+EBUILD singularity-0.30c-r1.ebuild 1281 SHA256 b2d01423b8b6fa883caf14995f5a6b8cb4321090de7f1cbea68fe2a1a723e249 SHA512 ca1a02ab72ffa854082bb5e3aaba6a0392b2354407860903cf645727ea45dea6c32ccf1dd7e32221de0d3e0956dffb58420fa65beb6476dce81f410ba26f4051 WHIRLPOOL 8897b380a2f708d7b792466c22a77e2452377dafdad1412f98d8507e773047c4f2cecdc086b779ebc584da6254bad8d9a6f4aea2a84975d8b3136fbbcbd25222
+EBUILD singularity-0.30c-r2.ebuild 1225 SHA256 c07aed1e8c07562e1b12e1513e6cca547f8b41e3e4c6fc16ca6b9e3641724697 SHA512 375a554d84fa8149a27757fb24d310baadc4c1a2af25d01829001d95723cba1e1fd555418f4dad379ff0c48491f891764e7e48e7e2e73da42ff7d921a72d4b8d WHIRLPOOL 8567fc2219c66823b3200c4907b909177909bda7797fe7f5538b4c8da260a8bbaa29423d3b8d1e982307397b01224b91c065c4d4eff82e228267c2e1ca3a7708
+MISC ChangeLog 2885 SHA256 b8ea49672483b7dc759bb08b95fbbb7aa259c3b744f2b01c391acbc6e1fb8263 SHA512 66494c0104fe3f6fc9c768c518b5d2f01436e8f014a407883ed52801cd5ed021e4715d38ce606577a9fd6dd18f382b2270d437b3855ea8af24f5f68b20bb91c9 WHIRLPOOL 4df98aef7d438700c67fc0cc6b439b4b45fae9663fad1c716eefe675e31b26d4f2df9387b330190dca9c25f221c9961a0e9894c0ab948d00c9ece60b9923f4c7
+MISC ChangeLog-2015 4194 SHA256 ac458b377e17762b3afa50b143e56a20d1c1999486577586ae2e7908c6643b73 SHA512 2ad73173c5effd401e5947bca28f65f74e312e1d36099c3326a2754a7e70d9a5f7bb143560c9090d53734df0960fd229f71925a798d090fa7cea194db9f4a756 WHIRLPOOL df8d30d7d500be648c3b048f32aa6450845dc968e8148d0586e765a892924989f3016a04c4ddbba655d3ebaf9b4091a1fd07a240d791a81388081826ad1909c7
+MISC metadata.xml 405 SHA256 cff56980d6d4ac2bbedb0a2f37e447594342f4f6bc1a24e4044bd505bf9259af SHA512 c32086dbbfce16439635063e3ed94a44a9bff47f5047cc9c078ed59bf4eac0e7e91b86037f4fd19c1e21fdcb4853e794535cc4d1a8ee898f8e292b26bbe7883f WHIRLPOOL 07dd0c508ec5274612ce55eee6261946c9c7bd0cc1c799b3c673f7afcac957a6ec8b723e89c54803266771d112b79e6973144331dd89415684586b47c1a120b2
diff --git a/games-simulation/singularity/metadata.xml b/games-simulation/singularity/metadata.xml
new file mode 100644
index 000000000000..3bc51b541a4a
--- /dev/null
+++ b/games-simulation/singularity/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="music">Install music files</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">endgame-singularity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-simulation/singularity/singularity-0.30c-r1.ebuild b/games-simulation/singularity/singularity-0.30c-r1.ebuild
new file mode 100644
index 000000000000..d680a1d5674a
--- /dev/null
+++ b/games-simulation/singularity/singularity-0.30c-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 games
+
+MUSIC=endgame-${PN}-music-006
+DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world"
+HOMEPAGE="http://www.emhsoft.com/singularity/"
+SRC_URI="https://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
+	music? ( https://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
+
+LICENSE="GPL-2 CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+music"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/sdl-mixer[vorbis]"
+DEPEND="${DEPEND}
+	app-arch/unzip"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	rm -f code/{,*}/*.pyc data/*.html || die # Remove unecessary files
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r code data ${PN}.py || die
+	python_optimize "${ED%/}/${GAMES_DATADIR}"/${PN}
+
+	if use music ; then
+		doins -r ../${MUSIC}/music || die
+	fi
+	games_make_wrapper ${PN} "${EPYTHON} ${PN}.py" "${GAMES_DATADIR}/${PN}"
+	dodoc README.txt TODO Changelog AUTHORS
+	prepgamesdirs
+}
diff --git a/games-simulation/singularity/singularity-0.30c-r2.ebuild b/games-simulation/singularity/singularity-0.30c-r2.ebuild
new file mode 100644
index 000000000000..69f55f32b106
--- /dev/null
+++ b/games-simulation/singularity/singularity-0.30c-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+MUSIC=endgame-${PN}-music-006
+DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world"
+HOMEPAGE="http://www.emhsoft.com/singularity/"
+SRC_URI="https://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
+	music? ( https://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
+
+LICENSE="GPL-2 CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+music"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	media-libs/sdl-mixer[vorbis]"
+DEPEND="${DEPEND}
+	app-arch/unzip"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	rm -f code/{,*}/*.pyc data/*.html || die # Remove unecessary files
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r code data ${PN}.py || die
+	python_optimize ${ED%/}/usr/share/${PN}
+
+	if use music ; then
+		doins -r ../${MUSIC}/music || die
+	fi
+
+	make_wrapper ${PN} "${EPYTHON} ${PN}.py" /usr/share/${PN}
+	dodoc README.txt TODO Changelog AUTHORS
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /games-simulation