summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-12-28 14:08:20 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-12-28 16:22:24 +0000
commit6c545f1bda9cf9bfb09635c8c4ed4fb3edc48db3 (patch)
tree6c88e986944a91d30c8a3d9d3082f3c9d6999513 /app-emulation
parentapp-emulation/ski: drop old (diff)
downloadgentoo-6c545f1bda9cf9bfb09635c8c4ed4fb3edc48db3.tar.gz
gentoo-6c545f1bda9cf9bfb09635c8c4ed4fb3edc48db3.tar.bz2
gentoo-6c545f1bda9cf9bfb09635c8c4ed4fb3edc48db3.zip
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>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/ski/ski-1.3.2-r3.ebuild5
1 files changed, 4 insertions, 1 deletions
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