[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/

[Ionen Wolkens]

commit:     33c9ee82b146a03aeb5d1a14addc6a28ef8fa2cc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 11:44:50 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 13:25:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c9ee82

games-strategy/wesnoth: add missing dep on boost[bzip2,context]

[context] wrt bug #820470 is newly needed for server. However, it
still failed due to the coroutine removal seds. It's /possible/
to skip these with non-server but feels messy. Remove them and
unconditionally depend on [context] as upstream is expecting and
possibly avoid future issues.

May be older, but lacking [bzip2] also happened to cause failure.

Side-adjusted /run rmdir to avoid a QA warning. Likely other small
issues, did not do a thorough revision.

Closes: https://bugs.gentoo.org/820470
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../wesnoth/{wesnoth-1.16.0.ebuild => wesnoth-1.16.0-r1.ebuild}     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.16.0.ebuild b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
similarity index 92%
rename from games-strategy/wesnoth/wesnoth-1.16.0.ebuild
rename to games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
index c9a69554f39..0d53e174d56 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc nls server"
 RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
-	>=dev-libs/boost-1.50:=[nls,threads(+),icu]
+	dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
@@ -46,8 +46,6 @@ BDEPEND="
 src_prepare() {
 	cmake_src_prepare
 
-	sed 's@ coroutine@@' -i CMakeLists.txt || die
-	sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die
 	if ! use doc ; then
 		sed -i \
 			-e '/manual/d' \
@@ -100,7 +98,7 @@ src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake_src_install
 	if use dedicated || use server; then
-		rmdir "${ED}/run/wesnothd" || die
+		rmdir "${ED}"/run{/wesnothd,} || die
 		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
 	fi
 }