gentoo resync : 28.04.2021

3 files changed, 118 insertions, 117 deletions

diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 7bcda70441ec..eef5b9cc33b5 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,9 +1,8 @@
-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-4.0.1.tar.xz 337713608 BLAKE2B 4f1bf79e71c13cd507890f2fe4131687fd70bc3b302aea68c7f17314a0d596797a34d9ab46a6736e98d823122199fb0dfcfb62b1f6b702c6d8ba99eb3c338c9e SHA512 820ab41ebc0ca3e81aff67f90eb3946f6a889776b243795c0cab8dbea44d4c5c3620c849cb70fa45c40af14b9a5667823373f9887078bb2b4feb30d2af007180
 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
 EBUILD warzone2100-3.4.1.ebuild 2795 BLAKE2B 037a86f8fc5ba28572ae80df915f5bb80a2dbae675e5fe77b5c9b5265d5c147d99445aa99d557bc94ebca9c48f39dd8684d80a5b8a9e143a69e6eee9a2662cc2 SHA512 e97a6a119be374ae9ce8413a93db1597631b7595fdfabbf3ff8fd63291ddf4d5f90568e1dde9744cc79e19ec730a2f0bced209f61b2aa34040fb7a990646a2dd
+EBUILD warzone2100-4.0.1.ebuild 2551 BLAKE2B ce7404e0a4fe23a372830f976530636a74f2ddbab39441edfabbe9b53a98f4979959dfc349b657f4b976da11bb15311d0aece530aa5eb141195605ce31f8cb00 SHA512 aab1404f57f3d773eb20f54507e382840f6dcb266ec3534d15f67cedb232fd845afea539267acc2535a7148cc4257731a620bbbd7639b9b02ec77ab4c823454e
 MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
deleted file mode 100644
index 74fa50ea82f2..000000000000
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs eutils versionator gnome2-utils
-
-MY_PV=$(get_version_component_range -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/${P}.tar.xz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-
-SRC_URI+=" https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> ${PN}-3.2.3-qt_compile_fix.patch"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
-IUSE="debug nls sdl videos"
-
-# 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/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/harfbuzz
-	media-libs/libogg
-	media-libs/libpng:0
-	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 )
-	!sdl? (
-		dev-qt/qtopengl:5
-		dev-qt/qtx11extras:5
-	)
-	sdl? ( media-libs/libsdl2[opengl,video,X] )
-"
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	dev-libs/fribidi
-	media-libs/fontconfig
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-
-src_prepare() {
-	default
-
-	# https://developer.wz2100.net/ticket/4580
-	eapply "${DISTDIR}/${P}-qt_compile_fix.patch"
-
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-	sed '/appdata\.xml/d' -i icons/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--with-distributor="Gentoo ${PF}"
-		--with-icondir=/usr/share/icons/hicolor/128x128/apps
-		--with-applicationdir=/usr/share/applications
-		$(use_enable debug debug relaxed)
-		$(use_enable nls)
-		--with-backend=$(usex sdl "sdl" "qt")
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
-	if use videos ; then
-		insinto /usr/share/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-	doman doc/warzone2100.6
-	dodoc doc/quickstartguide.pdf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.0.1.ebuild b/games-strategy/warzone2100/warzone2100-4.0.1.ebuild
new file mode 100644
index 000000000000..d1a62cac0865
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.0.1.ebuild
@@ -0,0 +1,116 @@
+# 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
+}