From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sat, 28 Dec 2019 14:08:20 +0000 (+0000)
Subject: app-emulation/ski: block against games-sports/ski
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c545f1bda9cf9bfb09635c8c4ed4fb3edc48db3;p=gentoo.git

app-emulation/ski: block against games-sports/ski

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/653110
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---

diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild
index a6551f5c0b89..1063017aad06 100644
--- a/app-emulation/ski/ski-1.3.2-r3.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	dev-util/gperf"
 
+# games-sports/ski and app-emulation/ski both install 'ski' binary, bug #653110
+RDEPEND="${RDEPEND} !!games-sports/ski"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-syscall-linux-includes.patch
 	"${FILESDIR}"/${P}-remove-hayes.patch