gentoo resync : 19.03.2019

13 files changed, 233 insertions, 122 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 9455e9fa7463..582b387d7c0a 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 6cfbee8579b7..21bdf16134ff 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,8 +1,6 @@
-DIST FlightGear-2018.1.1-data.tar.bz2 1576049981 BLAKE2B cfcf028ca04ed785ba7c65979e6566ab773d8af869a9b62050969295eafecf7d1f5b6162f498af96786fa23a46e886390f240b56c83e7107473f59552a1155a5 SHA512 022f102f95c9cd8b153d991dad55ecd182e71aa0f3ecfe1502a35d6dcda0746a1fd183f808e59aba8c7f3a0cc9ae1f2f91ff49565bff4c7bc5a1c4889fcc127f
-DIST FlightGear-2018.2.1-data.tar.bz2 1624676603 BLAKE2B baecea2002fc3c256205e70c6692102f9bccd04c839902353b0e6d803a97221479e8b54095530dc7af366d842c487d04447f0fd775527e6f5ea0ac32ed602dd6 SHA512 93690703965dd83b610ea0ba67938c0d3fb2d5f6d8c842851a979f352387431eacafb4d181a56dad6def474b2ab84f412cf5531570ce18c1ec80076fe92e4d05
 DIST FlightGear-2018.3.1-data.tar.bz2 1735407015 BLAKE2B e076e0096656c607cd32c7f86999685bc65bc1d8a28a260e0e7d760a5d4ea645f3a84f8410f9091e9767fcc143d0910f3e2ac2546e9408a49032b864bdd3c742 SHA512 495ef2dc87244c10cbca6deed7731e84f07c4a495e6d70ea7a88581e655b366c17900603f2388d2d21c4fe5cc4279820ae2a112376deeba4d37a53cd3495c102
-EBUILD flightgear-data-2018.1.1.ebuild 518 BLAKE2B afd977b91675529215c7c72fb939a8a2c1be99b5af682a86cfd06175b9a9386c6fe665b31fe8e2e5102fba0f33f0d28bed2c150e614758f6b758738b9c53c86d SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f
-EBUILD flightgear-data-2018.2.1.ebuild 518 BLAKE2B b28ff44f4d60306ee8edd3d1cc1af8659891ec4d358aa677112d3489584f3d79abc4d093b84795750894ce8f6bbffefaaa219df6b6467189aa445dfe7d05fde0 SHA512 6c2c9171b3d91fd9eeb5c3b2f6cfbdd5cc5a6fe6ab3ec5cb8fbc9bbf6b311f69e43d269fdff725a4eb1e081e72aab191ab544f890954fdec4fd99088be881ddc
+DIST FlightGear-2018.3.2-data.tar.bz2 1744998558 BLAKE2B 8ce8b34973687df907695c11eb385fc87526e6c6b54a2e1180819a6d0b503f27d0bbce7f400041a4f724e5dc940a84db90faf267e4ab012457ac753f243eb1d1 SHA512 64baa8a42d6a6e930cc2a14e62f6f3488f08cb3121973aece8818275b8f4934a94539e24b95646d7c5bb8bd5eef65ff91d63013c07dabf79f452908b749640bb
 EBUILD flightgear-data-2018.3.1.ebuild 515 BLAKE2B a360626ccf5d47b379f96d0eb69813697eb6428a4933c8243298855ec90094252aa0ac2047467245be2edf0242238f65a0f6f004adccbfef353a5d1e4f040a76 SHA512 adea1e43c16a43b4c16ddaa43af7c55c6390f82c78dbdd42fe6ce77a317a324cbe5fd22137e251b50dd2fdea317680d69cb802192386e26e05b840c2699addcd
+EBUILD flightgear-data-2018.3.2.ebuild 515 BLAKE2B a360626ccf5d47b379f96d0eb69813697eb6428a4933c8243298855ec90094252aa0ac2047467245be2edf0242238f65a0f6f004adccbfef353a5d1e4f040a76 SHA512 adea1e43c16a43b4c16ddaa43af7c55c6390f82c78dbdd42fe6ce77a317a324cbe5fd22137e251b50dd2fdea317680d69cb802192386e26e05b840c2699addcd
 EBUILD flightgear-data-9999.ebuild 546 BLAKE2B ea1647fcbee2eee6a213ad67e6fa6ca22ee66d8a7ed4cc6928a75a9e2852b9befbba63aa5032921da37aa83cbb22d3d6433d459faa5787d80cdd33678215125c SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508
 MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
