Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/
Date: Fri, 20 May 2022 17:13:54
Message-Id: 1653066801.bb0768f7aaa59b762014a303218eda57dce2ed1c.mgorny@gentoo
1 commit: bb0768f7aaa59b762014a303218eda57dce2ed1c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 20 17:13:21 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri May 20 17:13:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0768f7
7
8 games-emulation/dolphin: Do not remove mgba in 9999
9
10 Thanks to xarblu for the suggestion.
11
12 Closes: https://bugs.gentoo.org/846578
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 games-emulation/dolphin/dolphin-5.0_p20220520.ebuild | 2 +-
16 games-emulation/dolphin/dolphin-9999.ebuild | 2 +-
17 2 files changed, 2 insertions(+), 2 deletions(-)
18
19 diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
20 index 582306b2f5a3..d01848ded241 100644
21 --- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
22 +++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
23 @@ -117,7 +117,7 @@ declare -A KEEP_BUNDLED=(
24 )
25
26 src_prepare() {
27 - if use mgba; then
28 + if use mgba && [[ ${PV} != *9999 ]]; then
29 rmdir Externals/mGBA/mgba || die
30 mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
31 fi
32
33 diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
34 index 69da69fee18f..d888afe15b4d 100644
35 --- a/games-emulation/dolphin/dolphin-9999.ebuild
36 +++ b/games-emulation/dolphin/dolphin-9999.ebuild
37 @@ -117,7 +117,7 @@ declare -A KEEP_BUNDLED=(
38 )
39
40 src_prepare() {
41 - if use mgba; then
42 + if use mgba && [[ ${PV} != *9999 ]]; then
43 rmdir Externals/mGBA/mgba || die
44 mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
45 fi