Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/
Date: Sat, 08 Feb 2020 16:25:08
Message-Id: 1581178988.3228f943629c89784fa4a2136ea8f26b0a5df284.soap@gentoo
1 commit: 3228f943629c89784fa4a2136ea8f26b0a5df284
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 8 16:23:08 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 8 16:23:08 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3228f943
7
8 net-misc/iputils: [QA] Fix UnnecessarySlashStrip
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 net-misc/iputils/iputils-20190709.ebuild | 6 +++---
13 net-misc/iputils/iputils-99999999.ebuild | 6 +++---
14 2 files changed, 6 insertions(+), 6 deletions(-)
15
16 diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild
17 index 3d4c44ef2ce..1c478e19659 100644
18 --- a/net-misc/iputils/iputils-20190709.ebuild
19 +++ b/net-misc/iputils/iputils-20190709.ebuild
20 @@ -142,7 +142,7 @@ src_install() {
21 dodir /bin
22 local my_bin
23 for my_bin in $(usex arping arping '') ping ; do
24 - mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
25 + mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
26 done
27 dosym ping /bin/ping4
28
29 @@ -175,7 +175,7 @@ src_install() {
30 if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
31 html_man_pages+=( ${my_bin}.html )
32 fi
33 - done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
34 + done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
35
36 pushd doc &>/dev/null || die
37 doman "${man_pages[@]}"
38 @@ -186,7 +186,7 @@ src_install() {
39 popd &>/dev/null || die
40 else
41 if use doc ; then
42 - mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
43 + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
44 fi
45 fi
46 }
47
48 diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
49 index b017e1a7fb9..228cbf54370 100644
50 --- a/net-misc/iputils/iputils-99999999.ebuild
51 +++ b/net-misc/iputils/iputils-99999999.ebuild
52 @@ -142,7 +142,7 @@ src_install() {
53 dodir /bin
54 local my_bin
55 for my_bin in $(usex arping arping '') ping ; do
56 - mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
57 + mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
58 done
59 dosym ping /bin/ping4
60
61 @@ -175,7 +175,7 @@ src_install() {
62 if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
63 html_man_pages+=( ${my_bin}.html )
64 fi
65 - done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
66 + done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
67
68 pushd doc &>/dev/null || die
69 doman "${man_pages[@]}"
70 @@ -186,7 +186,7 @@ src_install() {
71 popd &>/dev/null || die
72 else
73 if use doc ; then
74 - mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
75 + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
76 fi
77 fi
78 }