deleted file mode 100644
index f364395e8473..000000000000
--- a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# data files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
-S=${WORKDIR}/fgdata
-
-src_install() {
-	insinto /usr/share/flightgear
-	rm -fr .git
-	doins -r *
-}
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
index f835ef53253b..5e2859ac4b45 100644
--- a/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 692c9e5326e4..a25b8d6f86ab 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,6 +1,8 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
+DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
 EBUILD flightgear-2018.3.1.ebuild 4086 BLAKE2B 3d9658d8fce4a0854aeafe8efac28fadd4e3b1a177909d6818aaf729fe94c40dcfc374ae3e394bb158e73140eeac7031a348fdaf921504bef9da2ec26984e691 SHA512 131765eefaf7b02e93bc09544561da9764565bc9d56c0d0fce017e7b3d1e58ae867eed46992b219d495093dd689571e63f3f6c14ec9512fa25344748456f0cee
-EBUILD flightgear-9999.ebuild 4136 BLAKE2B 9fc1fd671f7d2ad65dad6aaf792ee903a60ea74d8b9c35b133128725f7a1bc1d38a7bab9c0b2577bbaa30344fb779c2a5be27ea2f85a3d49d68a8a267687e755 SHA512 46729acc7921e0b1639a2f522dac13d35c1da75087333605e6125a2cc5d3df5cd3cb9bf10e58a5c2f20bd0676bf08001435a21efb6b30314c7abe14f6bd408f7
+EBUILD flightgear-2018.3.2.ebuild 4215 BLAKE2B 0362ec9d7ab6fb6e7f52831d078f39672de6dc2d1672f21c04cbdcbcd0fcaf7c981beb733c450422bf71dc7cc8e25291b8f56d2b712ff23e879f34817bed246e SHA512 af935b2863dddbf78814881d452ca7c445e789e65cdb57def3875a5992fee56cbbe1dac65df749a73ca589bfffb48c1b5edebcd8d9182346114563e89ce254c5
+EBUILD flightgear-9999.ebuild 4136 BLAKE2B 3dbc2079f3300ff513da9397faed098f85f054018536d6b5a0c13ba6cf14668a26702077cf9f0098a0e5b49bb04d145feeaebad3c409af6c160350440ed46f54 SHA512 ea5de4dc344b3b7833efe737ede0caf063c03621db29b57cd063f0a98c3785e7428658afcf15d571abefe0726c3846a960c7f682711c6302ada2f2fdd3b2d465
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
new file mode 100644
index 000000000000..31cb9fe151d2
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+
+# Needs --fg-root with path to flightgear-data passed to test runner passed,
+# not really worth patching
+RESTRICT="test"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	<dev-games/openscenegraph-3.5.6:=[jpeg,png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.7.1:5
+		>=dev-qt/qtdeclarative-5.7.1:5
+		>=dev-qt/qtgui-5.7.1:5
+		>=dev-qt/qtnetwork-5.7.1:5
+		>=dev-qt/qtwidgets-5.7.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AUTOTESTING=OFF
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_HID_INPUT=$(usex udev)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_STGMERGE=ON
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Release
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
+		-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)
+	)
+	if use cpu_flags_x86_sse2; then
+		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+	fi
+	if use gdal && use utils; then
+		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
+	else
+		mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
+	fi
+	if use qt5 && use utils; then
+		mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
+	else
+		mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 7dd168e9627a..e485d9af2d35 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
index 6da303dd5120..4c7f25ad1079 100644
--- a/games-simulation/lincity-ng/Manifest
+++ b/games-simulation/lincity-ng/Manifest
@@ -1,4 +1,3 @@
-AUX lincity-ng-2.0-build.patch 886 BLAKE2B b2b7680db28cf2d69352268c007b1ed86dc5e5340e7f48ad7f0f1aabf7da13d7f0c9a7b539c138698079bbad5401cf8c63d15dddd782dedee50350c0c87daa98 SHA512 0ac99a14e61ec3341dbe2d46f5a36e0a4d9e2dca4fceb2ddc8754a901eebdb2a8251c66fac36359688c77a2243ad4388142215bc57d6acd762723aee73c5f3d5
-DIST lincity-ng-2.0.tar.bz2 39475719 BLAKE2B 39992e6a2ef78e53eea1b0e347c968f6828089b5267e6d62dac7405ea91b182335431b1718ef9892b649b1437751959deb9fa407dfd899fd1dfca55145d059f2 SHA512 d85cd398145d1591f8640458c076f2a0b55713c39ede28b67d99adc7b76d38f09b58cd2ec84d9acac11bbaa794f6d97f6200f54efcdd4286315e6b3133284c55
-EBUILD lincity-ng-2.0.ebuild 1106 BLAKE2B 1c2538f2b9b7db2095619ea87ff75d0e8df2c15364d2b0743e6b7d29c2c3cd1c7422cd8fc77c5887d44d5a3dc89df1626d5a33009fbbbf508f17b86ab078aa69 SHA512 2422299580819a493afa66faf3c9df252d7bea336d73406fb06330412099345382a284428850c7a61f67c63d958b54963fed26462f09d5101a6574d88a726007
+DIST lincity-ng-2.9_beta.tar.gz 115799513 BLAKE2B 038c69172af9a62b35199823ef56200e170a8eafef2849bc6d8797bbc20ffa01656d05b1ba0725d4d33e217602f6695d3bdf2774b90b85c6e257e13e019bebcb SHA512 194b7389d7172b7987eda14cbbf2dd91aa503af36db9cf3bdf07ab6ae5e0068ac00988fec6068d65da6bdf14dee623bba57a58192e2a9659e741a7c9036e6d65
+EBUILD lincity-ng-2.9_beta.ebuild 1382 BLAKE2B ddca268df7af315fffe16c84ff7224356e3174abc7d634268199f11e9b15e70b84b578bc218196e5cf9ecdb266d1cc26819cc71f862c4cc88c2361c8ec71339b SHA512 f2c0cf3735e6f5e42a309ff20f85d3e31dc810c79258d27944f8f3803ef3bc4f637ba54d829dba2a2d3171bb597950a0c3f5b00bc710517db5dc95c67e4365cc
 MISC metadata.xml 341 BLAKE2B 971b9b371fbe6bbb577214a2fcb2f39948f4f8abe02398fd7f6e86d650434f778bc8e1556a6d08be49149da35f848e7e8a23e56034626823704872e88ada99e5 SHA512 0c2607743dbc1b832fad2d9edf774b51c9e816cca447c5991cd3958f001fded11bfd0fd0b90316ddab7c3371b0ec98d6f4ada27054e5d74e3295cf2cd1beeb90
diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
deleted file mode 100644
index ad2f2eeaff8d..000000000000
--- a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Jul 30 07:06:54 UTC 2012
-Subject: build system
-
-arguments to AR would be overwritten if we export AR
-
---- lincity-ng-2.0.orig/lincity-ng.desktop
-+++ lincity-ng-2.0/lincity-ng.desktop
-@@ -1,12 +1,11 @@
- [Desktop Entry]
- Type=Application
- Version=1.0
--Encoding=UTF-8
- Name=Lincity-NG
- GenericName=City Simulation Game
- GenericName[de]=Stadtsimulationsspiel
- Comment=Plan and Build a city and take care of transport, economics, electricityand others.
--Icon=lincity-ng.png
-+Icon=lincity-ng
- Exec=lincity-ng
- Terminal=false
- StartupNotify=false
---- lincity-ng-2.0.orig/mk/jam/unix.jam
-+++ lincity-ng-2.0/mk/jam/unix.jam
-@@ -45,4 +45,10 @@
-     $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
- }
- 
-+# jam Archive action seems to include the arguments which will break our AR export
-+actions Archive
-+{
-+  $(AR) ru $(<) $(>)
-+}
-+
- 
diff --git a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
deleted file mode 100644
index 5da88e889d4c..000000000000
--- a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multiprocessing games
-
-DESCRIPTION="city/country simulation game for X and opengl"
-HOMEPAGE="https://sourceforge.net/projects/lincity-ng.berlios/"
-SRC_URI="mirror://sourceforge/lincity-ng.berlios/${P}.tar.bz2"
-
-LICENSE="GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT=mirror
-
-RDEPEND="virtual/opengl
-	sys-libs/zlib
-	dev-libs/libxml2
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
-	dev-games/physfs"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/ftjam"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	jam -q -dx -j $(makeopts_jobs) || die "jam failed"
-}
-
-src_install() {
-	jam -sDESTDIR="${D}" \
-		 -sappdocdir="/usr/share/doc/${PF}" \
-		 -sapplicationsdir="/usr/share/applications" \
-		 -spixmapsdir="/usr/share/pixmaps" \
-		 install \
-		 || die "jam install failed"
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
-	prepgamesdirs
-}
diff --git a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
new file mode 100644
index 000000000000..c49cae5849f8
--- /dev/null
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multiprocessing toolchain-funcs
+
+DESCRIPTION="City simulation game"
+HOMEPAGE="https://github.com/lincity-ng/lincity-ng"
+SRC_URI="https://github.com/lincity-ng/lincity-ng/archive/lincity-ng-${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BitstreamVera CC-BY-SA-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-games/physfs
+	dev-libs/libxml2:2
+	media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/ftjam
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${P/_/-}"
+
+src_prepare() {
+	default
+
+	# Missing CREDITS files actually breaks the install.
+	sed -i -r "s/\b(COPYING[^ ]*|CREDITS)\b//g" Jamfile || die
+
+	# Can't use eautoreconf as it does weird jam stuff.
+	autotools_run_tool ./autogen.sh
+	elibtoolize
+}
+
+src_compile() {
+	jam -q -dx \
+		-j$(makeopts_jobs) \
+		-sAR="$(tc-getAR) ru" \
+		-sRANLIB="$(tc-getRANLIB)" \
+		|| die "jam failed"
+}
+
+src_install() {
+	jam -sDESTDIR="${D}" \
+		-sappdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		-sapplicationsdir="${EPREFIX}/usr/share/applications" \
+		-spixmapsdir="${EPREFIX}/usr/share/pixmaps" \
+		install \
+		|| die "jam install failed"
+}
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 4b89e5b51ca0..590d72937258 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,10 +3,10 @@ AUX openrct2-0.2.1-disable-tests-with-assets.patch 2166 BLAKE2B c7055da8e933f4f0
 DIST openrct2-0.2.0.tar.gz 6481521 BLAKE2B b3a17d4dd7b0d3e68d4a0a200a81307fa598ac9bafd0636fc2fe62cc0921d1e620cf29a31f2fd5d9258d5b79cd952887e853c005ed719f5990744e9849ad0ee8 SHA512 ac42509ceb52eab20964bf95d7a140dc00d9b4c2569fab1200faff31548f063e209acde29f8ca4ee14858fcf5f6781eebe6d5f7de3d4e01fd43c43ee8905863b
 DIST openrct2-0.2.1.tar.gz 6571807 BLAKE2B f5a72072ce4cda9b68d1f82f56932f1a074c4ea4050d63e4bf39de1220544d543265c67f764f85d0cc85b6ff42f3fa67fc71e7dd9c5eacb1881be47e2d79a84f SHA512 04bf2cfbb2d3b9fb0a8423cfffc70b81a2a2518af73b9a2c2c65b2a4e5ef2380621d4d3aaefaea73d926a99259dfb047d6fcc330cd0d7227541cffead28ba540
 DIST openrct2-objects-v1.0.2.zip 2068705 BLAKE2B 4f291289a7f331bad19080ffc63d204819973682710ea62c3fc66fb9d05b63c267e2146d6c533f59eac3baa9760b85953ae344b6da4bb778e5ccd249f6160525 SHA512 814d52ee5c071f33c17d88bc53711a509d7988ece12381996b3d233b9b46c79739fd2dafbed57f00537b19c78e290e2481d72b2824b5574734f6876a0af0c359
