gentoo resync : 14.08.2021

4 files changed, 36 insertions, 155 deletions

diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index dd5e520a5421..3ba55ca5fb92 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,8 +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-4.1.3.tar.xz 337479212 BLAKE2B 07d1788fc2f8e5073a15231d5bf0c8c50dc0413522ea1589b064190144906fb58008faab66a295cec7759a1036f4d007ef8a42cffd9ef588fde1116b6cd7a38b SHA512 64126a1a5aab8b766cdfc70b8d96465ad451bd6a31e33be963eb89664b062dfe58e195ac3cbc087a9c008519c0e13003d9750bcb428b0e0ff12c82bf9940be3f
 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
-EBUILD warzone2100-4.1.3.ebuild 2523 BLAKE2B 83fd3cbf0941864e1dc2b193411b55b6668495bf043ed7c44e4cb404420e44d6949cd7571aebc13754060e1121f7aa8903a2b729cc8a909606850cc88fc5abd4 SHA512 5070cd1b61eb4395172a93e890ea68b503268e740c56968ce9bb74398f04a6c75ae634173aeb1635621e277bb95132c34911923a6b1889369738a1297df239e6
+EBUILD warzone2100-4.1.2-r1.ebuild 2527 BLAKE2B 5b30a48f1bfa0fa022120923698dac9054bd77b598d3d12015be911ee1fea198c28d46e4c9d0bc9a6438845dfd237b8e2f54d37089bb37f890edb9fbd279d841 SHA512 d251b0cdc1500dbb9befe2925a4c796d893d4659a5bd932ab45955a5ecce2772154937e1dd13f488891f011c161d35a47c78b6d14e956c89425f0c956224000b
+EBUILD warzone2100-4.1.3-r1.ebuild 2738 BLAKE2B ca5b073b29ebb9d62e2cfd83725ee701c41d07408cfed81f3c4974cc3f983d9cd6efbbf2e1338fb483f5561207262290ab26eb2cfb194f698eef75e71b608105 SHA512 9578af177e8caf6daf95efd392a6e52274c20c5eb63aadf71ac61d0dc4d76f1a55bdc3754c251f421265bbee8c69f6e2a9f2a56845aa3bb805c8d29fc1f2684e
 MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
diff --git a/games-strategy/warzone2100/warzone2100-4.0.1.ebuild b/games-strategy/warzone2100/warzone2100-4.0.1.ebuild
deleted file mode 100644
index d1a62cac0865..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.0.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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} )"
-
-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 )
-"
-
-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}
-	doins -r data/music
-
-	doman "${BUILD_DIR}"/doc/warzone2100.6
-
-	doicon -s 128 icons/warzone2100.png
-	domenu icons/warzone2100.desktop
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.1.2.ebuild b/games-strategy/warzone2100/warzone2100-4.1.2-r1.ebuild
index cb780494cdd6..78e0c7a03746 100644
--- a/games-strategy/warzone2100/warzone2100-4.1.2.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.1.2-r1.ebuild
@@ -25,13 +25,13 @@ IUSE="debug discord nls videos vulkan"
 # 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/libsodium-1.0.14:=
 	dev-libs/openssl:0=
 	media-libs/freetype:2
 	media-libs/glew:=
-	media-libs/harfbuzz
+	media-libs/harfbuzz:=
 	media-libs/libogg
-	media-libs/libpng:0
+	media-libs/libpng:=
 	media-libs/libsdl2[opengl,video,X]
 	media-libs/libtheora
 	media-libs/libvorbis
diff --git a/games-strategy/warzone2100/warzone2100-4.1.3.ebuild b/games-strategy/warzone2100/warzone2100-4.1.3-r1.ebuild
index cb780494cdd6..ab190710681b 100644
--- a/games-strategy/warzone2100/warzone2100-4.1.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.1.3-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit cmake desktop xdg
+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 desktop plocale xdg
 
 MY_PV=$(ver_cut 1-2)
 VIDEOS_PV=2.2
@@ -14,39 +15,35 @@ SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P
 	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"
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
 SLOT="0"
-#[[ "${PV}" == *_beta* ]] || \
 KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
+# Upstream requested debug support
 IUSE="debug discord nls videos vulkan"
 
-# TODO: unbundle miniupnpc and quesoglc
+# TODO: unbundle miniupnpc and quesoglc, bug #477610
 # 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-db/sqlite
+	>=dev-libs/libsodium-1.0.14:=
 	dev-libs/openssl:0=
 	media-libs/freetype:2
 	media-libs/glew:=
-	media-libs/harfbuzz
+	media-libs/harfbuzz:=
 	media-libs/libogg
-	media-libs/libpng:0
+	media-libs/libpng:=
 	media-libs/libsdl2[opengl,video,X]
 	media-libs/libtheora
 	media-libs/libvorbis
 	media-libs/openal
+	net-misc/curl
 	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
 "
@@ -56,6 +53,7 @@ RDEPEND="
 "
 BDEPEND="
 	app-arch/zip
+	app-text/asciidoc
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
@@ -72,18 +70,28 @@ 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)"
+		-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
 }
 
@@ -94,24 +102,15 @@ src_compile() {
 }
 
 src_install() {
-	default
+	cmake_src_install
 
-	insinto /usr/bin
-	dobin "${BUILD_DIR}"/src/${PN}
+	rm "${ED}"/usr/bin/.portable || die
 
-	insinto /usr/share/${PN}
-	doins "${BUILD_DIR}"/data/base.wz
-	doins "${BUILD_DIR}"/data/mp.wz
+	# 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
 		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
 }