1 |
commit: 9e1ec3634241d918a3a133e52efba38f4cb95b2c |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 2 08:34:03 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 2 08:34:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1ec363 |
7 |
|
8 |
app-editors/nano: Fixed prefix installations. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/654534 |
11 |
Package-Manager: Portage-2.3.33, Repoman-2.3.9 |
12 |
|
13 |
app-editors/nano/nano-2.9.6.ebuild | 3 ++- |
14 |
app-editors/nano/nano-9999.ebuild | 3 ++- |
15 |
2 files changed, 4 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/app-editors/nano/nano-2.9.6.ebuild b/app-editors/nano/nano-2.9.6.ebuild |
18 |
index 2b29359919a..a0bec925c03 100644 |
19 |
--- a/app-editors/nano/nano-2.9.6.ebuild |
20 |
+++ b/app-editors/nano/nano-2.9.6.ebuild |
21 |
@@ -64,7 +64,8 @@ src_configure() { |
22 |
|
23 |
src_install() { |
24 |
default |
25 |
- rm -rf "${ED%/}"/trash |
26 |
+ # don't use "${ED}" here or things break (#654534) |
27 |
+ rm -r "${D%/}"/trash || die |
28 |
|
29 |
dodoc doc/sample.nanorc |
30 |
docinto html |
31 |
|
32 |
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild |
33 |
index 2b29359919a..a0bec925c03 100644 |
34 |
--- a/app-editors/nano/nano-9999.ebuild |
35 |
+++ b/app-editors/nano/nano-9999.ebuild |
36 |
@@ -64,7 +64,8 @@ src_configure() { |
37 |
|
38 |
src_install() { |
39 |
default |
40 |
- rm -rf "${ED%/}"/trash |
41 |
+ # don't use "${ED}" here or things break (#654534) |
42 |
+ rm -r "${D%/}"/trash || die |
43 |
|
44 |
dodoc doc/sample.nanorc |
45 |
docinto html |