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 41422158003 for ; Fri, 22 Oct 2021 21:00:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 635B9E0391; Fri, 22 Oct 2021 20:59:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 484B8E0391 for ; Fri, 22 Oct 2021 20:59:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0688D343126 for ; Fri, 22 Oct 2021 20:59:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7574BDC for ; Fri, 22 Oct 2021 20:59:56 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1634936385.e404d6818cb47382e09284a27b576830f1d01175.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild X-VCS-Directories: games-emulation/dosbox-staging/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: e404d6818cb47382e09284a27b576830f1d01175 X-VCS-Branch: master Date: Fri, 22 Oct 2021 20:59:56 +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: a74ac9e6-8ba0-4b9d-bdbd-3c82b0d5f32d X-Archives-Hash: 835980a1e486d9ff7ca050c6b8c3edb9 commit: e404d6818cb47382e09284a27b576830f1d01175 Author: Bernard Cafarelli gentoo org> AuthorDate: Fri Oct 22 20:59:28 2021 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Fri Oct 22 20:59:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e404d681 games-emulation/dosbox-staging: skip test failing on some platforms Also add USE=test logic for gtest dependency Closes: https://bugs.gentoo.org/817908 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild index 1cb6c2e10ce..1f48dd089fc 100644 --- a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild +++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl" +IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl test" RDEPEND="alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) @@ -28,7 +28,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) sys-libs/zlib !games-emulation/dosbox" DEPEND="${RDEPEND}" -BDEPEND="" +BDEPEND="test? ( dev-cpp/gtest )" DOCS=( AUTHORS README THANKS ) @@ -41,6 +41,10 @@ src_prepare() { # Disable license and docs install (handled by ebuild) sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die + + # Test failing on some platforms, bug #817908 + # https://github.com/dosbox-staging/dosbox-staging/issues/1230 + sed -i 's/.*soft_limit.*//' tests/meson.build || die } src_configure() { @@ -52,6 +56,7 @@ src_configure() { $(meson_use mt-32 use_mt32emu) $(meson_use network use_sdl2_net) $(meson_use opengl use_opengl) + $(meson_feature test unit_tests) ) meson_src_configure }