| 1 |
commit: 4f0586fb53f1caacf2f7920eb0dae9fe80282c0b |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 15 16:29:24 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 15 16:29:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0586fb |
| 7 |
|
| 8 |
app-editors/nano: Don't move configs with USE="minimal" |
| 9 |
|
| 10 |
Reported-by: Dragan Kašler <dragan.kasler <AT> gmail.com> |
| 11 |
Closes: https://bugs.gentoo.org/737244 |
| 12 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
app-editors/nano/nano-5.0-r1.ebuild | 12 ++++++------ |
| 16 |
app-editors/nano/nano-5.1.ebuild | 12 ++++++------ |
| 17 |
app-editors/nano/nano-9999.ebuild | 12 ++++++------ |
| 18 |
3 files changed, 18 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-editors/nano/nano-5.0-r1.ebuild b/app-editors/nano/nano-5.0-r1.ebuild |
| 21 |
index 1a12756b35a..86f22534c12 100644 |
| 22 |
--- a/app-editors/nano/nano-5.0-r1.ebuild |
| 23 |
+++ b/app-editors/nano/nano-5.0-r1.ebuild |
| 24 |
@@ -77,13 +77,13 @@ src_install() { |
| 25 |
sed -i \ |
| 26 |
-e '/^# include /s:# *::' \ |
| 27 |
"${ED}"/etc/nanorc || die |
| 28 |
- fi |
| 29 |
|
| 30 |
- # Since nano-5.0 these are no longer being "enabled" by default |
| 31 |
- # (bug #736848) |
| 32 |
- local rcdir="/usr/share/nano" |
| 33 |
- mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 34 |
- rmdir "${ED}"${rcdir}/extra || die |
| 35 |
+ # Since nano-5.0 these are no longer being "enabled" by default |
| 36 |
+ # (bug #736848) |
| 37 |
+ local rcdir="/usr/share/nano" |
| 38 |
+ mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 39 |
+ rmdir "${ED}"${rcdir}/extra || die |
| 40 |
+ fi |
| 41 |
|
| 42 |
use split-usr && dosym ../../bin/nano /usr/bin/nano |
| 43 |
} |
| 44 |
|
| 45 |
diff --git a/app-editors/nano/nano-5.1.ebuild b/app-editors/nano/nano-5.1.ebuild |
| 46 |
index 1a12756b35a..86f22534c12 100644 |
| 47 |
--- a/app-editors/nano/nano-5.1.ebuild |
| 48 |
+++ b/app-editors/nano/nano-5.1.ebuild |
| 49 |
@@ -77,13 +77,13 @@ src_install() { |
| 50 |
sed -i \ |
| 51 |
-e '/^# include /s:# *::' \ |
| 52 |
"${ED}"/etc/nanorc || die |
| 53 |
- fi |
| 54 |
|
| 55 |
- # Since nano-5.0 these are no longer being "enabled" by default |
| 56 |
- # (bug #736848) |
| 57 |
- local rcdir="/usr/share/nano" |
| 58 |
- mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 59 |
- rmdir "${ED}"${rcdir}/extra || die |
| 60 |
+ # Since nano-5.0 these are no longer being "enabled" by default |
| 61 |
+ # (bug #736848) |
| 62 |
+ local rcdir="/usr/share/nano" |
| 63 |
+ mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 64 |
+ rmdir "${ED}"${rcdir}/extra || die |
| 65 |
+ fi |
| 66 |
|
| 67 |
use split-usr && dosym ../../bin/nano /usr/bin/nano |
| 68 |
} |
| 69 |
|
| 70 |
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild |
| 71 |
index 1a12756b35a..86f22534c12 100644 |
| 72 |
--- a/app-editors/nano/nano-9999.ebuild |
| 73 |
+++ b/app-editors/nano/nano-9999.ebuild |
| 74 |
@@ -77,13 +77,13 @@ src_install() { |
| 75 |
sed -i \ |
| 76 |
-e '/^# include /s:# *::' \ |
| 77 |
"${ED}"/etc/nanorc || die |
| 78 |
- fi |
| 79 |
|
| 80 |
- # Since nano-5.0 these are no longer being "enabled" by default |
| 81 |
- # (bug #736848) |
| 82 |
- local rcdir="/usr/share/nano" |
| 83 |
- mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 84 |
- rmdir "${ED}"${rcdir}/extra || die |
| 85 |
+ # Since nano-5.0 these are no longer being "enabled" by default |
| 86 |
+ # (bug #736848) |
| 87 |
+ local rcdir="/usr/share/nano" |
| 88 |
+ mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 89 |
+ rmdir "${ED}"${rcdir}/extra || die |
| 90 |
+ fi |
| 91 |
|
| 92 |
use split-usr && dosym ../../bin/nano /usr/bin/nano |
| 93 |
} |
Archives