gentoo auto-resync : 01:03:2024 - 11:41:16

5 files changed, 6 insertions, 252 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 1ec7f8db969f..1ba029e39126 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index afed2b6629d9..1bf54492d408 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,9 +1,5 @@
 AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
-DIST warzone2100-4.3.5.tar.xz 320369492 BLAKE2B 526568cd25e7600e4f45714f4cd2a8ef9da8a1a3f6691d9cb07f4ed6c9367fc412f0fa77b4a547c4a4eac6d42624ac5b9d1e105e4606f801f773ce6028740286 SHA512 ec65f22a0aad9fe482c4ea916cb321d171b10f0a9b181fea7db2eb17bf54e32b3828c8259082fff266713e2cab4e32dcc455d0d5b923a5ca221fc77b11137062
-DIST warzone2100-4.4.0.tar.xz 489899284 BLAKE2B 4b041bca3efeec4da9f24c835faba2d3fef3f175c4724c7d3946b2cda3bb464ec773ff96819a52621b53952677b0b042d2268875280f10e0ace26921e7ba8f1e SHA512 35f5e54007d6eeeacc451d6c62f6e6980a2e2e2462dfed16229e89f8e24636ae923dd2c1c4eb6cb84df0a3b96a6f3b7b91b7614a4bd3568380203244ac648396
 DIST warzone2100-4.4.2.tar.xz 490182768 BLAKE2B 4b8f6825072c8dd29e1d4699b21123ff015e87da9b4f5043e40398ec5ec41ba12d414bbb01dd616a9e7f74f45407341e87a071ef38eb7c191e3845016f8df330 SHA512 8edfae77853826fda4bafafc513d9c6d999861fc4a7f0cf22318df7ebf9df3d7f98c3859eec8e8eeb02f4243b7e2e152c8d46881f4f8d414787ef0d0735ea4e6
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-4.3.5.ebuild 2773 BLAKE2B 65593d1e8c2c02ac68d99f66ad7bf7f82013a752cf71b212289271aab8d99a7e42f42b3ac61d5ffa23486938c28ce1cf6c1b1374461e52bcacdc0710c3008052 SHA512 95b8d9d906a32886ad54b2cf3b4c43a79a99296962ba7cf233633de6bac519da4c05475ef906ebb9474a9e9f33d7e9fd85030233260f044e69f66b94024bffa9
-EBUILD warzone2100-4.4.0-r1.ebuild 2822 BLAKE2B 49a1a97611d74da4d10619bd405e7d370519bdcceb5fdc993043c32021436d43fd9a0fa923de580a97e92ff18fbd2afc46a7821ee98222af028d2faf78010275 SHA512 b49c27a3e36cb5cba1720b6e10a6eb2fcb9a57827e7e85957a1ff30f14a0f2533098dd7feab820967f93e9f82b7d4a80cf0b38d6965dcd3eac3bba8f449bd4e4
-EBUILD warzone2100-4.4.2.ebuild 2874 BLAKE2B e0720b8d9b64a1f154e206a09c2e6e9f8da1517eafea6e14dda21b70d2de86236da4181653030f8acb0ff340113d0ebd48b1afe83fc346f18fb29297b442583d SHA512 2e1f25ebbcc8c2c6220a01f9591670b071ff5a4a00171a16e79e24400c51455f4814804cb05a2b422f55cbf2b3392e3dc3feeadf92c73625005b1f7c999ae2aa
+EBUILD warzone2100-4.4.2.ebuild 2945 BLAKE2B 61d615cfd7ae4f0b6769cc9bffd013c9c3a7d9babe3256194e5e1b1361da2bb51a49ff431b998c06bb8f348997d6f451a7ba16a062bed8fc936d859b235f068e SHA512 98856adb33c58b4e78e9fd9eb368aa2b1061e840be4e55d028d116e7b5eb38dab69c40545ad6dc7ddb8f5d5242ad857745ec3039b1fda1a3006bd0b364d42a85
 MISC metadata.xml 761 BLAKE2B b936989bcdaef01522f294635531f699a2db868a80fd696051a60a10c70fb1f24cb721a34064d222938333f2fa956bb07463ce60a5490c0cadfca2b9c69e987f SHA512 5e422b7b539f95705be9ef4cede8b3029e9bfc38e9fdd0002712432671956d946cb893a069839bad88a07ee4fc33bc6fa7e1042b1efdc8ea55823165fc77cb54
diff --git a/games-strategy/warzone2100/warzone2100-4.3.5.ebuild b/games-strategy/warzone2100/warzone2100-4.3.5.ebuild
deleted file mode 100644
index 76a3ae90c8c3..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.3.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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 ~arm64 ~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
-	games-util/basis_universal
-	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() {
-	# 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
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.4.0-r1.ebuild b/games-strategy/warzone2100/warzone2100-4.4.0-r1.ebuild
deleted file mode 100644
index 61dbe551e510..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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 ~arm64 ~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
-	games-util/basis_universal
-	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() {
-	# TODO: unbundle nlohmann-json
-	# TODO: unbundle fmt
-	# TODO: unbundle SQLiteCpp
-	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)
-
-		-DFMT_INSTALL=OFF
-	)
-
-	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
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.4.2.ebuild b/games-strategy/warzone2100/warzone2100-4.4.2.ebuild
index 42252a5e12cf..d3acd7fee1f3 100644
--- a/games-strategy/warzone2100/warzone2100-4.4.2.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 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
+inherit cmake flag-o-matic plocale xdg
 
 MY_PV=$(ver_cut 1-2)
 VIDEOS_PV=2.2
@@ -87,6 +87,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# ODR violations (bison, yy_*, bug #859268)
+	filter-lto
+
 	# TODO: unbundle dev-cpp/nlohmann_json
 	# TODO: unbundle dev-libs/libfmt
 	# TODO: unbundle SQLiteCpp