commit:     9e1ec3634241d918a3a133e52efba38f4cb95b2c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 08:34:03 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May  2 08:34:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1ec363

app-editors/nano: Fixed prefix installations.

Closes: https://bugs.gentoo.org/654534
Package-Manager: Portage-2.3.33, Repoman-2.3.9

 app-editors/nano/nano-2.9.6.ebuild | 3 ++-
 app-editors/nano/nano-9999.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-editors/nano/nano-2.9.6.ebuild 
b/app-editors/nano/nano-2.9.6.ebuild
index 2b29359919a..a0bec925c03 100644
--- a/app-editors/nano/nano-2.9.6.ebuild
+++ b/app-editors/nano/nano-2.9.6.ebuild
@@ -64,7 +64,8 @@ src_configure() {
 
 src_install() {
        default
-       rm -rf "${ED%/}"/trash
+       # don't use "${ED}" here or things break (#654534)
+       rm -r "${D%/}"/trash || die
 
        dodoc doc/sample.nanorc
        docinto html

diff --git a/app-editors/nano/nano-9999.ebuild 
b/app-editors/nano/nano-9999.ebuild
index 2b29359919a..a0bec925c03 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -64,7 +64,8 @@ src_configure() {
 
 src_install() {
        default
-       rm -rf "${ED%/}"/trash
+       # don't use "${ED}" here or things break (#654534)
+       rm -r "${D%/}"/trash || die
 
        dodoc doc/sample.nanorc
        docinto html

Reply via email to