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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 099CC158090 for ; Fri, 20 May 2022 17:13:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30DE4E09C1; Fri, 20 May 2022 17:13:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FE35E09C1 for ; Fri, 20 May 2022 17:13:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87765341556 for ; Fri, 20 May 2022 17:13:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C94813BF for ; Fri, 20 May 2022 17:13:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1653066801.bb0768f7aaa59b762014a303218eda57dce2ed1c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-5.0_p20220520.ebuild games-emulation/dolphin/dolphin-9999.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bb0768f7aaa59b762014a303218eda57dce2ed1c X-VCS-Branch: master Date: Fri, 20 May 2022 17:13:47 +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: 26502e54-5a33-44e4-8048-9185a1f56a96 X-Archives-Hash: 40365d19b6bab94acfb883c26e6b42fb commit: bb0768f7aaa59b762014a303218eda57dce2ed1c Author: Michał Górny gentoo org> AuthorDate: Fri May 20 17:13:21 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri May 20 17:13:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0768f7 games-emulation/dolphin: Do not remove mgba in 9999 Thanks to xarblu for the suggestion. Closes: https://bugs.gentoo.org/846578 Signed-off-by: Michał Górny gentoo.org> games-emulation/dolphin/dolphin-5.0_p20220520.ebuild | 2 +- games-emulation/dolphin/dolphin-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild index 582306b2f5a3..d01848ded241 100644 --- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild +++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild @@ -117,7 +117,7 @@ declare -A KEEP_BUNDLED=( ) src_prepare() { - if use mgba; then + if use mgba && [[ ${PV} != *9999 ]]; then rmdir Externals/mGBA/mgba || die mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die fi diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index 69da69fee18f..d888afe15b4d 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -117,7 +117,7 @@ declare -A KEEP_BUNDLED=( ) src_prepare() { - if use mgba; then + if use mgba && [[ ${PV} != *9999 ]]; then rmdir Externals/mGBA/mgba || die mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die fi