Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-sports/ski/
Date: Sat, 28 Dec 2019 16:22:35
Message-Id: 1577550145.fcf420cef2b96b7e91fc46eba1e6387a1d908b83.slyfox@gentoo
1 commit: fcf420cef2b96b7e91fc46eba1e6387a1d908b83
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 28 14:09:13 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 16:22:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf420ce
7
8 games-sports/ski: block against app-emulation/ski
9
10 Reported-by: Toralf Förster
11 Closes: https://bugs.gentoo.org/653110
12 Package-Manager: Portage-2.3.84, Repoman-2.3.20
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 games-sports/ski/ski-6.9-r1.ebuild | 5 ++++-
16 1 file changed, 4 insertions(+), 1 deletion(-)
17
18 diff --git a/games-sports/ski/ski-6.9-r1.ebuild b/games-sports/ski/ski-6.9-r1.ebuild
19 index e817d5cc360..cc6f6bd7884 100644
20 --- a/games-sports/ski/ski-6.9-r1.ebuild
21 +++ b/games-sports/ski/ski-6.9-r1.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2017 Gentoo Foundation
24 +# Copyright 1999-2019 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 @@ -20,6 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
29 RDEPEND="${PYTHON_DEPS}"
30 DEPEND="${RDEPEND}"
31
32 +# games-sports/ski and app-emulation/ski both install 'ski' binary, bug #653110
33 +RDEPEND="${RDEPEND} !!games-sports/ski"
34 +
35 src_install() {
36 dobin ski
37 dodoc NEWS README