5 files changed, 128 insertions, 10 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 20db2cd8e370..b559760fbc70 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
index 7f45d303c99c..1fe885a7e278 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,5 +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.13.0.ebuild 786 BLAKE2B 5bdf6608b7c2622981b30716b32979c8c66cfb82ac1353621828943c668565e0e7b3999e26a8ae40419b2a326a8f1ae7190e2fcd194a3f8dc5c477b55203073d SHA512 84165dfe9e8ab75a076459245ab38a5a8326708150874faca24fddc9b237473347d60862a41a89bc269fc673042f4940ef89eb2d1741d40f31218b3a9ca98cbf
+EBUILD megaglest-data-3.13.0.ebuild 735 BLAKE2B c673c37e617fdfcb580555102528cd93eb67fd9cfb82643da88137dcf8d6a1d8b74bdc766f92bfc0aca5ee817635d68dbb86b356ae06e67bb4e601bbaccab50c SHA512 8011dca05ea8cfcd2cf2d2f3fe897225919cdf0504c27ae2a9181f49374397c0b38d6f744fe5c5fcad68ce785e8680a53306829ad99ca4605497a34d231214d9
 MISC metadata.xml 342 BLAKE2B 3e1f532ee136e71fe0c923694e49cedfdce563f052f0e1a48bad9086fa511ffdef728107969738251cb13fe8df360270df227d1b7dec383110564f5cad54ab1e SHA512 6ae571607c0fefd0ff846ea1f9946d1e5de8a208494b71474f2c46495beb4d306edc37d7ed754305c6e325e7b7306f13f3e78010235bef1c97873cf01de519fe
diff --git a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
index 9a1f00300e1b..d3e8912a573b 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
@@ -2,31 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake
 
-MY_PN="megaglest"
 DESCRIPTION="Data files for the cross-platform 3D realtime strategy game MegaGlest"
 HOMEPAGE="https://www.megaglest.org/"
-SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz"
+SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/${P}.tar.xz"
+S="${WORKDIR}/megaglest-${PV}"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
-DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
-	# See bug https://bugs.gentoo.org/709450.
 	local mycmakeargs=(
-		-DMEGAGLEST_APPDATA_INSTALL_PATH=/usr/metainfo
+		-DMEGAGLEST_APPDATA_INSTALL_PATH="${EPREFIX}"/usr/share/metainfo #709450
 	)
+
 	cmake_src_configure
 }
 
 src_install() {
-	use doc && HTML_DOCS="docs/glest_factions/"
+	local DOCS=( docs/{AUTHORS.data,CHANGELOG,README}.txt )
+	use doc && local HTML_DOCS=( docs/glest_factions )
+
 	cmake_src_install
 }
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index d040a278b35e..a920df84db86 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,4 +1,6 @@
 DIST warzone2100-4.0.1.tar.xz 337713608 BLAKE2B 4f1bf79e71c13cd507890f2fe4131687fd70bc3b302aea68c7f17314a0d596797a34d9ab46a6736e98d823122199fb0dfcfb62b1f6b702c6d8ba99eb3c338c9e SHA512 820ab41ebc0ca3e81aff67f90eb3946f6a889776b243795c0cab8dbea44d4c5c3620c849cb70fa45c40af14b9a5667823373f9887078bb2b4feb30d2af007180
+DIST warzone2100-4.1.2.tar.xz 337480924 BLAKE2B 2042aedd43a3515bf6ccfc210dd02502bc20d487ff96ce763f573f0dd92ef08577ee21fd54237b4cf4f99c31ed33197febc70edd25d0e0a515e286167d815f9d SHA512 7218f98757e421d8ccf6c36de5e310060b52506d4e10c3cba6e32d1917da30b9deb52b8081026d8efc84ef44842a7db8604d4a86157409281a30bbcc52b556f6
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-4.0.1.ebuild 2551 BLAKE2B ce7404e0a4fe23a372830f976530636a74f2ddbab39441edfabbe9b53a98f4979959dfc349b657f4b976da11bb15311d0aece530aa5eb141195605ce31f8cb00 SHA512 aab1404f57f3d773eb20f54507e382840f6dcb266ec3534d15f67cedb232fd845afea539267acc2535a7148cc4257731a620bbbd7639b9b02ec77ab4c823454e
+EBUILD warzone2100-4.1.2.ebuild 2523 BLAKE2B 83fd3cbf0941864e1dc2b193411b55b6668495bf043ed7c44e4cb404420e44d6949cd7571aebc13754060e1121f7aa8903a2b729cc8a909606850cc88fc5abd4 SHA512 5070cd1b61eb4395172a93e890ea68b503268e740c56968ce9bb74398f04a6c75ae634173aeb1635621e277bb95132c34911923a6b1889369738a1297df239e6
 MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
diff --git a/games-strategy/warzone2100/warzone2100-4.1.2.ebuild b/games-strategy/warzone2100/warzone2100-4.1.2.ebuild
new file mode 100644
index 000000000000..cb780494cdd6
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.1.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 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="https://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} )"
+S="${WORKDIR}/${PN}"
+
+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=
+	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 )
+"
+
+HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
+
+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 Linux"
+		-DWZ_ENABLE_WARNINGS_AS_ERRORS="OFF"
+		-DWZ_ENABLE_BACKEND_VULKAN="$(usex vulkan)"
+		-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() {
+	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}
+	doins -r data/music
+
+	doman "${BUILD_DIR}"/doc/warzone2100.6
+
+	doicon -s 128 icons/warzone2100.png
+	domenu icons/warzone2100.desktop
+}