-DIST openrct2-objects-v1.0.3.zip 2070513 BLAKE2B 3499b022f1d1f2b05da003f87f5f885de8463ed63d751653b0d8d48e2a339496d84d025eb2e44619012aa76360f6880541a519312e6d339eca862f6274d2b73b SHA512 9012a6337df7abd2743e94e3606266cde306335f33bf4f7869cca90c9c31758806c063b697bc3a6e21af7c733841551f2b29072592850cc51090d58f5f685f99
 DIST openrct2-objects-v1.0.7.zip 2164242 BLAKE2B 003baf3400c52e3b2efdc208f6c64a45f7c9274aca3b729856a60fc1e72c8b6440b663d3fd791ebde7412df9920095367763bcad58257534b32c222d97976dcb SHA512 8e77adae59062582a22be69e81d144477482148c839abbea76e6bbbc65ca6426a8354bd4726176702a41684f01a62c5bddc0f6c2c6e42fa91c88815879c91fe5
+DIST openrct2-objects-v1.0.8.zip 2167920 BLAKE2B 551fd825a0bfb6bd2fce8a34aab393ea91f815508f51523a3839a3d2054afe96efac09976f1defd046be55fa14806b05c9cd5a9484d7e3ce1a86c54335a0741a SHA512 29e60a2d72e0c7774993e9d70aeb1c931b359e35776049a1baafd2d0bdfc56c1374e577e43f596c31ee146bd38b87eeeb8acc3ea03fdd9c9bc3be08436b7aa6a
 DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106
 EBUILD openrct2-0.2.0.ebuild 2708 BLAKE2B 638b3a66b3e68f85bc9da8be330da58e550721d24f1e1b0199d1dcf34294933f5fd923821f83722e8fa38b5d2c95e9d74896f8e3f0bc6d83c7df35fc313561ca SHA512 6ea12f1460723acbe7339e9207e7137601d3a0ac37fe4f4f982201e4302cff4ee6049e24912e1975648d815e6248b64e193c5f89c666396a517089f54cb5067f
 EBUILD openrct2-0.2.1.ebuild 2708 BLAKE2B 9e5605dcc6967010e31f1d67a7a1d54f4c6c4b40d86af3a56b7ff29cc49438c5e1a1ea0878a98dbcca6e8aff619f711a5080c84b0ffa51df50157ff79a0d82d0 SHA512 57d48664a885fc3d511a3b6a72d0d3bef54dc1b9ff63cfc015cc2e57c5e486b3ec401b4f5f1b0d9eb66703961d161eb283b6225ca13a8d013d43fc0c7a41d293
