gentoo resync : 14.12.2020

26 files changed, 684 insertions, 171 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index b82313fc1686..e6a7a8fec509 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
deleted file mode 100644
index 8e4786acd600..000000000000
--- a/games-strategy/asc/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX asc-2.6.0.0-freetype_pkgconfig.patch 1012 BLAKE2B 8e6619f39c1ac5dfcc9e07c0bfd160ed55300aba75eda17aa9d40620d5be4f1da6a3233699f5cdea7a016580f02a8b456143a5c96f6b62f2ed78591d91d3df1c SHA512 f27e02554711bad885a53929f6049607201ea2090fa686b4d680c47470a0f7fec53c84a3f4657341fa46a3ef0369f204246b4bf2d3b25d588953e288edaa8a19
-AUX asc-2.6.0.0-gcc6-nothrow-in-dtors.patch 741 BLAKE2B f74d9e7529433ee86dd3f0406cc79a52ddcd0cca0880749268f5878f1aaacc7c67fce131af1d568c3f19549dfa21c5c20eed8a7116fc7fccefd689dc8bcf05b8 SHA512 d92086128b2b491a6f0c96d0b92f2e5ae9a7d521070405b7971fafa4ab953e6d4996784a6c5837b8cbf2811a18e043481c0278d960f6fe9804d8da68c8afa32d
-DIST asc-2.6.0.0.tar.bz2 42280527 BLAKE2B a2ab8777f36d64924bb12359226792ea6d76a07f306bfe2f7204f50de5c103d524fbb69eb88106c293312650619cf3683a25a6afa6176941e8efb72edca9424c SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540
-DIST frontiers.ogg 4691844 BLAKE2B 02909247293439b72ca2f94b515abd53ebf931ac4ffbcc7a4d7909cfdcc79cd1411c973f42760e6012197ead5ce2369895d52b8b4fea5107f62e852502f2428d SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af
-DIST machine_wars.ogg 3138308 BLAKE2B 7c1f4e2c652b70dc9e41f313a8428a22844d1f98717b3c59061d462cf6d4a8f30c2ea2f7d2032afd8b6c9d50513286c409d8d21fb78c59bd246bd4cce3255029 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8
-DIST time_to_strike.ogg 3830679 BLAKE2B ced7de55d8f52177ee5fac6a19a4f76df8b50f70f9d62e42b10d6868608ebf88fe5405e072ee7b1cbc2152f54f4ae66fe3e025c13faf9b57b09a6c117a2c3d13 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee
-EBUILD asc-2.6.0.0-r2.ebuild 1777 BLAKE2B 04c24eaf6ed938e37bf6660a91f2ce8ff00ea5b106741436e50c4a6cf26b41c2eb1148903178685849131e51ad02699795d0b581b04cc3d17b0fb840c7426e04 SHA512 5df6fc0a21c2102049456591f00aab405559d9881117eb6bfda6e354c2d66f02d2cdede9598866d3288c3dd7f269880ae9e9c8eb2ffee1f79a2a4c098935268c
-MISC metadata.xml 329 BLAKE2B 0289ce2add055169d9f1b87baa936fe3b1066e11f9cf774fa46c26adfc534c7edc7c16e568000d3ebcb9936849be0c73fa44a2508a6d05c723cda6be1ba05dbd SHA512 1fa38f0da7bfc4cc3f1193758234379a9932c58742b914deebfc2d8101154e6303497b61c018eec7f52d5e8561ea2d7df89ad89f5d1cbe3f8a7732a1c922b051
diff --git a/games-strategy/asc/asc-2.6.0.0-r2.ebuild b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
deleted file mode 100644
index 6f17949ef838..000000000000
--- a/games-strategy/asc/asc-2.6.0.0-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit autotools toolchain-funcs flag-o-matic wxwidgets
-
-DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
-HOMEPAGE="http://www.asc-hq.org/"
-SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
-	http://www.asc-hq.org/music/frontiers.ogg
-	http://www.asc-hq.org/music/time_to_strike.ogg
-	http://www.asc-hq.org/music/machine_wars.ogg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	dev-games/physfs
-	dev-lang/lua:0
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/libsigc++:1.2
-	media-libs/libpng:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-sound
-	media-libs/freetype
-	media-libs/xvid
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch
-	"${FILESDIR}/"/${P}-freetype_pkgconfig.patch #657998
-)
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.bz2
-	for f in ${A}
-	do
-		case ${f} in
-		*ogg)
-			cp "${DISTDIR}/${f}" "${S}/data/music" || die
-			;;
-		esac
-	done
-}
-
-src_prepare() {
-	default
-	# required for freetype_pkgconfig patch
-	eautoreconf
-}
-
-src_configure() {
-	need-wxwidgets unicode
-	# Added --disable-paraguitest for bugs 26402 and 4488
-	# Added --disable-paragui for bug 61154 since it's not really used much
-	# and the case is well documented at http://www.asc-hq.org/
-	if [[ $(gcc-major-version) -eq 4 ]] ; then
-		replace-flags -O3 -O2
-	fi
-	local myeconfargs=(
-		--disable-paraguitest
-		--disable-paragui
-		--datadir="/usr/share"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc -r doc/*
-}
diff --git a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index a07cd2f86274..000000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/657998
-
---- asc-2.6.0.0/configure.ac
-+++ asc-2.6.0.0/configure.ac
-@@ -401,22 +401,7 @@
-       FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
-       FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`"
-    else
--      AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
--      AC_CHECK_HEADER(ft2build.h,have_ft2build=yes)
--      if test "$have_ft2build" != "yes"; then
--         have_freetype="no"
--      elif test "$have_freetype" = "yes"; then
--         FREETYPE_LIBS="-lfreetype"
--         ft2inc="no"
--         AC_MSG_CHECKING(freetype2 include directory)
--         if test -d /usr/local/include/freetype2; then
--            ft2inc="/usr/local/include/freetype2"
--         elif test -d /usr/include/freetype2; then
--            ft2inc="/usr/include/freetype2"
--         fi
--         AC_MSG_RESULT($ft2inc)
--         FREETYPE_CFLAGS="-I$ft2inc"
--      fi
-+      PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=yes)
-    fi
- 
-    if test x$have_freetype = xno; then
diff --git a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
deleted file mode 100644
index e710b22f8c8b..000000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Bug: https://bugs.gentoo.org/612934
-Upstream Bug: https://sourceforge.net/p/asc-hq/patches/2/
-
---- a/source/basestrm.cpp
-+++ b/source/basestrm.cpp
-@@ -1728,7 +1728,6 @@
-       }
-    } catch ( ... ) {
-       displayLogMessage( 9, ASCString("~tn_c_lzw_filestream : caught exception") );
--      throw;
-    }
- }
- 
---- a/source/simplestream.cpp
-+++ b/source/simplestream.cpp
-@@ -43,6 +43,7 @@
-  #endif
- #endif
- 
-+#include "util/messaginghub.h"
- 
- tnbufstream::tnbufstream (  )
- {
-@@ -270,7 +271,7 @@
- 
-    int res = fclose( fp );
-    if ( res != 0 ) 
--      throw  tfileerror ( getDeviceName() + " : " + strerror(errno));
-+      displayLogMessage( 9, ASCString( getDeviceName() + " : " + strerror(errno) ) );
-       
-    _mode = uninitialized;
- 
diff --git a/games-strategy/asc/metadata.xml b/games-strategy/asc/metadata.xml
deleted file mode 100644
index 33170f2a7547..000000000000
--- a/games-strategy/asc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">asc-hq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index ec2c5a74cbe7..a1d5f90a4ed6 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,4 +1,6 @@
+AUX hedgewars-1.0.0-cmake_lua_version.patch 282 BLAKE2B 0a65ddbc5b69264e51b5ca6bd23a3800d8aa04ca3cb59741ed7c58b7a44b8d173c6b22f6917a57fb6c37f1199305a347099afcb806b111a8bb304ebee956766b SHA512 406d52cecded03e392dd37e3119137a47604b9fc6c72af34ee671cf4c33b93158dd727083af87763a8220cf5ff05ab8eb6366da134481c2507dc83d5c6eecb3d
 AUX hedgewars-1.0.0-qt-5.15.patch 328 BLAKE2B 9304e4e1811e2aab876b5a6c3edea584c3271c5531035bfb2a53369000a30c61264464df655396146a26e08750ee29ffd9eb25aca8f89fa91409247b69675ad1 SHA512 f45985e878c9380f4bdcf755a79f1c906bdc6a8fa243faaa15f1c73b50d7b619c461821271ae151076f631ca0aecae31ddbe00d3d97945f13afc94610e216856
 DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2
 EBUILD hedgewars-1.0.0-r1.ebuild 2613 BLAKE2B e8c230cc14735fceaab5689c2573d8896f1e84662fe1c1cfc65bb9a7d36b49d323c9930eaafbf7e96656463de23d11abce955d2f58227013e438b1cfc0a0c46a SHA512 dafaf4ab6fa9c06e3d0f7f367e9a9ea13e1341f15fa43cace46a473f558122cfa21b6d1c9e279b8119b508a39613aa827271b44959c9e664c95ed4dca9d9ce04
+EBUILD hedgewars-1.0.0-r100.ebuild 2764 BLAKE2B 5a0b19b46f0982da58fa25bf7d7291481039cef1a1c89b954bba060cd450ffd9929a27b65b1b2824d357bbf34e6a47ac9098d718e634d24318e99b6853ce90eb SHA512 e0ed15c1cbeebd7c460828bfef0ad03233f25f7891cdf2285afd00bebabc4c3c0deb7ec7897da0e04b5fdd6e1ec55638ba61a3f912f057097527057f5452a27e
 MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake_lua_version.patch b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..b1daa2551124
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -202,7 +202,7 @@
+ #lua discovery
+ if(LUA_SYSTEM)
+     if(NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR)
+-        find_package(Lua)
++        find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+     endif()
+ 
+     if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
new file mode 100644
index 000000000000..8f127f790724
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake lua-single xdg-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="https://www.hedgewars.org/"
+SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
+QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
+
+# qtcore:5= - depends on private header
+DEPEND="${LUA_DEPS}
+	>=dev-games/physfs-3.0.1
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/sdl2-image:=
+	media-libs/sdl2-mixer:=[vorbis]
+	media-libs/sdl2-net:=
+	media-libs/sdl2-ttf:=
+	sys-libs/zlib
+	!x86? ( media-video/ffmpeg:= )
+	"
+RDEPEND="${DEPEND}
+	app-arch/xz-utils
+	>=media-fonts/dejavu-2.28
+	media-fonts/wqy-zenhei"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	server? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/entropy
+		dev-haskell/hslogger
+		>=dev-haskell/mtl-2
+		>=dev-haskell/network-2.3
+		dev-haskell/random
+		dev-haskell/regex-tdfa
+		dev-haskell/sandi
+		dev-haskell/sha
+		dev-haskell/vector
+		dev-haskell/utf8-string
+		dev-haskell/yaml
+		>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
+	)
+	!x86? ( >=dev-lang/fpc-2.4 )
+	x86? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/parsec
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.15.patch"
+	"${FILESDIR}/${PN}-1.0.0-cmake_lua_version.patch"
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
+		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
+		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
+		-DNOSERVER=$(usex !server)
+		-DBUILD_ENGINE_C=$(usex x86)
+		-DNOVIDEOREC=$(usex !x86)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		# Need to tell the build system where the fonts are located
+		# as it uses PhysFS' symbolic link protection mode which
+		# prevents us from symlinking the fonts into the right directory
+		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
+		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
+		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
+		# upstream sets RPATH that leads to weird breakage
+		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+		-DCMAKE_SKIP_RPATH=ON
+		-DLUA_VERSION=$(lua_get_version)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/${PN}.6
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
new file mode 100644
index 000000000000..0ed82ae3ad04
--- /dev/null
+++ b/games-strategy/julius/Manifest
@@ -0,0 +1,4 @@
+AUX 90julius.sh 72 BLAKE2B d07d935037fa998174fffd1c786ffe2dab8d6af4eb9b71f0c30e1ad2e528ddda09232c4009573935f64eccf3c99b23041441579b99110a96f31a003b7db87ba6 SHA512 39ad3849f341a0817623cd3daf3d0ce255784c33538a9b1f9e25fa6655c59e8c3f56cc2f4bca23692e64118c78900c8dede656e9a1af5a043904b02fdf0e84dc
+DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b
+EBUILD julius-1.4.1.ebuild 1450 BLAKE2B aa8530a01ac3246f04bffb3762268325496e8c50eedcca72ea0d100508eea7bb607fc776c9c5c46a732024c1309fd4c1c70fd2b7a1c065887c09f8d5c78ee84e SHA512 ec2afdc6bd8b85d9e799ba79a80057f6479bbbc1ed6489a310322c239ca77278f3733718e4409082a3685e58f10a8cecf3758df3f7d5814dc64d62d656335aee
+MISC metadata.xml 967 BLAKE2B 1bbe893da1d8326518e5ad1ec1e2bd238080db0cb9e022df84209f4a593ea94eb08066b44ec9bcba6e7acb2ba9d01b042e32d153a117b40c77a3aa08ebe33c12 SHA512 0b7d07bd6b945918856b0339db7695d361ce2e0e62137ede757dbdd8b544d5fb3ac81099308a8751f2dba07bdc5f3e5a417334622ab4578e9865c091259463dc
diff --git a/games-strategy/julius/files/90julius.sh b/games-strategy/julius/files/90julius.sh
new file mode 100644
index 000000000000..e88111f8994b
--- /dev/null
+++ b/games-strategy/julius/files/90julius.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+alias julius-game='julius-game ~/.cache/julius/app'
diff --git a/games-strategy/julius/julius-1.4.1.ebuild b/games-strategy/julius/julius-1.4.1.ebuild
new file mode 100644
index 000000000000..811dfaebf3f6
--- /dev/null
+++ b/games-strategy/julius/julius-1.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Feature-faithful open source re-implementation of Caesar III"
+HOMEPAGE="https://github.com/bvschaik/julius"
+SRC_URI="https://github.com/bvschaik/julius/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,video,sound]
+	media-libs/sdl2-mixer
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+}
+
+src_install() {
+	insinto /etc/profile.d
+	doins "${FILESDIR}"/90julius.sh
+	cmake_src_install
+	mv "${ED}"/usr/bin/julius  "${ED}"/usr/bin/julius-game ||
+		die "Failed to rename executable (required as per conflict with app-accessibility/julius)"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn "Julius requires you to download the original Caesar 3 resources."
+	ewarn
+	ewarn "You need to obtain these files from a vendor of the proprietary software."
+	ewarn "You will then need to copy the 'app' directory into '~/.cache/julius/'."
+	ewarn "One way to obtain this directory is to download the GOG Cesar 3 edition."
+	ewarn "You can then produce this directory by running:"
+	ewarn "    innoextract -m setup_caesar3_2.0.0.9.exe"
+	ewarn
+	ewarn "Lastly, run 'source /etc/profile' to refresh your environment and be able"
+	ewarn "to start the game directly by running 'julius-game' in the command line."
+}
diff --git a/games-strategy/julius/metadata.xml b/games-strategy/julius/metadata.xml
new file mode 100644
index 000000000000..88f523bf415c
--- /dev/null
+++ b/games-strategy/julius/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chr@chymera.eu</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<longdescription lang="en">
+		The aim of this project is to create an open-source version of
+		Caesar 3, with the same logic as the original, but with some UI
+		enhancements, that is able to be played on multiple platforms.
+		The same logic means that the saved games are 100% compatible,
+		and any gameplay bugs present in the original Caesar 3 game will
+		also be present in Julius. It is meant as a drop-in replacement
+		for Caesar 3, with the same look and feel, so there will be no
+		major UI changes.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">bvschaik/julius</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index feae7a099487..ad386f6882fc 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,4 +1,8 @@
 DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
+DIST naev-0.7.0-ndata.zip 319608404 BLAKE2B e6edd79282171d4b327d220b33af37720e09f7137a26697de472e3494587525de5d9509865bfccc1093f5d4befa11faa10e0d4f4c59ea8621ecd8d564eb546fe SHA512 5fa8faad36e410f0d2af1c80e6fedbffdd020da72dc96b329ce623e9836490cfb515c1bb88719045491366ca96a32888374029eec6cd14ed86ac8597750995ca
+DIST naev-0.7.0.tar.bz2 1076658 BLAKE2B 582bbfbc16e33d16600c19928ed6810dfe5fd3165930e6a51ec9b65d25305cd0bbfaf6f4cced12c5b7f76163ed4dc36b7108e81f4a4e82dc626c6045d3fe769f SHA512 9f8a2912e9f4f29ed6e276b008d4010da3ccdd309de5bb4360c393f2704aa7aff6e18db9e5d3657b4229e911ddec9b2a3312cf182c3c48a91a007a91138d84ae
 DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
 EBUILD naev-0.6.1-r1.ebuild 1531 BLAKE2B b58f34c1cf684d0e18bb215ace1fa3b77a3cf6e65131b1cc8dda0ae04bff1dc0bbda13540502b696ada59da9035ca7c001553078e6088ee1dacd5911d98d07ee SHA512 efad61393d551d265b6980198bb0efdb32132d32255472f9512c0dedc696816338c8926b4dc1795e8dd9131da5c601078e55bb004cf49dec039c81b0529aabff
-MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62
+EBUILD naev-0.7.0-r100.ebuild 1743 BLAKE2B 326278a4ad061cc00c8165271880e1b7e292404de08b571530bcd929c0ed339145cbbc68a155de23e774ebaa798246c113d488f91a57efbe3bf9091a5f509ddb SHA512 1cb9c86dd7ceae36b2cbfd6de5c9620f6455b6a13a4b184fc91918bda8a8935aa5511fed8e5182fe59e5ca9581306959d2f3a39dfb710ddb652a3ee9ccb2524f
+EBUILD naev-0.7.0.ebuild 1631 BLAKE2B 95c08ea170079af3ffd36455a09805b3de649137a90abe6d26743abf4d966cbc2a83728cbdc30300659655bb08589ead539b3e30a3d81feb40ef7dcbab8b3dd3 SHA512 cdc0fbe5403874eac22ac2d5cdd3fa0d266edf54049ddf498b33158cc75f4f217af129804fa7cb81fc9c93c01a16e9c86c2a3aabf6a5c63bf7f9163c73318a59
+MISC metadata.xml 480 BLAKE2B 4d01de527c3e9c5d5b97dfc169be7b0639be97a2cfa75564b6f2f3f0543c783f9b2403b15471191ecd0b1cf6ddc97eb87d9e04d7f53fe9534fd3626398f02425 SHA512 48c3f9af6ccc92e0cd032f169c8febe7a954cc3b304717e329d2bc9f8d4fff4d9be72bcab2cbfa2c3b75c46ab85a044fe76c786638c062c2a8a9005f1fff6b54
diff --git a/games-strategy/naev/metadata.xml b/games-strategy/naev/metadata.xml
index fd273f3193a7..935309187f72 100644
--- a/games-strategy/naev/metadata.xml
+++ b/games-strategy/naev/metadata.xml
@@ -12,6 +12,6 @@
 	</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">naev</remote-id>
+		<remote-id type="github">naev/naev</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/naev/naev-0.7.0-r100.ebuild b/games-strategy/naev/naev-0.7.0-r100.ebuild
new file mode 100644
index 000000000000..f43b5a4502f8
--- /dev/null
+++ b/games-strategy/naev/naev-0.7.0-r100.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single xdg-utils
+
+DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}.tar.bz2
+	https://github.com/naev/naev/releases/download/v${PV}/${P}-ndata.zip"
+
+LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +mixer +openal"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	media-libs/libsdl2[X,sound,video]
+	dev-libs/libzip
+	dev-libs/libxml2
+	>=media-libs/freetype-2:2
+	>=media-libs/libvorbis-1.2.1
+	>=media-libs/libpng-1.2:0=
+	virtual/glu
+	virtual/opengl
+	mixer? ( media-libs/sdl2-mixer )
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# This is so that only the source tarball is unpacked - the data file
+# is supposed to be installed *zipped*. This is why we do not need unzip
+# in BDEPEND in spite of what repoman/pkgcheck might say.
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_configure() {
+	econf \
+		--enable-lua=$(usex lua_single_target_luajit luajit shared) \
+		$(use_enable debug) \
+		$(use_with openal) \
+		$(use_with mixer sdlmixer)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		appicondir=/usr/share/pixmaps \
+		appdatadir=/usr/share/metainfo \
+		Graphicsdir=/usr/share/applications \
+		install
+	insinto /usr/share/${PN}
+	newins "${DISTDIR}/${P}-ndata.zip" ndata
+
+	rm -f "${D}/usr/share/doc/${PF}/LICENSE"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/naev/naev-0.7.0.ebuild b/games-strategy/naev/naev-0.7.0.ebuild
new file mode 100644
index 000000000000..1b20e968fdde
--- /dev/null
+++ b/games-strategy/naev/naev-0.7.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}.tar.bz2
+	https://github.com/naev/naev/releases/download/v${PV}/${P}-ndata.zip"
+
+LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +mixer +openal"
+
+RDEPEND="
+	media-libs/libsdl2[X,sound,video]
+	dev-libs/libzip
+	dev-libs/libxml2
+	>=media-libs/freetype-2:2
+	>=media-libs/libvorbis-1.2.1
+	>=media-libs/libpng-1.2:0=
+	virtual/glu
+	virtual/opengl
+	dev-lang/lua:0
+	mixer? ( media-libs/sdl2-mixer )
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# This is so that only the source tarball is unpacked - the data file
+# is supposed to be installed *zipped*. This is why we do not need unzip
+# in BDEPEND in spite of what repoman/pkgcheck might say.
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_configure() {
+	econf \
+		--enable-lua=shared \
+		$(use_enable debug) \
+		$(use_with openal) \
+		$(use_with mixer sdlmixer)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		appicondir=/usr/share/pixmaps \
+		appdatadir=/usr/share/metainfo \
+		Graphicsdir=/usr/share/applications \
+		install
+	insinto /usr/share/${PN}
+	newins "${DISTDIR}/${P}-ndata.zip" ndata
+
+	rm -f "${D}/usr/share/doc/${PF}/LICENSE"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index 75e8a6ad586b..4c4710253eaa 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -11,5 +11,6 @@ DIST SharpFont-4.0.1.zip 151532 BLAKE2B 3745959e449b0745b5cd1c20a9653595ce2166f4
 DIST SharpZipLib-0.86.0.zip 463599 BLAKE2B 5d6374c5daef33afc1faf814992df1ef7001b593594a022657406ac8ce67ac5e00f71cfe9365c4acab2925ef458f9add83ec62dd22e4db74e17efdd1e1091542 SHA512 70ac4a39b599a37ff45733477ba1afb4caee177262b72037998b7eb08a737177f8689bb690759b8090d25b9d408ba8c84e56bec3509997adde62724fcfcdc2b5
 DIST openra-20190314.tar.gz 24551126 BLAKE2B ed6289bbfab9f55aa88ac834dab3a2bab4cea3cb5a3b6934e24feb78bea1df71d839d4434242df666cda6180027a8e6d5b7766b6155ab2e85a4ee639a7950e12 SHA512 a16884cf626a31b3cf21662c307aef505bfcf6d34330f09b10510aa6c88d9d1026f17f2037565827fc95148776b0651fe0559c65db493295957df428793b2d71
 DIST rix0rrr.BeaconLib-1.0.1.zip 17989 BLAKE2B 2a65c9276b725ac6c433eb2cf6e4a13d6e5c07446dbff1e096b100a20eebb2a432c81cfbc13c11fdf672fbd37eb5985497b3fa425a317afe39049a6a967e3a7e SHA512 4fe4c6dfd7ad0f7eb5549c66fe53cd38f74026a8202d3553481bdfdab8ce0788f8b31f05092d93f9751a687badf75a1ec22da201235f2e505893192bb371367f
+EBUILD openra-20190314-r100.ebuild 5011 BLAKE2B aaec300aa007cdc04961f89f32f4cb4120cc9bde374d2728f692bf0c78115ee2347c0ae3885ecb19aa9f4d1fed86a036f425c64702e2474e431a2c4bf6b4ef74 SHA512 40f12f8f9b87dd3dbbf74f4fd8c4f9a0aba9c57f42ade666ca95ad805fa4d535f017ee40a2f21caf075c5bc4a33669119ad23a3482b90cb4d6f6fe8f6e7edc93
 EBUILD openra-20190314.ebuild 4890 BLAKE2B 5805d4bc6f43bc93f2748849ab462c7f8612c3cfeab5439e8b183537111ddc5296cfe42bfdc09cd5855d347582beae866cd3c21b23e121b8d8c0fbb02d5cdf2a SHA512 289a8c32e587585b6876fe65d42411402ab4806cba7f5be09b3626a1a27f17861338455dba527a91ee627660b60e1a31f64815a7b63f0bbb97c8801b4b3d484b
 MISC metadata.xml 507 BLAKE2B 41509ed4d51adffd4aaf548f986ff19ccdf2b382e6265eeca268ccf693fcbf47468fad4ba1fcafb73f2a7fd5893942944f4118ca3b388a2b9299fd9130621d5e SHA512 ffeb53c6a7368c79336656bee82ea41fcdec13ef68f22e70a2ef70b5ba644ae1ad3832406cf54c7afd888ebe3357d2530528f39b07d515b813cf090248fa5186
diff --git a/games-strategy/openra/openra-20190314-r100.ebuild b/games-strategy/openra/openra-20190314-r100.ebuild
new file mode 100644
index 000000000000..c9121cd7fddf
--- /dev/null
+++ b/games-strategy/openra/openra-20190314-r100.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit lua-single mono-env xdg-utils
+
+MY_PV=release-${PV}
+#MY_PV=playtest-${PV}
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer, Red Alert and Dune2k"
+HOMEPAGE="https://www.openra.net/"
+
+# This sed one-liner was used to generate the SRC_URI list
+# below. Ideally we would package these DLLs separately instead but
+# Gentoo Dotnet doesn't seem to be in great shape right now.
+#
+# sed -n -r -e 's@.*curl.*(https:[^ ]+/([^/]+)/([^.]+)([^ ]+)).*@\1 -> \3-\2\4@p' \
+#           -e 's@.*noget\.sh ([^ ]+) ([^ ]+).*@https://www.nuget.org/api/v2/package/\1/\2 -> \1-\2.zip@p' \
+#           "${S}"/thirdparty/fetch-thirdparty-deps.sh | grep -v 'NUnit\|StyleCop' | sort
+
+SRC_URI="https://github.com/OpenRA/OpenRA/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/OpenRA/Eluant/releases/download/20160124/Eluant.dll -> Eluant-20160124.dll
+	https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll.config -> OpenAL-CS-20151227.dll.config
+	https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll -> OpenAL-CS-20151227.dll
+	https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config -> SDL2-CS-20161223.dll.config
+	https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll -> SDL2-CS-20161223.dll
+	https://www.nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0 -> FuzzyLogicLibrary-1.2.0.zip
+	https://www.nuget.org/api/v2/package/MaxMind.Db/2.0.0 -> MaxMind.Db-2.0.0.zip
+	https://www.nuget.org/api/v2/package/Open.Nat/2.1.0 -> Open.Nat-2.1.0.zip
+	https://www.nuget.org/api/v2/package/rix0rrr.BeaconLib/1.0.1 -> rix0rrr.BeaconLib-1.0.1.zip
+	https://www.nuget.org/api/v2/package/SharpFont/4.0.1 -> SharpFont-4.0.1.zip
+	https://www.nuget.org/api/v2/package/SharpZipLib/0.86.0 -> SharpZipLib-0.86.0.zip"
+
+# Engine is GPL-3, dependent DLLs are mixed.
+LICENSE="GPL-3 Apache-2.0 BSD GPL-2 MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+debug geoip"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="mirror test"
+
+BDEPEND=">=dev-lang/mono-4.2"
+
+DEPEND="${BDEPEND}
+	dev-dotnet/libgdiplus"
+
+RDEPEND="${DEPEND}
+	app-misc/ca-certificates
+	${LUA_DEPS}
+	media-libs/freetype:2
+	media-libs/libsdl2[opengl,video]
+	media-libs/openal
+	geoip? ( net-misc/geoipupdate )"
+
+S="${WORKDIR}/OpenRA-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-system-geoip.patch
+)
+
+DOCS=(
+	AUTHORS
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+)
+
+pkg_setup() {
+	lua-single_pkg_setup
+	mono-env_pkg_setup
+}
+
+src_unpack() {
+	local DOWNLOADS="${S}"/thirdparty/download
+	mkdir -p "${DOWNLOADS}" || die
+
+	# Stub out unnecessary development dependencies.
+	touch "${DOWNLOADS}"/{{nunit.framework,StyleCop{,Plus}}.dll,nunit3-console.exe} || die
+
+	for a in ${A}; do
+		case ${a} in
+			# Unpack engine sources.
+			${P}.tar.gz) unpack ${a} ;;
+
+			# Symlink other downloads, Makefile will extract and copy.
+			*) ln -snf "${DISTDIR}/${a}" "${DOWNLOADS}/${a%-[0-9]*}${a##*[0-9]}" || die ;;
+		esac
+	done
+}
+
+src_prepare() {
+	# Stub out attempts to download anything.
+	sed -i -r 's/^\s*(curl|wget)\b/: #\1/' thirdparty/{fetch-thirdparty-deps,noget}.sh || die
+
+	# Extract what is needed from the downloads.
+	emake cli-dependencies
+
+	default
+}
+
+src_compile() {
+	emake $(usex debug "" DEBUG=false)
+	emake VERSION=${MY_PV} version man-page
+}
+
+src_install() {
+	emake $(usex debug "" DEBUG=false) \
+		prefix="${EPREFIX}"/usr \
+		gameinstalldir='$(prefix)'/share/${PN} \
+		DESTDIR="${D}" \
+		VERSION=${MY_PV} \
+		install \
+		install-linux-mime \
+		install-linux-shortcuts \
+		install-man-page
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if [[ ! -s ${EROOT}/usr/share/GeoIP/GeoLite2-Country.mmdb ]]; then
+		echo
+		ewarn "Multiplayer server locations will show as unknown until you install"
+
+		if use geoip; then
+			ewarn "a GeoIP database. Run emerge --config ${CATEGORY}/${PN}"
+			ewarn "occasionally to fetch one and keep it current."
+		else
+			ewarn "a GeoIP database. Start by enabling the geoip USE flag."
+		fi
+	fi
+
+	if [[ ! -d ${EROOT}/usr/share/.mono/certs ]]; then
+		echo
+		ewarn "The multiplayer server listing will not work at all until you install"
+		ewarn "CA certificates using Mono's cert-sync. Run emerge --config"
+		ewarn "${CATEGORY}/${PN} occasionally to set them up and keep them"
+		ewarn "current."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_config() {
+	if use geoip; then
+		ebegin "Updating GeoIP database"
+		geoipupdate -d "${EROOT}"/usr/share/GeoIP
+		eend $?
+	fi
+
+	ebegin "Updating Mono CA certificates"
+	cert-sync --quiet "${EROOT}"/etc/ssl/certs/ca-certificates.crt
+	eend $?
+
+	if [[ -n ${ROOT} ]]; then
+		echo
+		ewarn "Mono's cert-sync cannot write to your ROOT system so you must manually"
+		ewarn "copy the certificates from ${BROOT}/usr/share/.mono to ${EROOT}/usr/share/.mono."
+	fi
+}
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 6d4c3ed9ac00..9dbef127137e 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,3 +1,4 @@
+AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
 DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da
 DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
 DIST s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz 698512 BLAKE2B 82bc98077ed18622083894a63044194f599375c93aa745e330ad8ba390e14d9829ebb7c8e62141758f41dff2b72d3afbe2a5b6ebb584c3293c244e6f0c88ff89 SHA512 47de2791a4d4707fa17344de8fff8a15dd4436dd6e8c75adbd95273739cf5022e39a1024edee228eb27294e4f1f0b2a91110a1249b3d4fe64641cace051e4544
@@ -9,5 +10,6 @@ DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLA
 DIST s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz 198489 BLAKE2B 47ffced26f1cceb78c0137e31114e463f0f5ad15fdb47e6a2809080a7874ce484918a0527e97b33db98c4a0daa338712c1b1a8b4992ac47d96f4e3b7056ee5e8 SHA512 0f5b4a4eeb72a906c86dac74c1bb41f5d4756c58240f59403932e388e523bed7d841ffa1d18dfd87454ab8c60b33e74cef27aec93995e37539868148bbee9900
 DIST s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz 8013451 BLAKE2B 042ab804f4ec9babf7c975629fa3bd6856fb1fa4de0c4715420bca7e0f2dd72cc0909134750ba70c69344985bdd7a3a74576536cee80d6dfaf688c8cf82da8c0 SHA512 3339ced1fcca0fc9a37382d23c3c43f46c5e51d4c14b2657a79cd15dbd79ba8025bf8133dbbe45eb125b5c88370c90422faf21b65d95f471af3bb43de54a3210
 DIST s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz 98611 BLAKE2B 6187ab3109f1c9c20524752920e7b9f0e1de2c882bb09ce8c4d2d29899fbaf8a0e2627afc475f6c1527428d77e9a7a7c7332136ba5a79e33cad9c570fbc19042 SHA512 ba85c03cb3e857c501fcec0223ccb7dfccb99a961dd6594820640e133523f14275e764e196197ead05b739f490003b412e16ca2d0fcae8263ef4c256d252570a
-EBUILD s25rttr-0.9.0_pre20200723.ebuild 4573 BLAKE2B 39ddb5aae6ce13966cb459c1057199d472d721795503f0ea71feb8770eb02eb7047fd8a30ddc6d34e6d37a0e40755aac66dc11d0f3e1221ae3445c5923c3b1b3 SHA512 0680acd8cea4644015fca40b769de67da0a24e5bed86b94163e36c9226ac275b547aafd7f9408a4960666078a399fa909b37aeea6618e60f754d1f31793a3bd1
+EBUILD s25rttr-0.9.0_pre20200723-r100.ebuild 4749 BLAKE2B d9bc594b531fdb741d23b5bc033f6265d6051ac0e2d602231dbe4df369175a7d6fb697a1b2d5fe040f392b1dc58e35a8a426986afcac3d227fc3c2106d61b0af SHA512 f4418551f7e2f3963f73432b3f3d38cdb3418dfac17ce8b7e89a8ed0f549da0ab64f3a740c75224defc55a6ceb8bba52ecd3e2135addb323626d12e98d4a37ea
+EBUILD s25rttr-0.9.0_pre20200723.ebuild 4574 BLAKE2B e14c0ee7521e77e240e23796f0c9491175fd3117cba843acdc8050241eb6a8fc8a0d5e11aec1582aa1fd7cc5b433aa3caed6ee2d822dd3cf5c3039549bd9bc3a SHA512 69289d2ed4a0af9703c965e7798637c1437f996f0e9425b47de384dfcc2464bd91986d67686c509ab2ed198831d081c87063277877038f235733df58dd236680
 MISC metadata.xml 347 BLAKE2B ca0f64b6265a6a9297cd7fb42b007f8d822298f52630bcc6b25bbcdf3854514ea865d3f8407f0754b66a720028b5059962af993c889707fdda4419d445e8d4f1 SHA512 d2602cf6ae2637800c4b1d6448cf557998311ee0e24ac621c221d99fd21ae3bbd4a08963d8185d2afa6c1a63c2cf94f95bd893b7fbe01e9c777266850747ee62
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch
new file mode 100644
index 000000000000..07c8403ffe40
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/libs/libGamedata/CMakeLists.txt
++++ b/libs/libGamedata/CMakeLists.txt
+@@ -11,7 +11,7 @@
+ FILE(GLOB SOURCES_OTHER *.cpp *.h)
+ SOURCE_GROUP(other FILES ${SOURCES_OTHER})
+ 
+-find_package(Lua 5.1 REQUIRED)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ 
+ include(GatherDll)
+ gather_dll(Lua)
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
new file mode 100644
index 000000000000..001f1128ae10
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake
+
+DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)"
+HOMEPAGE="https://www.siedler25.org/"
+
+# To generate from git repo:
+# echo -e "COMMIT=\"$(git rev-parse HEAD)\"\nSRC_URI=\"\n\thttps://github.com/Return-To-The-Roots/s25client/archive/\${COMMIT}.tar.gz -> s25client-\${COMMIT}.tar.gz" && git submodule --quiet foreach --recursive 'url=$(git remote get-url origin); gh=${url#*github.com[:/]}; gh=${gh%.git}; echo -e "\thttps://github.com/${gh}/archive/${sha1}.tar.gz -> \${PN}-${gh##*/}-${sha1}.tar.gz"' | egrep -v "/(dev-tools|libsamplerate|s25update)/" | sort && echo '"'
+COMMIT="f0b97b120140c96bbeacae9c22633f899931db69"
+SRC_URI="
+	https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
+	https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> ${PN}-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz
+	https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> ${PN}-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz
+	https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> ${PN}-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz
+	https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> ${PN}-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz
+	https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> ${PN}-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz
+	https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> ${PN}-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz
+	https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> ${PN}-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz
+	https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> ${PN}-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz
+	https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> ${PN}-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz
+	https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> ${PN}-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
+"
+
+LICENSE="GPL-2+ GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	app-arch/bzip2
+	>=dev-libs/boost-1.73:0=[nls]
+	>=media-libs/libsamplerate-0.1.9
+	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
+	media-libs/libsndfile
+	media-libs/sdl2-mixer[vorbis,wav]
+	net-libs/miniupnpc
+	virtual/opengl
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( >=sys-devel/clang-5 )
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/s25client-${COMMIT}"
+
+# Build type is checked but blank is valid.
+CMAKE_BUILD_TYPE=
+
+src_unpack() {
+	default
+
+	local SRC DST
+	for SRC in */; do
+		case "${SRC}" in
+			s25client-*)
+				continue ;;
+			s25maps-*)
+				DST=data/RTTR/MAPS ;;
+			*)
+				DST=${SRC%-*}
+				DST=external/${DST,,} ;;
+		esac
+
+		rmdir "${S}/${DST}" || die
+		mv "${SRC}" "${S}/${DST}" || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		-DRTTR_BUILD_UPDATER=OFF
+		-DRTTR_ENABLE_OPTIMIZATIONS=OFF
+		-DRTTR_ENABLE_SANITIZERS=$(usex test)
+		-DRTTR_INCLUDE_DEVTOOLS=OFF
+		-DRTTR_LIBDIR="$(get_libdir)/${PN}"
+		-DRTTR_REVISION="${COMMIT}"
+		-DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON
+		-DRTTR_VERSION="${PV##*_pre}" # Tests expect a date.
+		-DLUA_VERSION=$(lua_get_version)
+	)
+
+	if use test && tc-is-gcc; then
+		# Work around libasan and libsandbox both wanting to be first.
+		append-ldflags -static-libasan
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	SDL_AUDIODRIVER=dummy \
+	SDL_VIDEODRIVER=dummy \
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	doicon -s 64 tools/release/debian/s25rttr.png
+	make_desktop_entry s25client "Return to the Roots"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version -r games-strategy/settlers-2-gold-data; then
+		elog "Install games-strategy/settlers-2-gold-data or manually copy the DATA"
+		elog "and GFX directories from original data files into"
+		elog "${EPREFIX}/usr/share/${PN}/S2."
+	fi
+}
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
index 7a08ac7c44c6..11d885fb4840 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
@@ -33,7 +33,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/bzip2
-	>=dev-lang/lua-5.1:=
+	>=dev-lang/lua-5.1:0=
 	>=dev-libs/boost-1.73:0=[nls]
 	>=media-libs/libsamplerate-0.1.9
 	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 3421201ac921..ff60f0ee5961 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -2,6 +2,6 @@ AUX widelands-0.20-boost-1.73.patch 854 BLAKE2B 2132909f12c366c3ddb21661a96d7131
 AUX widelands-0.20-glvnd.patch 780 BLAKE2B ec09d7624e9432e9adf339efc2ce0b094d7007834e34ed6be8620fa7e9ed91bd6c4963ea452e2e769abdd521d7f679c012a2f5c5ceee9ef9f7643af6b116ac5e SHA512 9c05d8744eeacc13ec84ffda49e055fe29420a4104e7628da3a0d1c0f4e4cc4740531879c7bd88b41cb5e7ef5827c132a33c795eefedd9a4718afc738b452f05
 AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
