commit:     4f0586fb53f1caacf2f7920eb0dae9fe80282c0b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 16:29:24 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 16:29:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0586fb

app-editors/nano: Don't move configs with USE="minimal"

Reported-by: Dragan Kašler <dragan.kasler <AT> gmail.com>
Closes: https://bugs.gentoo.org/737244
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-editors/nano/nano-5.0-r1.ebuild | 12 ++++++------
 app-editors/nano/nano-5.1.ebuild    | 12 ++++++------
 app-editors/nano/nano-9999.ebuild   | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app-editors/nano/nano-5.0-r1.ebuild 
b/app-editors/nano/nano-5.0-r1.ebuild
index 1a12756b35a..86f22534c12 100644
--- a/app-editors/nano/nano-5.0-r1.ebuild
+++ b/app-editors/nano/nano-5.0-r1.ebuild
@@ -77,13 +77,13 @@ src_install() {
                sed -i \
                        -e '/^# include /s:# *::' \
                        "${ED}"/etc/nanorc || die
-       fi
 
-       # Since nano-5.0 these are no longer being "enabled" by default
-       # (bug #736848)
-       local rcdir="/usr/share/nano"
-       mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-       rmdir "${ED}"${rcdir}/extra || die
+               # Since nano-5.0 these are no longer being "enabled" by default
+               # (bug #736848)
+               local rcdir="/usr/share/nano"
+               mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+               rmdir "${ED}"${rcdir}/extra || die
+       fi
 
        use split-usr && dosym ../../bin/nano /usr/bin/nano
 }

diff --git a/app-editors/nano/nano-5.1.ebuild b/app-editors/nano/nano-5.1.ebuild
index 1a12756b35a..86f22534c12 100644
--- a/app-editors/nano/nano-5.1.ebuild
+++ b/app-editors/nano/nano-5.1.ebuild
@@ -77,13 +77,13 @@ src_install() {
                sed -i \
                        -e '/^# include /s:# *::' \
                        "${ED}"/etc/nanorc || die
-       fi
 
-       # Since nano-5.0 these are no longer being "enabled" by default
-       # (bug #736848)
-       local rcdir="/usr/share/nano"
-       mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-       rmdir "${ED}"${rcdir}/extra || die
+               # Since nano-5.0 these are no longer being "enabled" by default
+               # (bug #736848)
+               local rcdir="/usr/share/nano"
+               mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+               rmdir "${ED}"${rcdir}/extra || die
+       fi
 
        use split-usr && dosym ../../bin/nano /usr/bin/nano
 }

diff --git a/app-editors/nano/nano-9999.ebuild 
b/app-editors/nano/nano-9999.ebuild
index 1a12756b35a..86f22534c12 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -77,13 +77,13 @@ src_install() {
                sed -i \
                        -e '/^# include /s:# *::' \
                        "${ED}"/etc/nanorc || die
-       fi
 
-       # Since nano-5.0 these are no longer being "enabled" by default
-       # (bug #736848)
-       local rcdir="/usr/share/nano"
-       mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-       rmdir "${ED}"${rcdir}/extra || die
+               # Since nano-5.0 these are no longer being "enabled" by default
+               # (bug #736848)
+               local rcdir="/usr/share/nano"
+               mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+               rmdir "${ED}"${rcdir}/extra || die
+       fi
 
        use split-usr && dosym ../../bin/nano /usr/bin/nano
 }

Reply via email to