gentoo resync : 05.12.2021

7 files changed, 125 insertions, 8 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 5fbaace90ce1..19e3b6cdb836 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/knights-demo/Manifest b/games-strategy/knights-demo/Manifest
index e2d57b496fe0..30e1a8791ce3 100644
--- a/games-strategy/knights-demo/Manifest
+++ b/games-strategy/knights-demo/Manifest
@@ -1,3 +1,3 @@
 DIST knights-demo-1.32.run 31667235 BLAKE2B ee9c63a261aaea93122b790ef3d4df21b30b53d8f47e2f1549c3e6aaf7a09f04b5f7985e6d26e395266176fa9135cb7257bfc5c6f5eba7524da19758ab241715 SHA512 f53cf9524811b4a83ec2531f62ea251fc5a939cb09445ab850c7bbac85301e8b8275dda12a8dc991e4412eb4358d7597d0c007bd9263fd875289b039b941ed9c
-EBUILD knights-demo-1.32-r3.ebuild 1654 BLAKE2B 1d70f4424e472ba19ad13d9dff645659a07d9fa8ec23431b3257235b3c1d52865680a33f8c06bf7ffc151ac60a9127b19cea4c13af68f22e50f877f7fe83ca11 SHA512 ba0843d5f65a211410151cbf611cc0c52117be15ca259d5d07058502801920ecfde949153f1834697907a93db3dd10c1309e23101d06375ba9292c43f9c5549d
+EBUILD knights-demo-1.32-r3.ebuild 1654 BLAKE2B 4b7c90f96ebaafabb4c287342161ac270f5ac7f6ef1d894b031172c828a83bf5fbb44707663ed8de0e358c5ee7690db9ddf7608c24b1d6a9f39e40608745d95d SHA512 6abbdb084be5b0aaa0c4b9cb9a69946e9f72ae26c412298b1d40041de82d60474712fb64eb4c52492e50dc5c028ed8bd0e11bef82b44f1b20ef8d22a2fda37f7
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
index 30df2b2f322b..d329b09274d5 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
@@ -36,8 +36,8 @@ RDEPEND="
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 	|| (
-		sys-libs/glibc[crypt(+)]
 		sys-libs/libxcrypt[compat]
+		sys-libs/glibc[crypt(+)]
 	)
 "
 
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 9e7cead2f502..b8421f6cdc8d 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,3 +1,3 @@
 DIST naev-0.8.2-source.tar.gz 394232958 BLAKE2B 2e109636cb1d282bc8236c84ee40b9b96224baf70bf315677b6a02bf9c4c0059d34c5225c31b925a8c66c5995fd9ab8fc022816b66a7e1c174e017e3ebf5e956 SHA512 2ad120639efc13635370bb498d0a4100b2306779cf593e6aecffd331e0f4dec1b8af4729b2c4d484af1be9069d2ac7e47e17ebdc8ce65af878fcff9484f810b0
-EBUILD naev-0.8.2.ebuild 1735 BLAKE2B 7b59d264eb949f69914998e0484e244a4a7406bb7f6e5382d6b0eaa6e900dfb86de92dce285e16e8e730b11a65f94bd28b30b5deae7f1893c5076954a4dd8428 SHA512 c91781a73f2ca5bb253bc1a7214d0ee3c955171ed40d7530563fd08b47d63722a8782137d52009de11e4198b1ba3cfe98ff373c46678bffb9594d2dab5d9e475
+EBUILD naev-0.8.2.ebuild 1690 BLAKE2B e2fd7e87ab1d24b31533f66ba5a9530b2bb2ef5ee8290253db169bb736e55e5bc1a0925c2bfea002bafbcea21128ad3454a980dba40626f21da2abc841e46e47 SHA512 8f8fc8c8f105c4b68808b01501415849755bee3d61ab1cb3ed02532e671e74f75785ca10bac5a8c1a56f95742c9c3cfdd5a864bed723d37fb8d74e3c79a8e415
 MISC metadata.xml 481 BLAKE2B d6a7459d0d2fb4410f583ea55041a67608358722841c09b49d1085d1cf995bc21b8c1630904abbcb2c1aaad3202da63c9ca987d23aab3712d89b3e27bfb5b4a9 SHA512 41ba5d7ee0c9c5eff0124320c04d6a366e7c01b21a6ff481fafb59e187940a9fe963988054162d6de19f6d89f60464f6ee9fddedba2f7b0745ca6d3ce267f2b5
diff --git a/games-strategy/naev/naev-0.8.2.ebuild b/games-strategy/naev/naev-0.8.2.ebuild
index 31bd4471e1da..7289b7904c55 100644
--- a/games-strategy/naev/naev-0.8.2.ebuild
+++ b/games-strategy/naev/naev-0.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.g
 LICENSE="GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +mixer nls +openal"
