Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH] eclass: Remove remaining uses of epause and ebeep.
Date: Sat, 26 May 2018 09:09:28
Message-Id: 23305.9273.490812.614265@a1i15.kph.uni-mainz.de
1 These functions are long deprecated and only defined in EAPIs 0 to 2.
2 ---
3 eclass/gnatbuild-r1.eclass | 1 -
4 eclass/gnatbuild.eclass | 1 -
5 eclass/kernel-2.eclass | 2 --
6 eclass/linux-info.eclass | 3 +--
7 eclass/webapp.eclass | 5 +----
8 5 files changed, 2 insertions(+), 10 deletions(-)
9
10 diff --git a/eclass/gnatbuild-r1.eclass b/eclass/gnatbuild-r1.eclass
11 index cdc64a3fe7c6..236a9aa1ce16 100644
12 --- a/eclass/gnatbuild-r1.eclass
13 +++ b/eclass/gnatbuild-r1.eclass
14 @@ -313,7 +313,6 @@ should_we_eselect_gnat() {
15 echo
16 elog "eselect gnat set <profile>"
17 echo
18 - ebeep
19 return 1
20 fi
21 }
22 diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
23 index 5d485c9338ca..da72f554439d 100644
24 --- a/eclass/gnatbuild.eclass
25 +++ b/eclass/gnatbuild.eclass
26 @@ -237,7 +237,6 @@ should_we_eselect_gnat() {
27 echo
28 elog "eselect gnat set <profile>"
29 echo
30 - ebeep
31 return 1
32 fi
33 }
34 diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
35 index 6ffbd37f300e..94937b6630ba 100644
36 --- a/eclass/kernel-2.eclass
37 +++ b/eclass/kernel-2.eclass
38 @@ -749,7 +749,6 @@ unpack_2_6() {
39 touch .config
40 eerror "make defconfig failed."
41 eerror "assuming you dont have any headers installed yet and continuing"
42 - epause 5
43 fi
44
45 make -s include/linux/version.h ${xmakeopts} 2>/dev/null \
46 @@ -1607,7 +1606,6 @@ kernel-2_pkg_setup() {
47 ewarn "Also be aware that bugreports about gcc-4 not working"
48 ewarn "with linux-2.4 based ebuilds will be closed as INVALID!"
49 echo
50 - epause 10
51 fi
52 fi
53
54 diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
55 index 035b722e2d6d..dd62b26855d2 100644
56 --- a/eclass/linux-info.eclass
57 +++ b/eclass/linux-info.eclass
58 @@ -1,4 +1,4 @@
59 -# Copyright 1999-2016 Gentoo Foundation
60 +# Copyright 1999-2018 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62
63 # @ECLASS: linux-info.eclass
64 @@ -914,7 +914,6 @@ linux-info_pkg_setup() {
65 ewarn "Also be aware that bugreports about gcc-4 not working"
66 ewarn "with linux-2.4 based ebuilds will be closed as INVALID!"
67 echo
68 - epause 10
69 fi
70 fi
71
72 diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
73 index c80674d3b13e..8983af334ab8 100644
74 --- a/eclass/webapp.eclass
75 +++ b/eclass/webapp.eclass
76 @@ -1,4 +1,4 @@
77 -# Copyright 1999-2015 Gentoo Foundation
78 +# Copyright 1999-2018 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80
81 # @ECLASS: webapp.eclass
82 @@ -411,9 +411,6 @@ webapp_pkg_setup() {
83 ewarn "This ebuild may be overwriting important files."
84 ewarn
85 echo
86 - if has "${EAPI:-0}" 0 1 2; then
87 - ebeep 10
88 - fi
89 elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then
90 echo
91 eerror "You already have ${my_output} installed in ${my_dir}"
92 --
93 2.17.0

Replies