From: Ulrich Müller <ulm@gentoo.org>
Date: Sat, 26 May 2018 09:04:57 +0000 (+0200)
Subject: eclass: Remove remaining uses of epause and ebeep.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=de326e9375f68d8fd83d85a9fccc7ef2b3b19eb1;p=gentoo.git

eclass: Remove remaining uses of epause and ebeep.

These functions are long deprecated and only defined in EAPIs 0 to 2.
---

diff --git a/eclass/gnatbuild-r1.eclass b/eclass/gnatbuild-r1.eclass
index cdc64a3fe7c6..236a9aa1ce16 100644
--- a/eclass/gnatbuild-r1.eclass
+++ b/eclass/gnatbuild-r1.eclass
@@ -313,7 +313,6 @@ should_we_eselect_gnat() {
 		echo
 		elog "eselect gnat set <profile>"
 		echo
-		ebeep
 		return 1
 	fi
 }
diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
index 5d485c9338ca..da72f554439d 100644
--- a/eclass/gnatbuild.eclass
+++ b/eclass/gnatbuild.eclass
@@ -237,7 +237,6 @@ should_we_eselect_gnat() {
 		echo
 		elog "eselect gnat set <profile>"
 		echo
-		ebeep
 		return 1
 	fi
 }
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 6ffbd37f300e..94937b6630ba 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -749,7 +749,6 @@ unpack_2_6() {
 		touch .config
 		eerror "make defconfig failed."
 		eerror "assuming you dont have any headers installed yet and continuing"
-		epause 5
 	fi
 
 	make -s include/linux/version.h ${xmakeopts} 2>/dev/null \
@@ -1607,7 +1606,6 @@ kernel-2_pkg_setup() {
 			ewarn "Also be aware that bugreports about gcc-4 not working"
 			ewarn "with linux-2.4 based ebuilds will be closed as INVALID!"
 			echo
-			epause 10
 		fi
 	fi
 
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 035b722e2d6d..dd62b26855d2 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: linux-info.eclass
@@ -914,7 +914,6 @@ linux-info_pkg_setup() {
 			ewarn "Also be aware that bugreports about gcc-4 not working"
 			ewarn "with linux-2.4 based ebuilds will be closed as INVALID!"
 			echo
-			epause 10
 		fi
 	fi
 
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index c80674d3b13e..8983af334ab8 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: webapp.eclass
@@ -411,9 +411,6 @@ webapp_pkg_setup() {
 		ewarn "This ebuild may be overwriting important files."
 		ewarn
 		echo
-		if has "${EAPI:-0}" 0 1 2; then
-			ebeep 10
-		fi
 	elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then
 		echo
 		eerror "You already have ${my_output} installed in ${my_dir}"