From 6c545f1bda9cf9bfb09635c8c4ed4fb3edc48db3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 28 Dec 2019 14:08:20 +0000 Subject: [PATCH] app-emulation/ski: block against games-sports/ski MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- app-emulation/ski/ski-1.3.2-r3.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.26.2