commit: 67175eea75b5169e347d5e6c1a62c7a1fd47e2ef Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Nov 9 09:36:31 2024 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Nov 9 09:41:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67175eea
games-strategy/wesnoth: drop 1.16.10, 1.18.0 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> games-strategy/wesnoth/Manifest | 2 - .../wesnoth/files/wesnoth-1.16.10-boost-1.83.patch | 26 ----- .../wesnoth/files/wesnoth-1.18.0-boost-1.85.patch | 12 --- games-strategy/wesnoth/wesnoth-1.16.10.ebuild | 106 -------------------- games-strategy/wesnoth/wesnoth-1.18.0.ebuild | 111 --------------------- 5 files changed, 257 deletions(-) diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 9dd0fb2d2380..f396b6286ee7 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,5 +1,3 @@ -DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 7aaed481607bc58e9d0f22e4c4a36f24f19b4fc522ce3c1eb6366e70e3bd901a10f055d2add9dc1c73519368fd4a31cd6b326e42b1be0023eeda370076db0742 SHA512 0473ec4e4b7a33a37c2ff52b4e0c3dccec2e58a087517566967409dda03952127bf560b09cfccc7243f506201d98980aafdf289b7f1e5345a7e3b4316a908240 -DIST wesnoth-1.18.0.tar.bz2 460686063 BLAKE2B 9dd898a6b430999873ae001dad47b2bcadcbbfc4672bf4489533c0268a4bf982a4e4451f79bf62bb1ac66d4ba2f06b62484b2b1b1fccb2e434c4ceef95a2c2bc SHA512 7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2 DIST wesnoth-1.18.2.tar.bz2 461290798 BLAKE2B 6ff9538eca7f65e7413d9b220b07b5f76ad14b7853cb2b33195098f01544a6e3ba2603f927c55c2f5a42a4b3c148655483610beab985332737c4e0cf54be15df SHA512 de4d8ceaf29a93c174e9f832825542885bb90c4f481b6b248cc875cb0b1054435df3c2080c7693842b5e857af091e9219fa10b702d4fe63757f3d28871b63d4c DIST wesnoth-1.18.3.tar.bz2 461694247 BLAKE2B 1998e2fdff56271dd86c390e3c25dcbaa98b4f131f15584e5d3f2f5866856a69aebf9c8d97b1126601b3e08467a9410f3ba7b53c253737c6bbf62ccb1e9ba96f SHA512 def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a DIST wesnoth-1.19.1.tar.bz2 461918324 BLAKE2B 8fa97526831e14957449a0b33909b7d155be00659d9543efbea34bd7935fb05b4e99a419dcc2e9c426a2e0fb4fb1d40c2972236d0da5a1661970eb80103f04fc SHA512 73ab7d474b01ac753224f0c694a86679a28160e340a07d87b8f96398df2c39c39df95098b750516e7e69851843e68954b5939ae68dc3a232ec2e9cad256d1113 diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch deleted file mode 100644 index 2c9e55db0472..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 136e651d69fc91fa7a4154f8a4a7e977cc46eca4 Mon Sep 17 00:00:00 2001 -From: Pentarctagon <[email protected]> -Date: Thu, 17 Aug 2023 23:19:21 -0500 -Subject: [PATCH] Compile fix for boost 1.83. - -Fixes #7849 ---- - src/gettext.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gettext.cpp b/src/gettext.cpp -index 9888dede35ad..fa9b17ba85b2 100644 ---- a/src/gettext.cpp -+++ b/src/gettext.cpp -@@ -169,7 +169,11 @@ namespace - return msg; - } - -+#if BOOST_VERSION < 108300 - const char* get(int domain_id, const char* ctx, const char* sid, int n) const override -+#else -+ const char* get(int domain_id, const char* ctx, const char* sid, bl::count_type n) const override -+#endif - { - auto& base = get_base(); - const char* msg = base.get(domain_id, ctx, sid, n); diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch deleted file mode 100644 index 412a4cf8e39d..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/932255 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -30,6 +30,7 @@ - #include "serialization/unicode.hpp" - #include "utils/general.hpp" - -+#include <boost/filesystem/directory.hpp> - #include <boost/filesystem/fstream.hpp> - #include <boost/iostreams/device/file_descriptor.hpp> - #include <boost/iostreams/stream.hpp> - diff --git a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild deleted file mode 100644 index cb9bc76bf65d..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="http://www.wesnoth.org - https://github.com/wesnoth/wesnoth"; -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# uneven minor versions are development versions -if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi -IUSE="dbus dedicated doc nls server" - -RDEPEND=" - acct-group/wesnoth - acct-user/wesnoth - dev-libs/boost:=[bzip2,context,icu,nls] - >=media-libs/libsdl2-2.0.4:0[joystick,video,X] - !dedicated? ( - dev-libs/glib:2 - dev-libs/openssl:0= - >=media-libs/fontconfig-2.4.1 - >=media-libs/sdl2-image-2.0.0[jpeg,png] - >=media-libs/sdl2-mixer-2.0.0[vorbis] - media-libs/libvorbis - >=x11-libs/pango-1.22.0 - >=x11-libs/cairo-1.10.0 - sys-libs/readline:0= - dbus? ( sys-apps/dbus ) - )" -DEPEND="${RDEPEND} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.16.10-boost-1.83.patch #912385 -) - -src_prepare() { - cmake_src_prepare - - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local lang langs=() - for lang in $(cat po/LINGUAS) ; do - has ${lang} ${LINGUAS} && langs+=( ${lang} ) - done - echo "${langs[@]}" > po/LINGUAS || die - fi -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - - local mycmakeargs=() - - if use dedicated || use server ; then - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="ON" - -DENABLE_SERVER="ON" - -DSERVER_UID="${PN}" - -DSERVER_GID="${PN}" - -DFIFO_DIR="/run/wesnothd" - ) - else - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="OFF" - -DENABLE_SERVER="OFF" - ) - fi - mycmakeargs+=( - -Wno-dev - -DENABLE_GAME="$(usex !dedicated)" - -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_STRICT_COMPILATION="OFF" - ) - cmake_src_configure -} - -src_install() { - local DOCS=( README.md changelog.md ) - cmake_src_install - if use dedicated || use server ; then - rmdir "${ED}"/run{/wesnothd,} || die - newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd - fi -} diff --git a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild deleted file mode 100644 index 1843a5985958..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="http://www.wesnoth.org - https://github.com/wesnoth/wesnoth"; -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -# uneven minor versions are development versions -if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi -IUSE="dbus dedicated doc nls server" - -RDEPEND=" - acct-group/wesnoth - acct-user/wesnoth - dev-libs/boost:=[bzip2,context,icu,nls] - >=media-libs/libsdl2-2.0.4:0[joystick,video,X] - !dedicated? ( - dev-libs/glib:2 - dev-libs/openssl:0= - >=media-libs/fontconfig-2.4.1 - >=media-libs/sdl2-image-2.0.0[jpeg,png,webp] - >=media-libs/sdl2-mixer-2.0.0[vorbis] - media-libs/libvorbis - >=x11-libs/pango-1.22.0 - >=x11-libs/cairo-1.10.0 - sys-libs/readline:0= - dbus? ( sys-apps/dbus ) - )" -DEPEND="${RDEPEND} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/wesnoth-1.18.0-boost-1.85.patch -) - -src_prepare() { - cmake_src_prepare - - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local lang langs=() - for lang in $(cat po/LINGUAS) ; do - has ${lang} ${LINGUAS} && langs+=( ${lang} ) - done - echo "${langs[@]}" > po/LINGUAS || die - fi -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - - local mycmakeargs=() - - if use dedicated || use server ; then - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="ON" - -DENABLE_SERVER="ON" - -DSERVER_UID="${PN}" - -DSERVER_GID="${PN}" - -DFIFO_DIR="/run/wesnothd" - ) - else - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="OFF" - -DENABLE_SERVER="OFF" - ) - fi - mycmakeargs+=( - -Wno-dev - -DENABLE_GAME="$(usex !dedicated)" - -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_STRICT_COMPILATION="OFF" - ) - cmake_src_configure -} - -src_test() { - # Allow SDL_Mixer test to pass, bug #931551 - SDL_AUDIODRIVER=dummy cmake_src_test -} - -src_install() { - local DOCS=( README.md changelog.md ) - cmake_src_install - if use dedicated || use server ; then - rmdir "${ED}"/run{/wesnothd,} || die - newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd - fi -}
