From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F90F1382C5 for ; Wed, 2 May 2018 08:34:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DE22E0976; Wed, 2 May 2018 08:34:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C7DFE0976 for ; Wed, 2 May 2018 08:34:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC8C7335C7A for ; Wed, 2 May 2018 08:34:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37B8D2A4 for ; Wed, 2 May 2018 08:34:27 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1525250060.9e1ec3634241d918a3a133e52efba38f4cb95b2c.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/nano/nano-2.9.6.ebuild app-editors/nano/nano-9999.ebuild X-VCS-Directories: app-editors/nano/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9e1ec3634241d918a3a133e52efba38f4cb95b2c X-VCS-Branch: master Date: Wed, 2 May 2018 08:34:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1b0c8f5a-8bb9-4906-9041-571fa36c67b8 X-Archives-Hash: 7892da628f09eaf8802bc9e0342da892 commit: 9e1ec3634241d918a3a133e52efba38f4cb95b2c Author: Lars Wendler gentoo org> AuthorDate: Wed May 2 08:34:03 2018 +0000 Commit: Lars Wendler gentoo 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