From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D708D158086 for ; Wed, 27 Oct 2021 13:28:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 314D9E08CD; Wed, 27 Oct 2021 13:28:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 150D0E08CD for ; Wed, 27 Oct 2021 13:28:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F23B13439C1 for ; Wed, 27 Oct 2021 13:28:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C10989 for ; Wed, 27 Oct 2021 13:28:05 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1635341139.33c9ee82b146a03aeb5d1a14addc6a28ef8fa2cc.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild games-strategy/wesnoth/wesnoth-1.16.0.ebuild X-VCS-Directories: games-strategy/wesnoth/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 33c9ee82b146a03aeb5d1a14addc6a28ef8fa2cc X-VCS-Branch: master Date: Wed, 27 Oct 2021 13:28:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01cac9b1-aab8-4adc-90ba-b53bdbfecb1f X-Archives-Hash: b928907f11e5d1eaa244425897a97c24 commit: 33c9ee82b146a03aeb5d1a14addc6a28ef8fa2cc Author: Ionen Wolkens gentoo org> AuthorDate: Wed Oct 27 11:44:50 2021 +0000 Commit: Ionen Wolkens gentoo 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 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 }