-EBUILD openrct2-9999.ebuild 2591 BLAKE2B 4bb94328a57009b43ceff04d6ad130eab031e46572f3c934b90729539f4f71627e3ad7deca1fc747e1adde31fa0c64407eac30fcb9755f2869cc231cb5f240fe SHA512 b524918d9e081bfb3439bfe073a53f4adbc7899a0f2cbc696683132b888731aaf395dd7a7795b36ecc536e00f6ea10dc9a3d7ad405bc654063019b3bd506ad24
+EBUILD openrct2-9999.ebuild 2588 BLAKE2B 9f21ac2ef2d737c9d80108c1c6288747f11055d75886986089ebcd36d3432251342ec4ced5c7a15cc7456536f61743a2ab9b10e56f464bc71258bd7d79f74d2e SHA512 59cddab56bdf58fe9dc32197b4d5765cf30daa1d0eac9bca74c91879a5333ba7e6af1144b50ae700f2e6d74ae9fa548706a615113c4b62ca8aa71e7405ea7911
 MISC metadata.xml 967 BLAKE2B 6dc048c366eb9719d895ab269a207a51f233125ee0861e360bf0d65a2de0d56b8bed7147f71bbf1d8c4b286a843a3542e74e17c8e3231682742435a2b28dfef0 SHA512 874ed9f406c5219bc5c6102b775a53b4e2526ff0f7cfa0dd9b5511717d10ee1fd63012cd19a926904b556195a12a7e2328548de9d1000605afdc471db513198f
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 813f2f4c1dbb..36be8a5dcec7 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ else
 fi
 
 TSV="0.1.2"
-OBJV="1.0.3"
+OBJV="1.0.8"
 SRC_URI+="
 	https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip
 		-> ${PN}-title-sequence-v${TSV}.zip