-EBUILD widelands-0.20-r1.ebuild 1672 BLAKE2B 2074826806e80b8c7de048d6919bf4e663e3e0c46c74bc62952cf60c88f698e5d0e6b1249492de66c35c29b0cfa71d9109a04c790301aab0abba259c8155caaa SHA512 58223c2563b901a0c134d4f149ae1224c9c9a6b83ed0477bfa73a19fc69250571b294a23864df98b7e75827b4c7841dcf8e6310646a418d51913bca62520e2cc
-EBUILD widelands-9999.ebuild 2148 BLAKE2B e9be419865610425b050b75ef2007bcfa2bbee1726b63abf2ef375950080646249e7db9e4b9c60dd0309a84ca83efd3a91f0b04618312689596a6f7681f05e29 SHA512 f85d3a81e91b94e60db0a8a6ccdb59cdd43b599a6bb8b0469089c5404f37bc15e960913c9456a60cb39f9fae7ae022d5484b3d5971c398e5559b0da16f740ef7
+EBUILD widelands-0.20-r1.ebuild 1656 BLAKE2B ecf68dba322894fc9e9acf65e11bd28af69c075757a5a4aae822ec7f68bace21076618badd67ea7c2efcce0230765741df3189eb163ca76ecf85c8d667574589 SHA512 e1da2854877aacf135c8fd37b43e45ad8dfd154d0e89d26341d107ebc1548cb9ae762a8a9056d8526ee3d2082815c300bc2eae7d977a6618d0c728df6c334663
+EBUILD widelands-9999.ebuild 2132 BLAKE2B ad52b806425b512be09dd8fd2cea623b647a7956a0ce944aaac6bf97813310023afd7c33740a0d009e0931c66043df177728cfb18776b5b84a67e7627f9dd054 SHA512 e62cb8eab5ace0e5113638dcf6541272144922e7b87d2fa92c97858d7ce86c8448e21d11d36fd00be9b1d076f8d62cd1d1b38a93f396997074c8103632b709bf
 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index c0629174bc75..c01f32953ab0 100644
--- a/games-strategy/widelands/widelands-0.20-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/lua:0
 "
 BDEPEND="
 	sys-devel/gettext
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 157430929194..33ade68e2d5c 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/lua:0
 "
 BDEPEND="
 	sys-devel/gettext