| 1 |
commit: de326e9375f68d8fd83d85a9fccc7ef2b3b19eb1 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 26 09:04:57 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 31 11:24:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de326e93 |
| 7 |
|
| 8 |
eclass: Remove remaining uses of epause and ebeep. |
| 9 |
|
| 10 |
These functions are long deprecated and only defined in EAPIs 0 to 2. |
| 11 |
|
| 12 |
eclass/gnatbuild-r1.eclass | 1 - |
| 13 |
eclass/gnatbuild.eclass | 1 - |
| 14 |
eclass/kernel-2.eclass | 2 -- |
| 15 |
eclass/linux-info.eclass | 3 +-- |
| 16 |
eclass/webapp.eclass | 5 +---- |
| 17 |
5 files changed, 2 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/gnatbuild-r1.eclass b/eclass/gnatbuild-r1.eclass |
| 20 |
index cdc64a3fe7c..236a9aa1ce1 100644 |
| 21 |
--- a/eclass/gnatbuild-r1.eclass |
| 22 |
+++ b/eclass/gnatbuild-r1.eclass |
| 23 |
@@ -313,7 +313,6 @@ should_we_eselect_gnat() { |
| 24 |
echo |
| 25 |
elog "eselect gnat set <profile>" |
| 26 |
echo |
| 27 |
- ebeep |
| 28 |
return 1 |
| 29 |
fi |
| 30 |
} |
| 31 |
|
| 32 |
diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass |
| 33 |
index 5d485c9338c..da72f554439 100644 |
| 34 |
--- a/eclass/gnatbuild.eclass |
| 35 |
+++ b/eclass/gnatbuild.eclass |
| 36 |
@@ -237,7 +237,6 @@ should_we_eselect_gnat() { |
| 37 |
echo |
| 38 |
elog "eselect gnat set <profile>" |
| 39 |
echo |
| 40 |
- ebeep |
| 41 |
return 1 |
| 42 |
fi |
| 43 |
} |
| 44 |
|
| 45 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
| 46 |
index 6ffbd37f300..94937b6630b 100644 |
| 47 |
--- a/eclass/kernel-2.eclass |
| 48 |
+++ b/eclass/kernel-2.eclass |
| 49 |
@@ -749,7 +749,6 @@ unpack_2_6() { |
| 50 |
touch .config |
| 51 |
eerror "make defconfig failed." |
| 52 |
eerror "assuming you dont have any headers installed yet and continuing" |
| 53 |
- epause 5 |
| 54 |
fi |
| 55 |
|
| 56 |
make -s include/linux/version.h ${xmakeopts} 2>/dev/null \ |
| 57 |
@@ -1607,7 +1606,6 @@ kernel-2_pkg_setup() { |
| 58 |
ewarn "Also be aware that bugreports about gcc-4 not working" |
| 59 |
ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" |
| 60 |
echo |
| 61 |
- epause 10 |
| 62 |
fi |
| 63 |
fi |
| 64 |
|
| 65 |
|
| 66 |
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass |
| 67 |
index 035b722e2d6..dd62b26855d 100644 |
| 68 |
--- a/eclass/linux-info.eclass |
| 69 |
+++ b/eclass/linux-info.eclass |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-# Copyright 1999-2016 Gentoo Foundation |
| 72 |
+# Copyright 1999-2018 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
# @ECLASS: linux-info.eclass |
| 76 |
@@ -914,7 +914,6 @@ linux-info_pkg_setup() { |
| 77 |
ewarn "Also be aware that bugreports about gcc-4 not working" |
| 78 |
ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" |
| 79 |
echo |
| 80 |
- epause 10 |
| 81 |
fi |
| 82 |
fi |
| 83 |
|
| 84 |
|
| 85 |
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass |
| 86 |
index c80674d3b13..8983af334ab 100644 |
| 87 |
--- a/eclass/webapp.eclass |
| 88 |
+++ b/eclass/webapp.eclass |
| 89 |
@@ -1,4 +1,4 @@ |
| 90 |
-# Copyright 1999-2015 Gentoo Foundation |
| 91 |
+# Copyright 1999-2018 Gentoo Foundation |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
|
| 94 |
# @ECLASS: webapp.eclass |
| 95 |
@@ -411,9 +411,6 @@ webapp_pkg_setup() { |
| 96 |
ewarn "This ebuild may be overwriting important files." |
| 97 |
ewarn |
| 98 |
echo |
| 99 |
- if has "${EAPI:-0}" 0 1 2; then |
| 100 |
- ebeep 10 |
| 101 |
- fi |
| 102 |
elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then |
| 103 |
echo |
| 104 |
eerror "You already have ${my_output} installed in ${my_dir}" |
Archives