+IUSE="doc +mixer +openal"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
@@ -26,9 +26,9 @@ RDEPEND="
 	media-libs/freetype:2
 	sci-libs/suitesparse
 	virtual/glu
+	virtual/libintl
 	virtual/opengl
 	mixer? ( media-libs/sdl2-mixer )
-	nls? ( virtual/libintl )
 	openal? (
 		media-libs/libvorbis
 		media-libs/openal
@@ -36,11 +36,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-devel/gettext
 	doc? (
 		app-doc/doxygen
 		dev-lua/ldoc
-	)
-	nls? ( sys-devel/gettext )"
+	)"
 
 pkg_setup() {
 	lua-single_pkg_setup
@@ -62,7 +62,6 @@ src_configure() {
 		$(meson_feature doc docs_c)
 		$(meson_feature doc docs_lua)
 		$(meson_feature lua_single_target_luajit luajit)
-		$(meson_feature nls)
 		$(meson_feature openal)
 		$(meson_feature mixer sdl_mixer)
 	)
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 2d6bc9ad88a1..bd7e27bf19a2 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,7 +1,9 @@
 AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
 DIST warzone2100-4.1.3.tar.xz 337479212 BLAKE2B 07d1788fc2f8e5073a15231d5bf0c8c50dc0413522ea1589b064190144906fb58008faab66a295cec7759a1036f4d007ef8a42cffd9ef588fde1116b6cd7a38b SHA512 64126a1a5aab8b766cdfc70b8d96465ad451bd6a31e33be963eb89664b062dfe58e195ac3cbc087a9c008519c0e13003d9750bcb428b0e0ff12c82bf9940be3f
 DIST warzone2100-4.2.0.tar.xz 338587136 BLAKE2B e29147ce573c7a07e0ab856b1c74000bfc866437784e314393335d21e735fb78fcdbe71aa19f9c806f280f0ca2d33aff15815a09971c9e5ab85cf8b31e9a7864 SHA512 d2dfb8f2710493cbdacb01ca26cf69b476ad906f4851bc384a7a506a37bc296c2bd2e8c464f1a7a86e50924c66839459413d00c73031f9fe024afef8173c820c
+DIST warzone2100-4.2.2.tar.xz 338585896 BLAKE2B e90ff6f5843a1750971a2cb7e77aac1e7c03ebeae90ea112d1eb735ea4a9cfee35de860e52f81824cde69543af6172ee630b6451ea39c141c188e4469f9200b9 SHA512 ea02207a27a01114daaf0819a98a63a5189570844dd69f50f493a1caafab7c05d85fb0d5c8a8b1b061ee3a050081e9786a1c090f4490134e93e8bbfa1903bd1b
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-4.1.3-r4.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7
 EBUILD warzone2100-4.2.0.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7
+EBUILD warzone2100-4.2.2.ebuild 2678 BLAKE2B 4c3db36d5f39189d1e43fbedeb894546bc133fc9d772f6fed8bb5bb7d1b39d84db2d6f66ac337a2c80cd24eef2d7fbd8cb230f1d2f6814d8f26ca658b13fa0ef SHA512 9459049e8aff4cb3a481699fbc1ebc2ba92d780cfe4984e9ddfdda8f03de5a465fb91d1da5b1a4d84d957a2fba23decdb4c7ab917e52b1f8e8367a97f46393d7
 MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d
diff --git a/games-strategy/warzone2100/warzone2100-4.2.2.ebuild b/games-strategy/warzone2100/warzone2100-4.2.2.ebuild
new file mode 100644
index 000000000000..929af63b820a
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.2.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
+inherit cmake plocale 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 vulkan? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	dev-db/sqlite:3
+	>=dev-libs/libsodium-1.0.14:=
+	media-libs/freetype:2
+	media-libs/harfbuzz:=
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+	${CDEPEND}
+	dev-libs/fribidi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	app-text/asciidoc
+	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 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+	# Delete translations we're not using
+	cleanup_po() {
+		local locale=${1}
+		einfo "Cleaning up disabled locale: ${locale}"
+		rm po/${locale}.po || die
+	}
+
+	plocale_for_each_disabled_locale cleanup_po
+
+	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() {
+	cmake_src_install
+
+	rm "${ED}"/usr/bin/.portable || die
+
+	# We cover licencing within the ebuild itself
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* \
+		"${ED}"/usr/share/doc/${PF}/copyright || die
+
+	if use videos ; then
+		insinto /usr/share/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+}