[gentoo-commits] repo/gentoo:master commit in: app-editors/nano/

[Lars Wendler]

commit:     b46440b989c5e231b9de67b3b377309f3d2c1cc6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 14:42:35 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 14:42:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46440b9

app-editors/nano: Synced live ebuild.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-editors/nano/nano-9999.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-editors/nano/nano-9999.ebuild 
b/app-editors/nano/nano-9999.ebuild
index 0aed36a7b0e..2b29359919a 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
        inherit git-r3 autotools
 else
-       MY_P=${PN}-${PV/_}
+       MY_P="${PN}-${PV/_}"
        SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
@@ -32,10 +32,10 @@ DEPEND="${RDEPEND}
        static? ( ${LIB_DEPEND} )"
 
 src_prepare() {
+       default
        if [[ ${PV} == "9999" ]] ; then
                eautoreconf
        fi
-       default
 }
 
 src_configure() {
@@ -64,7 +64,7 @@ src_configure() {
 
 src_install() {
        default
-       rm -rf "${D}"/trash
+       rm -rf "${ED%/}"/trash
 
        dodoc doc/sample.nanorc
        docinto html
@@ -78,6 +78,5 @@ src_install() {
                        "${ED%/}"/etc/nanorc || die
        fi
 
-       dodir /usr/bin
        dosym ../../bin/nano /usr/bin/nano
 }