1 |
Drop an unnecessary die statement. Adjust some quotation marks. |
2 |
|
3 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
4 |
--- |
5 |
eclass/preserve-libs.eclass | 16 ++++++---------- |
6 |
1 file changed, 6 insertions(+), 10 deletions(-) |
7 |
|
8 |
diff --git a/eclass/preserve-libs.eclass b/eclass/preserve-libs.eclass |
9 |
index da13e7943add..df07e511c130 100644 |
10 |
--- a/eclass/preserve-libs.eclass |
11 |
+++ b/eclass/preserve-libs.eclass |
12 |
@@ -1,4 +1,4 @@ |
13 |
-# Copyright 1999-2021 Gentoo Authors |
14 |
+# Copyright 1999-2022 Gentoo Authors |
15 |
# Distributed under the terms of the GNU General Public License v2 |
16 |
|
17 |
# @ECLASS: preserve-libs.eclass |
18 |
@@ -7,8 +7,8 @@ |
19 |
# @SUPPORTED_EAPIS: 5 6 7 |
20 |
# @BLURB: preserve libraries after SONAME changes |
21 |
|
22 |
-case ${EAPI:-0} in |
23 |
- [567]) ;; |
24 |
+case ${EAPI} in |
25 |
+ 5|6|7) ;; |
26 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
27 |
esac |
28 |
|
29 |
@@ -34,15 +34,13 @@ preserve_old_lib() { |
30 |
# let portage worry about it |
31 |
has preserve-libs ${FEATURES} && return 0 |
32 |
|
33 |
- has "${EAPI:-0}" 0 1 2 && local ED=${D} EROOT=${ROOT} |
34 |
- |
35 |
local lib dir |
36 |
for lib in "$@" ; do |
37 |
[[ -e ${EROOT}/${lib} ]] || continue |
38 |
dir=${lib%/*} |
39 |
- dodir ${dir} || die "dodir ${dir} failed" |
40 |
- cp "${EROOT}"/${lib} "${ED}"/${lib} || die "cp ${lib} failed" |
41 |
- touch "${ED}"/${lib} |
42 |
+ dodir "${dir}" |
43 |
+ cp "${EROOT}/${lib}" "${ED}/${lib}" || die "cp ${lib} failed" |
44 |
+ touch "${ED}/${lib}" |
45 |
done |
46 |
} |
47 |
|
48 |
@@ -59,8 +57,6 @@ preserve_old_lib_notify() { |
49 |
# let portage worry about it |
50 |
has preserve-libs ${FEATURES} && return 0 |
51 |
|
52 |
- has "${EAPI:-0}" 0 1 2 && local EROOT=${ROOT} |
53 |
- |
54 |
local lib notice=0 |
55 |
for lib in "$@" ; do |
56 |
[[ -e ${EROOT}/${lib} ]] || continue |
57 |
-- |
58 |
2.35.1 |