gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /games-strategy
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
26 files changed, 980 insertions, 241 deletions
diff --git a/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild b/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
new file mode 100644
index 000000000000..da5bd064e6ec
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="0ad"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/0ad/0ad"
+	ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+	MY_P="${MY_PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/"
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+else
+	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+fi
+
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
+	BDEPEND="~games-strategy/0ad-${PV}[nvtt]"
+else
+	BDEPEND=""
+fi
+DEPEND=""
+RDEPEND=""
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/${MY_PN}-${PV}"
+elif [[ ${PV} == *_pre* ]]; then
+	S="${WORKDIR}/${MY_PN}-${ZEROAD_GIT_REVISION}"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+src_prepare() {
+	default
+	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_compile() {
+	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
+		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
+		addpredict /proc/self/task
+
+		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
+		local archivebuild_input archivebuild_output mod_name
+		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
+			mod_name="${archivebuild_input##*/}"
+			archivebuild_output="archives/${mod_name}"
+
+			mkdir -p "${archivebuild_output}"
+
+			einfo 0ad -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
+			0ad -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
+
+			if [[ -f "${archivebuild_input}/mod.json" ]]; then
+				cp "${archivebuild_input}/mod.json" "${archivebuild_output}"
+			fi
+
+			rm -r "${archivebuild_input}" || die
+			mv "${archivebuild_output}" "${archivebuild_input}" || die
+		done
+
+		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
+		rm binaries/data/config/dev.cfg || die
+		rm -r binaries/data/mods/_test.* || die
+	fi
+}
+
+src_install() {
+	insinto /usr/share/0ad
+	doins -r binaries/data/{config,mods,tools}
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index db37dbffd173..02ffb6f5f449 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,5 +1,7 @@
 DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B 7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6 SHA512 9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
 DIST 0ad-0.0.23b-alpha-unix-data.tar.xz 691280800 BLAKE2B 9ee0a1c14adb4fa2a842ad734f67a40af60d063c2f1876a34c49e584017b3fc6894a6be7c6533f15031b118d8a88b40b223decdbc3b8ea95f912271ec56f3a90 SHA512 d0515e44f575737a06f27c75c0a58a5229ead474ae6d48531142015548e5986145f895f95e0fa9209cf9085c7c431f4179ff2e70c1a532f61d1cb62c0a91bcfc
+DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 EBUILD 0ad-data-0.0.23_alpha.ebuild 534 BLAKE2B 3517c0dc476b363aab702a25ef2bc4d19c2fd162b0c6c9ea41995b190215c8ff859d630700db8760cd80514d4197a4d4583cacf991d0b98118b755da1dc55e30 SHA512 d6d9d5de0fa84a76ca80d701de2e0d8340ac8990c83bd6238e66a180a02820112a3c1e20c2c75fa1e03b4fe4671cdde716092841bbe76c71db060b7ceb3452a3
 EBUILD 0ad-data-0.0.23b_alpha.ebuild 538 BLAKE2B 303bf1ae24712aedef68d8a36de3c1dea943c2e2651c00e0d689216a53eb9a6cacdd2f215de00d9b7244794871c77194407c00424196d3d825125cbf7efd61f6 SHA512 2d238e3ad08e750de3211ff76f54e91c098b044f1023ca8996553874fe4fa1550637ccfdc19f61bfef10658f132731565e3d87a6d58bd57733cd6aedfcc56cf2
+EBUILD 0ad-data-0.0.24_alpha_pre20210116040036.ebuild 2447 BLAKE2B 6ba03a5b971a1fc0d0b36c895bedf1c4cfdd5b7ab48339352c5e33bf1306be06338822cc1d849a7b1ac08fe07b21a7d845406807e0857e3aba6a5190c23ee634 SHA512 3dd973740c9438c10a7f98de3d1e55d5856d1905d3f3e49aa859224e288f7a970ddc35c9cdf7fa380eea32720e2accae779d1efdf3005d1b1e78897f74d2b724
 MISC metadata.xml 330 BLAKE2B 9f9fa8d997d33a71d11d118396fd718f8109e3e44410d5c8c2aeb54cc48b4c979e88922be7e5e9b0009e330b67ce85696fd747c52b2a23b51dc3e8d475c24254 SHA512 55b1c876bea472fc72321364ac95e97c950c675c68e9a32862eb6135b96f7bf7da5c0b787ddd28685b322a33c60dd51dafe1d382eb46e066a5cf8bd15fb5347f
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
new file mode 100644
index 000000000000..aff130d91e0c
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop toolchain-funcs wxwidgets xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/0ad/0ad"
+	ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+	MY_P="0ad-${PV/_/-}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+fi
+
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig
+	test? ( dev-lang/perl )"
+DEPEND="
+	>=dev-lang/spidermonkey-78.6:78
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libfmt:0=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )
+	nvtt? ( >=media-gfx/nvidia-texture-tools-2.1.0 )"
+
+RDEPEND="${DEPEND}"
+PDEPEND="~games-strategy/0ad-data-${PV}"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+)
+
+pkg_setup() {
+	use editor && setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	# Delete check for minor version of dev-lang/spidermonkey.
+	sed -e "/^#if MOZJS_MINOR_VERSION != [[:digit:]]\+$/,/^#endif$/d" -i source/scriptinterface/ScriptTypes.h || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-system-mozjs
+		--with-system-nvtt
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+	)
+
+	tc-export CC CXX
+
+	# stock premake5 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake5 || die
+	"${S}"/build/premake/premake5/bin/release/premake5 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake5/bin/release/premake5 \
+		--file="premake5.lua" \
+		--outpath="../workspaces/gcc/" \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake2 || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index daf32ddaecbc..d0e11109c948 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,7 +1,10 @@
 AUX 0ad-0.0.21_alpha-gentoo.patch 3905 BLAKE2B 265020af1e1df234d0932c6294e0cda9c0f48bc1b311d6770c8347431c17e5e99c68f4c52cf6e1277ffb2e57431a6c237d2dc4f452e563eb343b06f62ab1eede SHA512 592e9fdff6ef6d88efc9c4a5c856e41240845187cc4a4b3d9d6b5c616eb1f664fdf702b7b0a30cdfeedd6d87ac0fab913df477567b84d42e13d2cf2761cfdec8
 AUX 0ad-0.0.23b-header_includes_fix.patch 463 BLAKE2B 9148cd302596bd1d37df7d93e72794530cf38eadeb26af1a05dda96c9dfde5022e2346eb92d165b434d82450deee06d539c89855bcad6a41285e087fd3417904 SHA512 df4cbe5f8c00c2ec4539794dfa4904a129e4730ae109e7678d9e201370ea00a00b1352ebf1f9fba46fcf48f0a7f46de1ec51613aa58f56ecd4a0f5f051c0524f
+AUX 0ad-0.0.24_alpha_pre20210116040036-build.patch 5971 BLAKE2B 968ab7cbfa2b84312937c1f317e15ad9165fd951995dba90eef9b262448a066dc0403f0acf5fb4d40e372455b47d6b0f79c7a078601a8172d185e35463b383ed SHA512 391dc3c02184c9e67c21460833d19e386c0cb53c0bed663df531cc0efecfbe4b9a85c75b8ca682b2cd40891dd0719603108d96a21f8e5ba989fb0951713a1571
 DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
 DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1 SHA512 82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135
+DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc
 EBUILD 0ad-0.0.23b_alpha.ebuild 3467 BLAKE2B 567338478f564ebc53a299e132d47188c4db5d9bdea314d55539442ce1ca256dd4df5e50b24997a54aaf0dd9c3542a06a826830bf98833c7a49a9d3e37207ce7 SHA512 5b8198f364b87faa96adf108e252ea5d55d1e06f459b6c0e45901c737bb1cd1ca8c6ec1f08cea5dade892dd27d6572caad29249aed2ca15a3e421afed046ab79
+EBUILD 0ad-0.0.24_alpha_pre20210116040036.ebuild 3717 BLAKE2B c53555161dd6cf2d457361ac1379312712646788b248c949203bfc62ea0c5c60980939373dadf636ecc4fec15dd0620e839a3727fb7ea0b8acb745ac47f8f2e6 SHA512 336d69aef36a3a4cb0103310bd7b285bb90c71c75aafae0339b2f9b1ca4577571b75079f6e7d4c67ec3685b33a495f21c437592cdf272d1fcdedf09c09ee9504
 MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343
diff --git a/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch b/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch
new file mode 100644
index 000000000000..1e643adb41a9
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24_alpha_pre20210116040036-build.patch
@@ -0,0 +1,105 @@
+--- /build/premake/premake5/build/gmake2.bsd/Premake5.make
++++ /build/premake/premake5/build/gmake2.bsd/Premake5.make
+@@ -36,19 +36,19 @@
+ TARGET = $(TARGETDIR)/premake5
+ OBJDIR = obj/Release/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra
+-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector
++ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
++ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector
+ LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm
+ LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a
+-ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic
++ALL_LDFLAGS += $(LDFLAGS) -rdynamic
+ 
+ else ifeq ($(config),debug)
+ TARGETDIR = ../../bin/debug
+ TARGET = $(TARGETDIR)/premake5
+ OBJDIR = obj/Debug/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
+-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
++ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
++ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
+ LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm
+ LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a
+ ALL_LDFLAGS += $(LDFLAGS) -rdynamic
+--- /build/premake/premake5/build/gmake2.macosx/Premake5.make
++++ /build/premake/premake5/build/gmake2.macosx/Premake5.make
+@@ -45,8 +45,8 @@
+ TARGET = $(TARGETDIR)/premake5
+ OBJDIR = obj/Release/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_MACOSX
+-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra
+-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector
++ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
++ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector
+ LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline
+ LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a
+ 
+@@ -55,8 +55,8 @@
+ TARGET = $(TARGETDIR)/premake5
+ OBJDIR = obj/Debug/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_MACOSX
+-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
+-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
++ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
++ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
+ LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a -framework CoreServices -framework Foundation -framework Security -lreadline
+ LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a
+ 
+--- /build/premake/premake5/build/gmake2.unix/Premake5.make
++++ /build/premake/premake5/build/gmake2.unix/Premake5.make
+@@ -36,19 +36,19 @@
+ TARGET = $(TARGETDIR)/premake5
+ OBJDIR = obj/Release/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra
+-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra -fno-stack-protector
++ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
++ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra -fno-stack-protector
+ LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt
+ LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a
+-ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic
++ALL_LDFLAGS += $(LDFLAGS) -rdynamic
+ 
+ else ifeq ($(config),debug)
+ TARGETDIR = ../../bin/debug
+ TARGET = $(TARGETDIR)/premake5
+ OBJDIR = obj/Debug/Premake5
+ DEFINES += -DPREMAKE_COMPRESSION -DCURL_STATICLIB -DPREMAKE_CURL -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
+-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra
++ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
++ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Wall -Wextra
+ LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt
+ LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a
+ ALL_LDFLAGS += $(LDFLAGS) -rdynamic
+--- /build/premake/premake5/src/tools/gcc.lua
++++ /build/premake/premake5/src/tools/gcc.lua
+@@ -346,8 +346,7 @@
+ --
+ 
+ 	function gcc.ldsymbols(cfg)
+-		-- OS X has a bug, see http://lists.apple.com/archives/Darwin-dev/2006/Sep/msg00084.html
+-		return iif(table.contains(os.getSystemTags(cfg.system), "darwin"), "-Wl,-x", "-s")
++		return ""
+ 	end
+ 
+ 	gcc.ldflags = {
+--- /libraries/source/fcollada/src/Makefile
++++ /libraries/source/fcollada/src/Makefile
+@@ -9,9 +9,9 @@
+ 
+ CXX ?= g++
+ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
+-CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL
+-CXXFLAGS_TEST := -O0 -g -D_DEBUG
++CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
++CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
++CXXFLAGS_TEST := -D_DEBUG
+ LDFLAGS_TEST= -ldl
+ LIBS += `pkg-config libxml-2.0 --libs`
+ INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index d77b179fc620..fdd2ba7775ee 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest
index e1d5356c4f95..1a3764cd565b 100644
--- a/games-strategy/colobot-data/Manifest
+++ b/games-strategy/colobot-data/Manifest
@@ -1,4 +1,4 @@
 DIST colobot-gold-0.1.12-alpha.data.tar.gz 54732267 BLAKE2B 8cf36911764beb921e2b1009fd8550a1a146f594033cfc4de2d8587866780e22f060949735b03c2e355fab412c70c8557587f859edb86ca815ef249edc348926 SHA512 599cc72e1383826b5c840446f52f53b0f325b1de2ce08826bbd6b04072a51f1c4007b5683f2608dd7be67ab358ef2856e790bbbe5c73d8514141e3284be47508
 DIST colobot-music_ogg_0.1.12-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
-EBUILD colobot-data-0.1.12.ebuild 971 BLAKE2B cd5b060f5592cc6bd7b7198b5eef75e48bd3a4b58ea84032b5f8b41008ec8edbc59fd1dfba8f0158625878a90f9db4b4ea1af4198b39080d64639b3e9e255180 SHA512 c474f6bd469f497e3579362214a98fc88d84ee3a460f21bd53c410734e6318efa7cee8f59974dab616fb45753786d8f4078e08a36886cad94644de59653fdb7f
+EBUILD colobot-data-0.1.12.ebuild 1039 BLAKE2B c2658bd81072ded20b278b3ebc792a8d1802794f059685d0c14c0dd927df5627c1d2c403f3ed7af40a9435bde3dd54bc4b9b6060b6ba5be38b3bf67a64036ea5 SHA512 024503c4e1cc61569c16a69b67e9310afd9137a8b8816e408876912c3abbebe0d8cd0d48cd296d0e26552b5ca1a1a1cc57a4de56b1ea41532fe5d66745b33629
 MISC metadata.xml 396 BLAKE2B d99c9c0508c946e227c6fd3802a8c93594c1807b6b911aa77f2b19968a98fb2d1cefc81f332a260e52b16aa54e568368a88c7a5bb1b0097c8b3a43e6cd94498b SHA512 e7a8f625253c57cdd9a02b68a191adf58f28744a34049794d26a0fe217c1adf77a5260245ea11b1f96be358a74b01604cfe09f78e4ba3b2681f7427d9acb7ad2
diff --git a/games-strategy/colobot-data/colobot-data-0.1.12.ebuild b/games-strategy/colobot-data/colobot-data-0.1.12.ebuild
index 79e1a2927dc4..d63d0f6787bd 100644
--- a/games-strategy/colobot-data/colobot-data-0.1.12.ebuild
+++ b/games-strategy/colobot-data/colobot-data-0.1.12.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake python-any-r1
 
 MY_P=colobot-gold-${PV}-alpha
 MUSIC_P=colobot-music_ogg_${PV}-alpha
@@ -14,13 +15,14 @@ SRC_URI="
 	https://github.com/colobot/colobot-data/archive/${MY_P}.tar.gz -> ${MY_P}.data.tar.gz
 	music? (
 		https://colobot.info/files/music/${MUSIC_P}.tar.gz )"
+S=${WORKDIR}/${PN}-${MY_P}
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+music"
 
-S="${WORKDIR}/${PN}-${MY_P}"
+BDEPEND=${PYTHON_DEPS}
 
 src_unpack() {
 	unpack "${MY_P}.data.tar.gz"
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
index 8775822fa09d..4d5d8ae61f16 100644
--- a/games-strategy/ja2-stracciatella/Manifest
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -1,7 +1,95 @@
 AUX ja2-convert.sh 411 BLAKE2B 5b6f0682475d1cdacd914f9b0656e35608631e814ac54be81f19cfa39565e9d334499ec658095d3071fa2eb7c9200a81fe5650e4eea16a2077c86dd3edae2261 SHA512 478a8e94c10d69c18812a42fdc6766b77ef743793df38665677e9a878743a770a5565fed1a487e992ce0609d0fa371fb027ee55a9e01c32c283ad75f8a62c09d
 AUX ja2-stracciatella-0.12.1_p7072-gcc6.patch 526 BLAKE2B 22567919e68d467447befb3bb3a42bd64a80df24166375f0925d8d7237bb4471daa1a7a617a193ed9b3320c4fa1ae2bfd37116bc91aae0cb41fd5ca56abfa7f4 SHA512 15aabca2fc0e9d7cab0b4c7ed471eda8029e073250959f038a714eccbddddc1a0dc0aab54e7f45dd988347b52346386e90e75c29025698c9d7814c3fb10a5b1f
 AUX ja2-stracciatella-0.12.1_p7072-makefile.patch 3666 BLAKE2B 11c110649dce7650a315511edbff12036ad2a257d7d4c3d4da5a14a7d3ae0e9949fc2c8b5f435789a3090cf2a200f4b1d9e2175a1fa94466eaa6e1c209bfcee7 SHA512 07cd2f1367bd9dbad9bc6ec3d633fc77bf337dddf69d69da7c297722c1684c9c80e88b918b89dc2e02e83160b224cf7b22f6e21fce2de525ee480a513c64cd99
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
+DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
+DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST caseless-0.2.1.crate 18826 BLAKE2B 3286cc4657e66f66d55981fbe38079cbe67924b05ae8bef70f191705f2348ecec495fe5556c0476292c39b2e3066eb7029b11ac55f10f9de6de71e7dbe0563bf SHA512 4d1d059225a8f4b8d5503ff619b1d9714cdfb6b326e3275045a9175449888836568aca1163961c81daf7f1f664f2dc2664c84cc31555b995131fd4fbd7425bea
+DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
+DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
+DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
+DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e9788fa546ac75ef449b298ff55cb20871cc00ff075814ee3c20924ce890fdf455c607313b9fd07252b576777bfc1713 SHA512 9a6cf2cda3a76f3efe30290413bf3cd539406039d29f42e06326822fcd32aed3dbdfcfddccdc5871b824951653836a8943e0d771c261fcf7878a8526927b5ca7
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
+DIST dunce-1.0.0.crate 5167 BLAKE2B 17bab325b025e06cb7c0c8eb704e4204e3080281f2603a5e5b1c4dd07f7045de875dd48a1a176b88a010824e738e372699effc6ced7e866481a6dbb173c51471 SHA512 2ef42f8be790e890342e8ae49e3bd7d71f48dfe337b89d1315469b3f3c1493069f62cd25b1953bef29f65e41e0ee893500d7d24253d0a6a735ce7ae32dc1ddc6
 DIST editor.slf.gz 134265 BLAKE2B 0a379a2340ad717b2be913eb7368a73232a231e7cf2753f2569bfe3027f51e5e4b8aac8cb15982b6d46161529054c3f15ae11849faae42ed34c8d4dbb4aa52c3 SHA512 243e3bf5e7298c3a71b330985f5c4d4df3e4cb43df32c823d835353d6309a64f62679c3d0634ca162f6484f7cbf366627e57b1d967188c13940db8933a5f03f2
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST hermit-abi-0.1.10.crate 9127 BLAKE2B 59582bd4f7ec1dc38b3df7df0ce77c6161a24666df6d913037f310bb159928b715d338e6938af677b0520c7185f839e04472915e18dc9eefc1775bd293c6ea6b SHA512 daae9d78f2657b4d7754b1f95144be8c23c4b607058e53fd2f5d81d5fb13ba7c55dfd9839765ea90141277e0844120110708ec4913d224dd29de957009d65194
+DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
+DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST ja2-stracciatella-0.12.1_p7072.tar.xz 2118832 BLAKE2B 229cd30891216ba305f8b81764b57edf4179bb09a783d2619242c6e3cbeb29f131cb1901934364d952b54796c8398985a54cbf465d36f737c438958c145dcdb1 SHA512 9269c9e2e179d705b6d83dfac56c604eaefbe5bffe5c16e3f26c1209d3842bbac22db19362e51acf0c6602d64a283d2ec4fa19b0f37d1cddfb013f686c936411
+DIST ja2-stracciatella-0.17.0-editor.slf 563450 BLAKE2B 388b798efc2e6169ff0fee4c4baf0baa9c347c578a0cf15b932bfc9fd25db21da3c958c606f528f38c4d780200bb3b9e8a0a72649a03f3d7532fde499306dcde SHA512 7a177343f407dbd204586d029c04fa16b9418f27fba414fb0f3eba09dc879e628a4e0822cf53a7cae1a8efe13342392f77381b9e5be1b1933ea10ad9e4e2971b
+DIST ja2-stracciatella-0.17.0.tar.gz 22101197 BLAKE2B 165e3bc76bde65f8d72e45dd90f842b683353208f7796580d8bdbcfe65df921964ab07029750be1865f549c6d4012aafaeecb4c46bf3475f8e47cfaf48bd2f36 SHA512 a83a0346c5e4ff5e1e2b1a5a44d87376930b6b52a25746e14e496e5323555a4c1ce504b7a83e621775f39b955492b45083a459e7a1e5e892ca34b387ac500b0c
+DIST json_comments-0.2.0.crate 7272 BLAKE2B dfff442aba212c139340a447abe18273add4838cb11c471db73532273dcc3309c59ef9f00f773944297da9130d466b736aadc2078aed413d47ca3973a52b3a30 SHA512 da13a4849503bb1efa9d18a5d9d327f972d692b384738d6e8c36a2af832129a0ecfc59ce5352199e03b9dbb387582ae08a6a8ecdc4ab42a1c0c34a3534b85e0e
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST md-5-0.8.0.crate 13122 BLAKE2B cb74805b5b939e4261deb85de94b57ca0b64da03214221437f099dab2c49b1b4c2b1f2a6a8cfe7ea3047d4df41ca9117ff885516de06de298ff4ca416fcc5137 SHA512 f0baae0ede1dddb9be047f8d776fda2819980ece24e86da9d7bc4828308e53c4fa82597d416912ca115e75019518839a8edc076ba1e43686b0023aa559838a28
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memoffset-0.5.4.crate 6927 BLAKE2B 0563c8182c5242b8396292bc6b8f7daf27bfca5a9057fca6854e1329e76c94be6c1e9d7d25aecb09c8140cb9bede4bcf224311a37e9e730149f8b0265e1eccd3 SHA512 5f8f6a0f12af165a98e6401a694ae35fe5ed21865d6f25d95b64c363304841ef05ad0800dc841477fbf85080975d49a5a182964d6240c182b9d55ef3b5877a49
+DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
+DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
+DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
+DIST proc-macro2-1.0.10.crate 35622 BLAKE2B ebd141862796e8f0660608ef884ace446fa5158ed1a3f3491f5e5d4ab6b866f19652fe6ccce4432b3bcdbe5467d0a59af688c00fb97249045bf5a2bb5511f2f6 SHA512 a40e6422c26cb8171e5f2d9d7d3b4b2d99a444ff650a8dd8e22bbc7103bf3f9247fc2b2b57ff7da4ce65fb1d293f55c5ef56a5f60ecb5122991d9d2002395eef
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
+DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
+DIST regex-1.3.6.crate 235465 BLAKE2B 18c6fa529f82fc9ea874605bdfb8d0306a22c88bd74a2473f3cf71b8df46b63133a0a9d3f7401b53a85ceecb6f3eda1d5d37ce5982d7d8e8b6cfa1c6206cfc5a SHA512 05dbc0f355bd1f3ee659a8ff888b37242f780500b76d153a100c21c12278db2429ccdd47f8dc182c708dd70d47fcfd5acd6eefb397c03e08cbdff701f6346628
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
+DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
+DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
+DIST serde_json-1.0.50.crate 72229 BLAKE2B dcf9ea24386a103f5b5ccc3e9eb3f0c3a083cb46f795b2ffc2da1fcc1d965c56885a417a64c3ad15c58aa79225f4f89895b90b56048cb9e1ee22bac15c296e84 SHA512 e1ca850d059a357ea9de29fed42b3945701b2b130a6b40e708b926088501652c8426e272ff754534f972f68dbb8845583df7e0887de139304245aefecce7388d
+DIST simplelog-0.6.0.crate 14396 BLAKE2B 9068e4843c0a6ca0c3f11be25510a3f0c9d649ace5414cf460c50169ba602cb4325bd814be2aff2bf93f1bcc573717cc814c6275cd700d6a2a64c1016d76f319 SHA512 81d41c2e7ce108ba8f13390a7cf0f5361b9f6a5b3ccb6be045069ab533b9fad295ac6026950341a9f1274491f87edd25340b14ad79611745ec6eed7a1b2c9c98
+DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
+DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2113 BLAKE2B d576c681712e3d5c29aaf038a19fdc430a84fe934446a6ee0e54ce9b1a40321c60b6df8e6d478e3f04b49da3825d96dfa8417a5c8da2b2f82a479b1549977d5f SHA512 8a825972f55db374c65e3be2d07f3ea6ee89545f84028740040cef915c6e76efbd95fa83d20044aa180c19f8128963b1830890e896e7e5f45254c53e65c88880
-MISC metadata.xml 402 BLAKE2B 4329f4f00399517a6c54e94930d5ecaebd78d2321fb479f3de4faf42783ea8c3e081fca8b16e129d6351fc6e2d5e47b17273198ea1da851578dfa59091900736 SHA512 7f56ace0297b3af4c5d4f386428d9341bb7ca462370abf4c8b4814fce550b724f40f97d876b350ab8b1dd8f0c6916e20ca90a32de07d400739bfa40e004d1dbf
+EBUILD ja2-stracciatella-0.17.0.ebuild 4057 BLAKE2B f0599252f9298491c552be117856191c77e4089e7a0b1aa01ccae27bce0b1d3a71d94e81ac1f6ba27a0bd88ea4df66c1edff650f01e931ad72322bea20ee57cf SHA512 e55ef6a7586ee468db06caa227eebab6092f6996fa33729df72c6ab41947da5674ae0013202e2232e4df9771264778927b4ce8a4365bc1fe3b4c26c427d119f0
+MISC metadata.xml 616 BLAKE2B 4ef2302ab9784b362b425ed93bcd46be22759a12278aa55560acce275a93fef62411a22019e9bf9f4f2b1fc65d3f61efe57ff9571559362c48a55041a8b9c4a5 SHA512 bb83dae139f680080f1efcf784ed535a21c995226373aed5074313d00d85a79f8f41075eac7025a76264ed36be0a1b7c205dc1efb1f5b311100c9a667706ec84
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
new file mode 100644
index 000000000000..47d0a6964c2b
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.10
+ansi_term-0.11.0
+arrayref-0.3.6
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.0
+base64-0.11.0
+bitflags-1.2.1
+blake2b_simd-0.5.10
+block-buffer-0.7.3
+block-padding-0.1.5
+byte-tools-0.3.1
+byteorder-1.3.4
+caseless-0.2.1
+cbindgen-0.13.2
+cfg-if-0.1.10
+chrono-0.4.11
+clap-2.33.0
+constant_time_eq-0.1.5
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+digest-0.8.1
+dirs-1.0.5
+dunce-1.0.0
+either-1.5.3
+generic-array-0.12.3
+getopts-0.2.21
+getrandom-0.1.14
+hermit-abi-0.1.10
+hex-0.3.2
+indexmap-1.3.2
+itoa-0.4.5
+json_comments-0.2.0
+lazy_static-1.4.0
+libc-0.2.68
+log-0.4.8
+maybe-uninit-2.0.0
+md-5-0.8.0
+memchr-2.3.3
+memoffset-0.5.4
+num-integer-0.1.42
+num-traits-0.2.11
+num_cpus-1.12.0
+opaque-debug-0.2.3
+ppv-lite86-0.2.6
+proc-macro2-1.0.10
+quote-1.0.3
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rayon-1.3.0
+rayon-core-1.7.0
+redox_syscall-0.1.56
+redox_users-0.3.4
+regex-1.3.6
+regex-syntax-0.6.17
+remove_dir_all-0.5.2
+rust-argon2-0.7.0
+ryu-1.0.3
+scopeguard-1.1.0
+serde-1.0.105
+serde_derive-1.0.105
+serde_json-1.0.50
+simplelog-0.6.0
+smallvec-1.2.0
+strsim-0.8.0
+syn-1.0.17
+tempfile-3.1.0
+term-0.5.2
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.42
+toml-0.5.6
+typenum-1.11.2
+unicode-normalization-0.1.12
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo cmake xdg
+
+DESCRIPTION="An improved, cross-platform, stable Jagged Alliance 2 runtime"
+HOMEPAGE="https://github.com/ja2-stracciatella/"
+SRC_URI="https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	editor? ( https://github.com/ja2-stracciatella/free-ja2-resources/releases/download/v1/editor.slf -> ${P}-editor.slf )
+"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+
+LICENSE="public-domain SFI-SCLA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cdinstall editor ru-gold test"
+# Run with ja2 --unittest
+# Needs data files?
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/libsdl2[X,sound,video]
+	!~media-libs/libsdl2-2.0.6
+	>=virtual/rust-1.40.0
+	>=x11-libs/fltk-1.3.5[opengl]
+	>=dev-cpp/string-theory-3.1
+	>=dev-games/libsmacker-1.1.1
+	>=dev-libs/rapidjson-1.1.0
+"
+RDEPEND="
+	${DEPEND}
+	cdinstall? ( games-strategy/ja2-stracciatella-data )
+"
+DEPEND+="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )"
+
+LANGS="l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru"
+
+IUSE="$IUSE $LANGS"
+REQUIRED_USE="^^ ( ${LANGS//+/} )"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+		local mycmakeargs=()
+
+		case ${L10N} in
+			de) mycmakeargs+=" -DLNG=GERMAN" ;;
+			nl) mycmakeargs+=" -DLNG=DUTCH" ;;
+			fr) mycmakeargs+=" -DLNG=FRENCH" ;;
+			it) mycmakeargs+=" -DLNG=ITALIAN" ;;
+			pl) mycmakeargs+=" -DLNG=POLISH" ;;
+			ru) mycmakeargs+=" -DLNG=$(usex ru-gold RUSSIAN_GOLD RUSSIAN)" ;;
+			en) mycmakeargs+=" -DLNG=ENGLISH" ;;
+			*) die "no language selected in L10N" ;;
+		esac
+		elog "Chosen language is ${mycmakeargs# -DLNG=}"
+
+		mycmakeargs+=(
+			-DLOCAL_GTEST_LIB=OFF
+			-DLOCAL_RAPIDJSON_LIB=OFF
+			-DLOCAL_STRING_THEORY_LIB=OFF
+			-DWITH_UNITTESTS=$(usex test)
+			-DWITH_RUST_BINARIES=OFF
+			-DBUILD_LAUNCHER=OFF
+			-DOPENGL_GL_PREFERENCE=GLVND
+			-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+			-DEXTRA_DATA_DIR="${EPREFIX}/usr/share/ja2"
+		)
+
+		cargo_gen_config
+		cmake_src_configure
+}
+
+src_install() {
+	if use editor; then
+		insinto /usr/share/ja2
+		doins "${DISTDIR}/${P}-editor.slf"
+		dosym "${P}-editor.slf" "/usr/share/ja2/editor.slf"
+	fi
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	elog "You need ja2 in the chosen language, otherwise set it in package.use!"
+
+	if ! use cdinstall ; then
+		elog "You need to copy all files from the Data directory of"
+		elog "Jagged Alliance 2 installation to"
+		elog "e.g. /opt/ja2/data and set game_dir in .ja2/ja2.json"
+		elog "accordingly."
+		elog "Make sure the filenames are lowercase."
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml
index 3db7ad1de988..c81c8236528b 100644
--- a/games-strategy/ja2-stracciatella/metadata.xml
+++ b/games-strategy/ja2-stracciatella/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>misanthropos@gmx.net</email>
+		<name>Richard Fröhning</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
@@ -9,4 +13,7 @@
 		<flag name="editor">Adds necessary file to run the editor</flag>
 		<flag name="ru-gold">Support for russian gold ja2 version</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ja2-stracciatella/ja2-stracciatella</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
index 459e98f969bd..5114b65f724a 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,4 +1,5 @@
 DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
+DIST megaglest-data-3.13.0.tar.xz 291190184 BLAKE2B 369dfb2f9a0271c686b77b4368043717b57e5863f8918afe3cc429c630ed79173c025ad0c5bad1e94949f4caf841b0e3c6706491a8534b829568c7d89ba97383 SHA512 ac6a6dd85ec2e45d3107549199251b504f128b8fc254b683c7d9c0841b86cd4c32cd45c9d3cbddc3f989bd965d61ef5a0dca9212431876c00a13f8398ff45f4c
 EBUILD megaglest-data-3.11.1-r1.ebuild 622 BLAKE2B 8442d613c7bb399394dfc2eb4b8113ee6677c417e2cb8b87283633f3ef9c2a91b3ac8bc1e9ca6191a4abf62896d0c54d95e1e99cd1d91dd07cb8305da9d366a5 SHA512 cc45ffc465d32cd741625e19d0bb5b273899ff1c3c95b3c9ad8b6635b43116ded4e101f6900b7b1f831577f91ade69b427182579d085f78399b0764cab21cebc
-EBUILD megaglest-data-3.11.1.ebuild 976 BLAKE2B 0c2891e67a8bf8c464b40edddf0a4982813d51b7be94395fbdd5730236dad55b97182608ddc7dadf09df382214d2b17e518d6b7bccbf796fefea7de89337649f SHA512 cbc1bd54a07b22776d0f49388ec43f2cb94fc8d47b04ded079c511d5c87c3f0fd8f38a37cae2ba32652085c6716610084125309a12e24297c22c6b1443a2a7b1
+EBUILD megaglest-data-3.13.0.ebuild 779 BLAKE2B ae8ac8a8822e1703b935aacb47cec4bb08cf66719b22127af704436cf63fe681f2a38e2c7b2d2123f2edbfda231d1cebfc80c0d2ac454aee1f12443c51a03159 SHA512 b62c989b67d33fbf489a4683f875dbf2db63fa0df09f1b4621992513763ed32042e6b251a70f562f7656c0ea6e9adf37ad1a7faa51a4ecdf256ecf778443bd77
 MISC metadata.xml 342 BLAKE2B 3e1f532ee136e71fe0c923694e49cedfdce563f052f0e1a48bad9086fa511ffdef728107969738251cb13fe8df360270df227d1b7dec383110564f5cad54ab1e SHA512 6ae571607c0fefd0ff846ea1f9946d1e5de8a208494b71474f2c46495beb4d306edc37d7ed754305c6e325e7b7306f13f3e78010235bef1c97873cf01de519fe
diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
index c10fa689e223..b96462b4fb9e 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils games
+EAPI=7
+inherit cmake
 
 MY_PN="megaglest"
 DESCRIPTION="Data files for the cross-platform 3D realtime strategy game MegaGlest"
-HOMEPAGE="http://www.megaglest.org/"
+HOMEPAGE="https://www.megaglest.org/"
 SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz"
 
 LICENSE="CC-BY-SA-3.0"
@@ -16,27 +16,17 @@ IUSE="doc"
 
 DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
 
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
+	# See bug https://bugs.gentoo.org/709450.
 	local mycmakeargs=(
-		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
-		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${MY_PN}"
-		-DMEGAGLEST_ICON_INSTALL_PATH="/usr/share/pixmaps"
+		-DMEGAGLEST_APPDATA_INSTALL_PATH=/usr/metainfo
 	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
+	cmake_src_configure
 }
 
 src_install() {
 	use doc && HTML_DOCS="docs/glest_factions/"
-	cmake-utils_src_install
-	prepgamesdirs
+	cmake_src_install
 }
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index e5149ff6d779..c9b8f5ee62b5 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -4,6 +4,7 @@ AUX megaglest-3.11.1-miniupnpc-api-version-16.patch 1334 BLAKE2B ae9ad1641d8624c
 AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385d9adc5066873e2ff220eed0344752405019abb13a7dfd0ade027dedd7064e65cf4d6e0509b44986aa5692d7af73b701f7f SHA512 62bf0ff8fa167cecae9f7bf65e5295d609afcdb9fdcb3bf502366eb775fa8d3d39c12001d320a9dc42e12075004c86b7d118eb517d6a57473e03aa26944f8bd4
 AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5
 DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
-EBUILD megaglest-3.11.1-r1.ebuild 4699 BLAKE2B 61d0354bc5ea224efd01e1cae93312bdb5a4c56c9c52d1d05e80e81c827656db4d6039ba4421f12515e63c596e792c1c6286376c3ae4bc40c1f77079156556c6 SHA512 30c0e8a47a8a43a7e8089e528d1ec14f4d99571eb7e6b8f1b05089fec3bffe54831ef55fec66d39216913054a86d4a94eefd791c60ed7add516b599345a9c432
-EBUILD megaglest-3.11.1-r100.ebuild 4343 BLAKE2B b5f09ea8ff4df54396428a1d605b9191cfae81e10bce35c707763b2e39dd94db78d1e363f77bb1e7bf8f0a1d111d67e3323825fe30adde1e650f728b34f24160 SHA512 5bbb1f2ebe9dd128c8c33a629914f1748b9a522b91de0cbcf5c3cb386358b6849b3c9b17fa6fee2a0aea94ea15a84b5d605788abc8d0d85f2509102249d9c2f2
+DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153 SHA512 5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c
+EBUILD megaglest-3.11.1-r100.ebuild 3988 BLAKE2B d55b7b4f230a9f5bbcda78c673757d4fb02efc24b17ba9afc4d3956f1b136f2689247810a91665525ab4f9b9629fbbeca642e9c24c4cbd74c257c5bc63f564ea SHA512 9f318046640d0f45701e635a664cc35b3fb1e1b987409aaf908b64c6cc241bbecd153df3fe7497e4a676fcf242a0f6b912e1a0eeda454028f6bf33318b2e60b6
+EBUILD megaglest-3.13.0.ebuild 3661 BLAKE2B d1b2872064d89ad7460ea3c31b3681c3b6f6e9738cacd382749d36b9cabbe32298f831cbe7982d164d1820c85758da0fd94e08001daa97a09201f405ecaf7474 SHA512 e989a36ffbd52dcf6f7ca7e7dec4bcb263b782cfbafc986b410dcb2b04207e292e81710b217c1e42cfcb0b638a7181a3a27caad0f2d145ed5361055c8a75646a
 MISC metadata.xml 1621 BLAKE2B c8cbe108c70355825dfc84d74a64380ca7fd84b335abee058738e2139f00a25c3e79f6a7a3faa0da5cd06051809315ef482cf661ab29bac7f1254f41abdab8fc SHA512 b2bb0fc5043314a798b697ca6e337b7b4896475502c14c0e31ebf8b9d56e6629ef8c4dded03338b1ec7669db5a3ab84021177893dae2e0fae9d661d1f27216d1
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
deleted file mode 100644
index 86e78fb0535d..000000000000
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2010-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# google-breakpad
-# TODO: fribidi, libvorbis static
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
-
-DESCRIPTION="Cross-platform 3D realtime strategy game"
-HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"
-SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
-
-LICENSE="GPL-3 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
-
-# Newer versions of megaglest-data install directly into /usr
-RDEPEND="
-	~games-strategy/${PN}-data-${PV}
-	<games-strategy/${PN}-data-3.11.1-r1
-	>=dev-lang/lua-5.1:0
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libsdl[X,sound,joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/gnutls
-	sys-libs/zlib
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:3.0[X,opengl] )
-	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:3.0[X] )
-	!static? (
-		dev-libs/xerces-c[icu]
-		media-libs/ftgl
-		media-libs/glew
-		media-libs/libpng:0
-		net-libs/libircclient
-		>=net-libs/miniupnpc-1.8
-		net-misc/curl
-		virtual/jpeg:0
-		)
-	videos? ( media-video/vlc )"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig
-	editor? ( ${VIRTUALX_DEPEND} )
-	model-viewer? ( ${VIRTUALX_DEPEND} )
-	static? (
-		dev-libs/icu[static-libs]
-		dev-libs/xerces-c[icu,static-libs]
-		media-libs/ftgl[static-libs]
-		media-libs/glew[static-libs]
-		media-libs/libpng:0[static-libs]
-		net-libs/libircclient[static-libs]
-		net-libs/miniupnpc[static-libs]
-		net-misc/curl[static-libs]
-		virtual/jpeg:0[static-libs]
-	)"
-
-src_prepare() {
-	if use editor || use model-viewer ; then
-		WX_GTK_VER="3.0"
-		need-wxwidgets unicode
-	fi
-
-	epatch "${FILESDIR}"/${P}-static-build.patch \
-		"${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-miniupnpc.patch \
-		"${FILESDIR}"/${P}-miniupnpc-api-version-16.patch
-}
-
-src_configure() {
-	if use cpu_flags_x86_sse3; then
-		SSE=3
-	elif use cpu_flags_x86_sse2; then
-		SSE=2
-	elif use cpu_flags_x86_sse; then
-		SSE=1
-	else
-		SSE=0
-	fi
-
-	local mycmakeargs=(
-		$(cmake-utils_use_enable fribidi FRIBIDI)
-		$(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR)
-		$(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS)
-		$(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
-		$(cmake-utils_use_with videos VLC)
-		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
-		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
-		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
-		# icons are used at runtime, wrong default location share/pixmaps
-		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
-		-DUSE_FTGL=ON
-		$(cmake-utils_use_want static STATIC_LIBS)
-		$(cmake-utils_use_want streflop STREFLOP)
-		-DWANT_SVN_STAMP=off
-		$(cmake-utils_use static wxWidgets_USE_STATIC)
-		$(cmake-utils_use unicode wxWidgets_USE_UNICODE)
-		$(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL)
-
-		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
-	)
-
-	# support CMAKE_BUILD_TYPE=Gentoo
-	append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	if use editor || use model-viewer; then
-		# work around parallel make issues - bug #561380
-		MAKEOPTS="-j1 ${MAKEOPTS}" \
-			VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
-	else
-		cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	# rebuilds some targets randomly without fast option
-	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
-
-	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
-	doicon -s 48 ${PN}.png
-
-	use editor &&
-		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
-	use model-viewer &&
-		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	einfo
-	elog 'Note about Configuration:'
-	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
-	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
-	elog 'values in these files.'
-	elog
-	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
-	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
-	elog 'Some graphics cards may require setting Max Lights to 1.'
-	einfo
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
index 796b7822f5ec..d19c6ffd579d 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # google-breakpad
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/m
 LICENSE="GPL-3 BitstreamVera"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -46,29 +46,16 @@ RDEPEND="${LUA_DEPS}
 	editor? ( x11-libs/wxGTK:3.0[X,opengl] )
 	fribidi? ( dev-libs/fribidi )
 	model-viewer? ( x11-libs/wxGTK:3.0[X] )
-	!static? (
-		dev-libs/xerces-c[icu]
-		media-libs/ftgl
-		media-libs/glew
-		media-libs/libpng:0
-		net-libs/libircclient
-		>=net-libs/miniupnpc-1.8
-		net-misc/curl
-		virtual/jpeg:0
-		)
+	dev-libs/xerces-c[icu]
+	media-libs/ftgl
+	media-libs/glew:=
+	media-libs/libpng:0
+	net-libs/libircclient
+	>=net-libs/miniupnpc-1.8:=
+	net-misc/curl
+	virtual/jpeg:0
 	videos? ( media-video/vlc )"
-DEPEND="${RDEPEND}
-	static? (
-		dev-libs/icu[static-libs]
-		dev-libs/xerces-c[icu,static-libs]
-		media-libs/ftgl[static-libs]
-		media-libs/glew[static-libs]
-		media-libs/libpng:0[static-libs]
-		net-libs/libircclient[static-libs]
-		net-libs/miniupnpc[static-libs]
-		net-misc/curl[static-libs]
-		virtual/jpeg:0[static-libs]
-	)"
+DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/help2man
 	virtual/pkgconfig
 	editor? ( ${VIRTUALX_DEPEND} )
@@ -110,10 +97,10 @@ src_configure() {
 		-DFORCE_LUA_VERSION="$(lua_get_version)"
 		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
 		-DUSE_FTGL=ON
-		-DWANT_STATIC_LIBS=$(usex static)
+		-DWANT_STATIC_LIBS=OFF
 		-DWANT_STREFLOP=$(usex streflop)
 		-DWITH_VLC=$(usex videos)
-		-DwxWidgets_USE_STATIC=$(usex static)
+		-DwxWidgets_USE_STATIC=OFF
 		-DwxWidgets_USE_UNICODE=$(usex unicode)
 		-DwxWidgets_USE_UNIVERSAL=$(usex wxuniversal)
 
diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild b/games-strategy/megaglest/megaglest-3.13.0.ebuild
new file mode 100644
index 000000000000..9b8867d2938c
--- /dev/null
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2010-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Todo: google-breakpad?
+
+EAPI=7
+
+# src_install() currently requires this
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+LUA_COMPAT=( lua5-{1..2} )
+
+# Only needed by certain features
+VIRTUALX_REQUIRED="manual"
+
+inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
+
+DESCRIPTION="Cross-platform 3D realtime strategy game"
+HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"
+SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
+
+LICENSE="GPL-3 BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	~games-strategy/${PN}-data-${PV}
+	dev-libs/libxml2
+	dev-libs/xerces-c[icu]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/ftgl
+	media-libs/glew:=
+	net-libs/libircclient
+	media-libs/libpng:0
+	media-libs/libsdl2[X,sound,joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/gnutls:=
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	virtual/jpeg:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+	fribidi? ( dev-libs/fribidi )
+	model-viewer? ( x11-libs/wxGTK:3.0-gtk3[X] )
+	videos? ( media-video/vlc )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="sys-apps/help2man
+	virtual/pkgconfig
+	editor? ( ${VIRTUALX_DEPEND} )
+	model-viewer? ( ${VIRTUALX_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.11.1-cmake-lua.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use editor || use model-viewer ; then
+		WX_GTK_VER="3.0"
+		setup-wxwidgets
+	fi
+}
+
+src_configure() {
+	# See https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+	append-cflags -fcommon
+
+	if use cpu_flags_x86_sse3; then
+		SSE=3
+	elif use cpu_flags_x86_sse2; then
+		SSE=2
+	elif use cpu_flags_x86_sse; then
+		SSE=1
+	else
+		SSE=0
+	fi
+
+	local mycmakeargs=(
+		-DWANT_USE_FriBiDi="$(usex fribidi)"
+		-DBUILD_MEGAGLEST_MAP_EDITOR="$(usex editor)"
+		-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS="$(usex tools)"
+		-DBUILD_MEGAGLEST_MODEL_VIEWER="$(usex model-viewer)"
+		-DWANT_USE_VLC="$(usex videos)"
+		-DFORCE_LUA_VERSION="$(lua_get_version)"
+		-DFORCE_MAX_SSE_LEVEL="${SSE}"
+		-DWANT_USE_FTGL=ON
+		-DWANT_STATIC_LIBS=OFF
+		-DWANT_USE_STREFLOP="$(usex streflop)"
+		-DwxWidgets_USE_STATIC=OFF
+		-DwxWidgets_USE_UNICODE="$(usex unicode)"
+		-DwxWidgets_USE_UNIVERSAL="$(usex wxuniversal)"
+
+		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	# rebuilds some targets randomly without fast option
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
+
+	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
+
+	use editor &&
+		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
+	use model-viewer &&
+		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
+}
+
+pkg_postinst() {
+	einfo
+	elog 'Note about Configuration:'
+	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
+	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
+	elog 'values in these files.'
+	elog
+	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
+	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
+	elog 'Some graphics cards may require setting Max Lights to 1.'
+	einfo
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index ad386f6882fc..219444602f9e 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -3,6 +3,6 @@ DIST naev-0.7.0-ndata.zip 319608404 BLAKE2B e6edd79282171d4b327d220b33af37720e09
 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
-EBUILD naev-0.7.0-r100.ebuild 1743 BLAKE2B 326278a4ad061cc00c8165271880e1b7e292404de08b571530bcd929c0ed339145cbbc68a155de23e774ebaa798246c113d488f91a57efbe3bf9091a5f509ddb SHA512 1cb9c86dd7ceae36b2cbfd6de5c9620f6455b6a13a4b184fc91918bda8a8935aa5511fed8e5182fe59e5ca9581306959d2f3a39dfb710ddb652a3ee9ccb2524f
-EBUILD naev-0.7.0.ebuild 1631 BLAKE2B 95c08ea170079af3ffd36455a09805b3de649137a90abe6d26743abf4d966cbc2a83728cbdc30300659655bb08589ead539b3e30a3d81feb40ef7dcbab8b3dd3 SHA512 cdc0fbe5403874eac22ac2d5cdd3fa0d266edf54049ddf498b33158cc75f4f217af129804fa7cb81fc9c93c01a16e9c86c2a3aabf6a5c63bf7f9163c73318a59
+EBUILD naev-0.7.0-r100.ebuild 1762 BLAKE2B a12a17eb355d9eee407e8d7f7ad67336f7d7fe67c91a1172edce75bc4f02f82ca617648690a66c3355306c89fec00824f367a1dd495da42cdb263ba5ffbfad63 SHA512 4999ea6b00f059bc257c5c2e13201cf2ad6f02e55d1b36251b2010ecb9b3739f493d333f231506317e1b719d2517541e089248ad3dfc088b78c1820530ed2ac5
+EBUILD naev-0.7.0.ebuild 1650 BLAKE2B 8860b084a795490592ad44c2eaaab6fc2b773cae609828eff1ec69bde8bc487df8c39ec8fde88a69e46e8fb921e3dff81eed2494eb10e08f3acf07a5267016c1 SHA512 94eb6478deaf3cadf04c6ee06cb63e9bca0dee9dd51e07db93f5f399cf000b98cbb12df70d62d52e3df5a729046bc823ff98f705025ca48530af7d49a31a4b5d
 MISC metadata.xml 480 BLAKE2B 4d01de527c3e9c5d5b97dfc169be7b0639be97a2cfa75564b6f2f3f0543c783f9b2403b15471191ecd0b1cf6ddc97eb87d9e04d7f53fe9534fd3626398f02425 SHA512 48c3f9af6ccc92e0cd032f169c8febe7a954cc3b304717e329d2bc9f8d4fff4d9be72bcab2cbfa2c3b75c46ab85a044fe76c786638c062c2a8a9005f1fff6b54
diff --git a/games-strategy/naev/naev-0.7.0-r100.ebuild b/games-strategy/naev/naev-0.7.0-r100.ebuild
index f43b5a4502f8..b3122510f64c 100644
--- a/games-strategy/naev/naev-0.7.0-r100.ebuild
+++ b/games-strategy/naev/naev-0.7.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,10 @@ RDEPEND="${LUA_DEPS}
 	openal? ( media-libs/openal )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	app-arch/unzip
+	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
diff --git a/games-strategy/naev/naev-0.7.0.ebuild b/games-strategy/naev/naev-0.7.0.ebuild
index 1b20e968fdde..d778be1396f6 100644
--- a/games-strategy/naev/naev-0.7.0.ebuild
+++ b/games-strategy/naev/naev-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,10 @@ RDEPEND="
 	openal? ( media-libs/openal )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	app-arch/unzip
+	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
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index 4c4710253eaa..2f9dc1032298 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -11,6 +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
+EBUILD openra-20190314-r100.ebuild 5055 BLAKE2B 772c610a2432159ac3bff97bb74a577b543f0b49cad12572c588363fb531462ed702108baf9199d320fd75cca0dfe63c316c8ce36f2b59edca7f77e5cf96ee9e SHA512 301b69fa0f05373b8ea1e3180e403d038332962dd66aed84123e9095742198100651083d039b86ee855a224bcc1e488fba157e32a8707b9f92c801f6954a5c3f
+EBUILD openra-20190314.ebuild 4955 BLAKE2B b589837560638ead51cd6eb525b480471bb3e7fe452aba3eeb4d5db09c90a2aa503f39e0c57c018d2ec575de7a3243328fdbfc9bd3d0c86760fe52f90a16761d SHA512 db49ddce14d00a9b3649b2bc5b14e1c89a98d769f2aafd93d2f1052893f70584cc7236b663b8b814cfbbbdae565ecdb628ee242e18d1ade17bb7d47f21c81da0
 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
index c9121cd7fddf..7548dcc3a522 100644
--- a/games-strategy/openra/openra-20190314-r100.ebuild
+++ b/games-strategy/openra/openra-20190314-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,11 +45,15 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RESTRICT="mirror test"
 
-BDEPEND=">=dev-lang/mono-4.2"
-
-DEPEND="${BDEPEND}
-	dev-dotnet/libgdiplus"
-
+MONO_DEP=">=dev-lang/mono-4.2"
+BDEPEND="
+	app-arch/unzip
+	${MONO_DEP}
+"
+DEPEND="
+	dev-dotnet/libgdiplus
+	${MONO_DEP}
+"
 RDEPEND="${DEPEND}
 	app-misc/ca-certificates
 	${LUA_DEPS}
diff --git a/games-strategy/openra/openra-20190314.ebuild b/games-strategy/openra/openra-20190314.ebuild
index 3dfb6054218d..89952527033d 100644
--- a/games-strategy/openra/openra-20190314.ebuild
+++ b/games-strategy/openra/openra-20190314.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,11 +40,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+debug geoip"
 RESTRICT="mirror test"
 
-BDEPEND=">=dev-lang/mono-4.2"
-
-DEPEND="${BDEPEND}
-	dev-dotnet/libgdiplus"
-
+MONO_DEP=">=dev-lang/mono-4.2"
+BDEPEND="
+	app-arch/unzip
+	${MONO_DEP}
+"
+DEPEND="
+	>=dev-lang/mono-4.2
+	dev-dotnet/libgdiplus
+	${MONO_DEP}
+"
 RDEPEND="${DEPEND}
 	app-misc/ca-certificates
 	=dev-lang/lua-5.1*:0
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 475209ea1bd6..89a9440ec4be 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,7 +1,9 @@
 DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
 DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
+DIST warzone2100-3.4.1.tar.xz 89169752 BLAKE2B a0f379e357c315e083f8ac1542297262abb48aae1f8a3e0666898e047749a8a108924b0dea000df1731fc94ccdce9e2768bbebd3333063a730931f7fbf9192a2 SHA512 26c026400e418ed3da94d96e7bb443c765ede3e0b347785ff8a9e687a5ad87afe03012c830fd509b927634484687efac951b2ef3417e7fe027ce0e684561ca84
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-3.2.3.ebuild 2575 BLAKE2B 2712f209478693da3b3e106ac00149ab01fe49a798f29c1ec3397d6d39bc552fbf63a6e915f59ec9569276dfd235e9c44392fa09d40fe181516a8814b3cbbcbf SHA512 f19f25b22e9664053c07741990976fc297ed8d6389a4449d30f14ee4616261c63d72943ed5a50f4c223fd14695de8bbdd7a19b2bb983480cac64f898be48e70a
 EBUILD warzone2100-3.3.0.ebuild 2347 BLAKE2B d0e8bb5e2c3927e309e732db9be52ae8198d6b05c8bd37f5a391bdb5d78c83c9b1299cf100dca97ebc418431bb79cba3539c32dff69fef3c7c55e6c3bb67ad36 SHA512 49ed12f8483c013d28281069c38e49c6b7699295fc2bec91b2eebf71f68d5b9b24307812818a49c013062bf84e9ef7c1638a1c5adc8111f163468426bf9941aa
-MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
+EBUILD warzone2100-3.4.1.ebuild 2795 BLAKE2B 037a86f8fc5ba28572ae80df915f5bb80a2dbae675e5fe77b5c9b5265d5c147d99445aa99d557bc94ebca9c48f39dd8684d80a5b8a9e143a69e6eee9a2662cc2 SHA512 e97a6a119be374ae9ce8413a93db1597631b7595fdfabbf3ff8fd63291ddf4d5f90568e1dde9744cc79e19ec730a2f0bced209f61b2aa34040fb7a990646a2dd
+MISC metadata.xml 811 BLAKE2B 0c66f366f816f74dcf0fcbfac1515360e651f08eb7d199115e426102a7eb90fbeb0c2615f1f2108f078d6c19183f25312232ac68e8f0c77870cfbf6577c5e69c SHA512 f066dd0af3ca1e8a09ad55e371fa03ab235f4b4360b8f944dd07df0a446f8a19b19aac20eaff84ed20184b5bcc8c8f8f6792ce379d06f6f83a2e6dcb4d5859d0
diff --git a/games-strategy/warzone2100/metadata.xml b/games-strategy/warzone2100/metadata.xml
index ce7f3bcd92b0..5d417c533f46 100644
--- a/games-strategy/warzone2100/metadata.xml
+++ b/games-strategy/warzone2100/metadata.xml
@@ -15,4 +15,8 @@
 		<remote-id type="sourceforge">warzone2100</remote-id>
 		<remote-id type="github">Warzone2100/warzone2100</remote-id>
 	</upstream>
+	<use>
+		<flag name="discord">Enable Discord presence/join integration</flag>
+		<flag name="vulkan">Enable vulkan backend</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-strategy/warzone2100/warzone2100-3.4.1.ebuild b/games-strategy/warzone2100/warzone2100-3.4.1.ebuild
new file mode 100644
index 000000000000..210b225cba54
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-3.4.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
+SLOT="0"
+#[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~amd64 ~x86"
+# upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+# TODO: unbundle miniupnpc and quesoglc
+# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	>=dev-libs/libsodium-1.0.14
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/harfbuzz
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	nls? ( virtual/libintl )
+	vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+	${CDEPEND}
+	app-text/asciidoc
+	dev-libs/fribidi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${P}.tar.xz
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWZ_DISTRIBUTOR="Gentoo"
+		-DWZ_ENABLE_WARNINGS_AS_ERRORS="OFF"
+		-DWZ_ENABLE_BACKEND_VULKAN="$(usex vulkan)"
+		-DWZ_PORTABLE="OFF"
+		-DBUILD_SHARED_LIBS="OFF"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_DISCORD="$(usex discord)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	asciidoc -b html5 doc/quickstartguide.asciidoc || die
+}
+
+src_install() {
+	local HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+	local DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
+	default
+
+	insinto /usr/bin
+	dobin "${BUILD_DIR}"/src/${PN}
+
+	insinto /usr/share/${PN}
+	doins "${BUILD_DIR}"/data/base.wz
+	doins "${BUILD_DIR}"/data/mp.wz
+	if use videos ; then
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+	insinto /usr/share/${PN}/music
+	doins data/music/music.wpl
+	doins data/music/menu.ogg
+	doins data/music/track1.ogg
+	doins data/music/track2.ogg
+	doins data/music/track3.ogg
+
+	doman "${BUILD_DIR}"/doc/warzone2100.6
+
+	doicon -s 128 icons/warzone2100.png
+	domenu icons/warzone2100.desktop
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /games-strategy
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)