[gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-demodata/

[James Le Cuirot]

commit:     a1afbecce678dfd52b34b35b65984ad8645a43ee
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 17:43:02 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 14:37:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1afbecc

games-fps/quake1-demodata: [QA] Remove ebeep and epause calls.

Closes: https://bugs.gentoo.org/646172
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/quake1-demodata/quake1-demodata-1.06.ebuild | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index 7b8a34815e8..102d80da46f 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="symlink"
 
-RDEPEND=""
+RDEPEND="symlink? ( !games-fps/quake1-data )"
 DEPEND="app-arch/lha
 	app-arch/unzip"
 
@@ -30,13 +30,6 @@ pkg_setup() {
 	if has_version "games-fps/quake1-data" ; then
 		ewarn "games-fps/quake1-data already includes the demo data,"
 		ewarn "so this installation is not very useful."
-		echo
-		if use symlink ; then
-			eerror "The symlink for the demo data conflicts with the cdinstall data"
-			die "Remove the 'symlink' USE flag for this package"
-		fi
-		ebeep
-		epause
 	fi
 }