From d7ad91175d73aeca7af72cc0142684b17f89acf8 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 5 Jun 2026 19:13:48 +0100 Subject: [PATCH] games-strategy/warzone2100: drop 4.4.2, 4.5.5-r1, 4.6.1 Signed-off-by: Sam James --- games-strategy/warzone2100/Manifest | 2 - ...rzone2100-4.1.3-no-compress-manpages.patch | 60 -------- .../warzone2100-4.4.2-gcc15-cstdint.patch | 30 ---- .../warzone2100-4.5.5-gcc15-cstdint.patch | 10 -- .../warzone2100/warzone2100-4.4.2.ebuild | 129 ----------------- .../warzone2100/warzone2100-4.5.5-r1.ebuild | 130 ----------------- .../warzone2100/warzone2100-4.6.1.ebuild | 132 ------------------ 7 files changed, 493 deletions(-) delete mode 100644 games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch delete mode 100644 games-strategy/warzone2100/files/warzone2100-4.4.2-gcc15-cstdint.patch delete mode 100644 games-strategy/warzone2100/files/warzone2100-4.5.5-gcc15-cstdint.patch delete mode 100644 games-strategy/warzone2100/warzone2100-4.4.2.ebuild delete mode 100644 games-strategy/warzone2100/warzone2100-4.5.5-r1.ebuild delete mode 100644 games-strategy/warzone2100/warzone2100-4.6.1.ebuild diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest index c06b51b788e8e..d97ad3d11b620 100644 --- a/games-strategy/warzone2100/Manifest +++ b/games-strategy/warzone2100/Manifest @@ -1,4 +1,2 @@ -DIST warzone2100-4.4.2.tar.xz 490182768 BLAKE2B 4b8f6825072c8dd29e1d4699b21123ff015e87da9b4f5043e40398ec5ec41ba12d414bbb01dd616a9e7f74f45407341e87a071ef38eb7c191e3845016f8df330 SHA512 8edfae77853826fda4bafafc513d9c6d999861fc4a7f0cf22318df7ebf9df3d7f98c3859eec8e8eeb02f4243b7e2e152c8d46881f4f8d414787ef0d0735ea4e6 -DIST warzone2100-4.5.5.tar.xz 507815568 BLAKE2B cc4ff66e2df7666ebb834ead839e2ac2345f3e105232c53d0ec72be375ae01530ff0532368549b196a1a8cbbf9b9903ab5467b7e30248d618bf6fc6e3030d8b0 SHA512 b153306ea8a55334a37580c2862579f6b6a283ba3c082901fcb97fe4da3a6ae4b7bc9bd7c1fa33f39a3b5113876080b90422174f376a7ed148a18f21f57ee8b3 DIST warzone2100-4.6.1.tar.xz 492456208 BLAKE2B f6684b3629507a80735f3adecf522aecb8e47070d5cb6a02479772c9c179da312367453be1c3d7a4af44a077a92d7581589c79e201cd113c07c60aa21a69bf2a SHA512 74a085e760e16605fde93bce0f82b09df6789913f4b6d138499cea6250955f63589b65035ae6463f450dcf779fdad0d2324b0e0a554c2f3f93a0d625061426b4 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6 diff --git a/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch deleted file mode 100644 index b90ad05bc7546..0000000000000 --- a/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://bugs.gentoo.org/808120 - -From e65b71cec99b2c3a4d0ed6aa448e7a2dc28fabac Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 17 Aug 2021 22:22:40 +0100 -Subject: [PATCH] Don't compress manpages - ---- - doc/CMakeLists.txt | 34 ++++++---------------------------- - 1 file changed, 6 insertions(+), 28 deletions(-) - -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 3d27a1a..f3c702b 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -236,35 +236,13 @@ install(FILES ${wz2100_doc_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}${WZ_OUTPU - if(UNIX) - # Man-page gzip and installation - -- find_program(GZIP_BIN NAMES gzip PATHS /bin /usr/bin /usr/local/bin) -- if (GZIP_BIN) -- set(_warzone2100_6_uncompressed_orig "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6") -- set(_warzone2100_6_uncompressed "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6") -- set(_warzone2100_6_compressed "${_warzone2100_6_uncompressed}.gz") -- -- add_custom_target(wz2100_manpages ALL) -- set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc") -- add_dependencies(wz2100_manpages wz2100_doc) -- -- if (NOT "${_warzone2100_6_uncompressed_orig}" STREQUAL "${_warzone2100_6_uncompressed}") -- add_custom_command( -- TARGET wz2100_manpages -- COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}" -- COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} -- VERBATIM -- ) -- else() -- add_custom_command( -- TARGET wz2100_manpages -- COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} -- VERBATIM -- ) -- endif() -+ set(_warzone2100_6 "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6") - -- install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages) -- else() -- message( WARNING "Unable to find gzip tool; skipping Unix man page generation" ) -- endif() -+ add_custom_target(wz2100_manpages ALL) -+ set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc") -+ add_dependencies(wz2100_manpages wz2100_doc) -+ -+ install(FILES "${_warzone2100_6}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages) - endif() - - set(wz2100_doc_IMAGES_FILES ${wz2100_doc_IMAGES_FILES} PARENT_SCOPE) --- -2.33.0 - diff --git a/games-strategy/warzone2100/files/warzone2100-4.4.2-gcc15-cstdint.patch b/games-strategy/warzone2100/files/warzone2100-4.4.2-gcc15-cstdint.patch deleted file mode 100644 index 75e1aaeb97a00..0000000000000 --- a/games-strategy/warzone2100/files/warzone2100-4.4.2-gcc15-cstdint.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h -+++ b/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h -@@ -14,6 +14,7 @@ - #include - #include // SQLITECPP_PURE_FUNC - -+#include - #include - #include - #include ---- a/lib/wzmaplib/include/wzmaplib/map_io.h -+++ b/lib/wzmaplib/include/wzmaplib/map_io.h -@@ -21,6 +21,7 @@ - #pragma once - - #include -+#include - #include - #include - #include ---- a/lib/wzmaplib/src/map_script.h -+++ b/lib/wzmaplib/src/map_script.h -@@ -19,6 +19,7 @@ - - #pragma once - -+#include - #include - #include - #include diff --git a/games-strategy/warzone2100/files/warzone2100-4.5.5-gcc15-cstdint.patch b/games-strategy/warzone2100/files/warzone2100-4.5.5-gcc15-cstdint.patch deleted file mode 100644 index e3af62d1ffcd1..0000000000000 --- a/games-strategy/warzone2100/files/warzone2100-4.5.5-gcc15-cstdint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h -+++ b/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h -@@ -14,6 +14,7 @@ - #include - #include // SQLITECPP_PURE_FUNC - -+#include - #include - #include - #include diff --git a/games-strategy/warzone2100/warzone2100-4.4.2.ebuild b/games-strategy/warzone2100/warzone2100-4.4.2.ebuild deleted file mode 100644 index 7d8f34d4aceb9..0000000000000 --- a/games-strategy/warzone2100/warzone2100-4.4.2.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 2022-2025 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 flag-o-matic 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=" - https://downloads.sourceforge.net/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz - videos? ( https://downloads.sourceforge.net/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 - virtual/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 - "${FILESDIR}"/${PN}-4.4.2-gcc15-cstdint.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() { - # ODR violations (bison, yy_*, bug #859268) - filter-lto - - # TODO: unbundle dev-cpp/nlohmann_json - # TODO: unbundle dev-libs/libfmt - # TODO: unbundle SQLiteCpp - # TODO: unbundle dev-libs/inih - 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.5.5-r1.ebuild b/games-strategy/warzone2100/warzone2100-4.5.5-r1.ebuild deleted file mode 100644 index ad2f1097e44d3..0000000000000 --- a/games-strategy/warzone2100/warzone2100-4.5.5-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="ar_SA 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 it ja_JP ko la lt my_MM nb nl pl pt pt_BR ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW" -inherit cmake flag-o-matic 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=" - https://downloads.sourceforge.net/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz - videos? ( https://downloads.sourceforge.net/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 - media-libs/opusfile - net-libs/miniupnpc:= - net-misc/curl - virtual/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 - "${FILESDIR}"/${PN}-4.5.5-gcc15-cstdint.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() { - # ODR violations (bison, yy_*, bug #859268) - filter-lto - - # TODO: unbundle dev-cpp/nlohmann_json - # TODO: unbundle dev-libs/libfmt - # TODO: unbundle SQLiteCpp - # TODO: unbundle dev-libs/inih - 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.6.1.ebuild b/games-strategy/warzone2100/warzone2100-4.6.1.ebuild deleted file mode 100644 index 6c65f2b603cba..0000000000000 --- a/games-strategy/warzone2100/warzone2100-4.6.1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="ar_SA 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 it ja_JP ko la lt my_MM nb nl pl pt pt_BR ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW" -inherit cmake flag-o-matic 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=" - https://downloads.sourceforge.net/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz - videos? ( https://downloads.sourceforge.net/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:= - dev-libs/libzip:= - >=dev-libs/protobuf-2.6.1:= - 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 - media-libs/opusfile - net-libs/miniupnpc:= - net-misc/curl - virtual/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.6.1-clang-fmt-stdlib-include.patch - "${FILESDIR}"/${PN}-4.6.1-protobuf-absl-linkage.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() { - # ODR violations (bison, yy_*, bug #859268) - filter-lto - - # TODO: unbundle dev-cpp/nlohmann_json - # TODO: unbundle dev-libs/libfmt - # TODO: unbundle SQLiteCpp - # TODO: unbundle dev-libs/inih - 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 -}