gentoo auto-resync : 22:01:2023 - 12:52:10

4 files changed, 146 insertions, 0 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index c1200656e9af..6905d4cd3e6f 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 0170ad3851b0..63e30cde35ee 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,7 +1,10 @@
 AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
+AUX warzone2100-4.3.3-gcc13.patch 721 BLAKE2B 74076ccb88ae2d29dc56d12266d707c374b90dcbac128e9088cc978e599806216c058bb936cf8d0a02843dcadd819b3d99a797a433ec2fa09322eadc837d762d SHA512 23a89ea8ba7fa60bfd0da46e16f2f3492deeff05e5c0c19559ae335f9f76f1eac8f666c10f436e6142cad1e57db83595defac43a7809ea0c3420a3ced2f60811
 DIST warzone2100-4.2.7.tar.xz 338687576 BLAKE2B b504f8ed6b5c1b040b4368429394b7f077c279979ef7847734eeb333512fc374799c73119924fba206a6fc925db54697569a756e113d0a322dd46768c80d0b72 SHA512 af538f3bdf6ec543e5f919377c95c35c730fa6efa5c3ea8d140347595dd9f8056677d4b494677ea20c98da305e0fb588cdb00a3da1c497f96edc58ca8772e45b
 DIST warzone2100-4.3.1.tar.xz 320493184 BLAKE2B 98f3fb13e36f3455532f0f054eaddb495b1f5fbf55fa30f356ab7d315536cd198697b0a084b47c5e1cb9ec0a5cc4bc0159be45669317469bdd2f7b24a62d46d2 SHA512 914d18a8226c11faa8bd03ab5b8f0a52e6e2b8531db501244ceb27f19b76209cbf668e51be59ce35b7203f74c5e62ad78e02ef0fb8505243948fa681f25d583e
+DIST warzone2100-4.3.3.tar.xz 320439712 BLAKE2B 15d29a0d7dc8c10b41dabf210e2113f079731e7976932a44054fa86b90dddee68e46faa5e4cf1d25ba57fc5d14c6ddedaea0f1544deb5755d19ca2ff02b7cb56 SHA512 46ccf2720d09481dfc89c1e3abb9802a379d1bfe0b3823566b51f2ea177fd793653d5b2592f07c724f0121cafd014c1ea6226b8c2bc22ec12ac3ca1bfaf298f4
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-4.2.7.ebuild 2678 BLAKE2B abbd712501c57c331e199ff6d75ecfba88660576549f181e21e8e769f0525d2096b9781434031a10f1a8990313ccad49a609258ba8099836e4d8499726c396a7 SHA512 f30803098c061db711c06b007cb384d31c9a4888044815308ea74cbaf748cba05db41b3b90ba7a400b32a82155379ceb1f5bddfeda628f160aa19b7a4c5377f2
 EBUILD warzone2100-4.3.1.ebuild 2737 BLAKE2B a43686ac02cc569b9a394613c9d84c370ace499da95c11b1f4b24f70094db8cc35acd954d9d08c47055a6815ee64ee9f217d841b05c2f12392568dcdbcbf050a SHA512 f096eb5d1be3eda53ef1514e5c2117314ccdc4475d56180329629c031533edc2f82d92bf6c9437b675f0a32396633218ffcfff4700f9370fc83f61c9c0ca69a7
+EBUILD warzone2100-4.3.3-r2.ebuild 2816 BLAKE2B 8b3df9615983109685193bf4049cd610f4630bf3a8b1037ee6562bfcb5814c712493cb33bc9b80afc7e675555bd5ea5f335dc6120889ee153b7a383b8882ddb4 SHA512 c2de63773766712adf1c5ea5ad847f080818f8065aea6b9c04953411422d77d3461ffcc4a6c5c51e0545e07612cd723e6da5795e85a6ee97be15e4f7c8a26989
 MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d
diff --git a/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch b/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch
new file mode 100644
index 000000000000..a9b8c42cfe00
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch
@@ -0,0 +1,24 @@
+https://github.com/Warzone2100/warzone2100/pull/3090
+
+From 0b8eed53d99c0491ffbcd903463a3b6eb0081525 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 21 Jan 2023 21:00:02 +0000
+Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> is no longer transitively included.
+
+Explicitly include <cstdint> for uint32_t.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/lib/framework/wzstring.h
++++ b/lib/framework/wzstring.h
+@@ -20,6 +20,7 @@
+ #ifndef _LIB_FRAMEWORK_WZSTRING_H
+ #define _LIB_FRAMEWORK_WZSTRING_H
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include <locale>
+
diff --git a/games-strategy/warzone2100/warzone2100-4.3.3-r2.ebuild b/games-strategy/warzone2100/warzone2100-4.3.3-r2.ebuild
new file mode 100644
index 000000000000..0ea6166acb9d
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.3.3-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+COMMON_DEPEND="
+	dev-libs/fribidi
+	>=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
+	media-libs/opus
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	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
+	"${FILESDIR}"/${PN}-4.3.3-gcc13.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() {
+	# TODO: unbundle basisu (needs packaging)
+	# TODO: unbundle nlohmann-json
+	# TODO: unbundle fmt
+	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
+
+	# 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
+}