| 1 |
commit: 8412e9e79fd3cfa21099a2287fed58937edf74c7 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 2 22:28:47 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 2 22:28:47 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8412e9e7 |
| 7 |
|
| 8 |
app-editors/nano: bump to 5.4 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
app-editors/nano/Manifest | 1 + |
| 14 |
app-editors/nano/{nano-9999.ebuild => nano-5.4.ebuild} | 16 ++++++++++++++-- |
| 15 |
app-editors/nano/nano-9999.ebuild | 16 ++++++++++++++-- |
| 16 |
3 files changed, 29 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest |
| 19 |
index d0fe9c4999..2ab0b4f0e1 100644 |
| 20 |
--- a/app-editors/nano/Manifest |
| 21 |
+++ b/app-editors/nano/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST nano-2.7.3.tar.gz 2048675 BLAKE2B df7bb6b64b2b273e94e2584043f50292a646e76fee2aa634c5b8f25878ffab4b78320f25f9879fa97313b36463d58274020ea00cf2149168887684d3c7817314 SHA512 cd159cf193f05b37f770ac79e532fe96be158688d241ab7090861016fe0da9dde2ab504d0703b8feea8043e1deded3f10f0ab4dd5cceba99fe4a1dfcf5062b0b |
| 24 |
DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a |
| 25 |
+DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28 |
| 26 |
|
| 27 |
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-5.4.ebuild |
| 28 |
similarity index 77% |
| 29 |
copy from app-editors/nano/nano-9999.ebuild |
| 30 |
copy to app-editors/nano/nano-5.4.ebuild |
| 31 |
index 83537e7423..8fb6906314 100644 |
| 32 |
--- a/app-editors/nano/nano-9999.ebuild |
| 33 |
+++ b/app-editors/nano/nano-5.4.ebuild |
| 34 |
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 35 |
else |
| 36 |
MY_P="${PN}-${PV/_}" |
| 37 |
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" |
| 38 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 39 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 40 |
fi |
| 41 |
|
| 42 |
DESCRIPTION="GNU GPL'd Pico clone with more functionality" |
| 43 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_ |
| 44 |
|
| 45 |
LICENSE="GPL-3" |
| 46 |
SLOT="0" |
| 47 |
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode" |
| 48 |
+IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode" |
| 49 |
|
| 50 |
LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] |
| 51 |
sys-libs/ncurses:0=[static-libs(+)] |
| 52 |
@@ -32,6 +32,12 @@ BDEPEND=" |
| 53 |
nls? ( sys-devel/gettext ) |
| 54 |
virtual/pkgconfig |
| 55 |
" |
| 56 |
+ |
| 57 |
+REQUIRED_USE=" |
| 58 |
+ !ncurses? ( slang? ( minimal ) ) |
| 59 |
+ magic? ( !minimal ) |
| 60 |
+" |
| 61 |
+ |
| 62 |
src_prepare() { |
| 63 |
default |
| 64 |
if [[ ${PV} == "9999" ]] ; then |
| 65 |
@@ -74,6 +80,12 @@ src_install() { |
| 66 |
sed -i \ |
| 67 |
-e '/^# include /s:# *::' \ |
| 68 |
"${ED}"/etc/nanorc || die |
| 69 |
+ |
| 70 |
+ # Since nano-5.0 these are no longer being "enabled" by default |
| 71 |
+ # (bug #736848) |
| 72 |
+ local rcdir="/usr/share/nano" |
| 73 |
+ mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 74 |
+ rmdir "${ED}"${rcdir}/extra || die |
| 75 |
fi |
| 76 |
|
| 77 |
if use split-usr || ( use prefix && ! use prefix-guest ) ; then |
| 78 |
|
| 79 |
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild |
| 80 |
index 83537e7423..8fb6906314 100644 |
| 81 |
--- a/app-editors/nano/nano-9999.ebuild |
| 82 |
+++ b/app-editors/nano/nano-9999.ebuild |
| 83 |
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 84 |
else |
| 85 |
MY_P="${PN}-${PV/_}" |
| 86 |
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" |
| 87 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 88 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 89 |
fi |
| 90 |
|
| 91 |
DESCRIPTION="GNU GPL'd Pico clone with more functionality" |
| 92 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_ |
| 93 |
|
| 94 |
LICENSE="GPL-3" |
| 95 |
SLOT="0" |
| 96 |
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode" |
| 97 |
+IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode" |
| 98 |
|
| 99 |
LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] |
| 100 |
sys-libs/ncurses:0=[static-libs(+)] |
| 101 |
@@ -32,6 +32,12 @@ BDEPEND=" |
| 102 |
nls? ( sys-devel/gettext ) |
| 103 |
virtual/pkgconfig |
| 104 |
" |
| 105 |
+ |
| 106 |
+REQUIRED_USE=" |
| 107 |
+ !ncurses? ( slang? ( minimal ) ) |
| 108 |
+ magic? ( !minimal ) |
| 109 |
+" |
| 110 |
+ |
| 111 |
src_prepare() { |
| 112 |
default |
| 113 |
if [[ ${PV} == "9999" ]] ; then |
| 114 |
@@ -74,6 +80,12 @@ src_install() { |
| 115 |
sed -i \ |
| 116 |
-e '/^# include /s:# *::' \ |
| 117 |
"${ED}"/etc/nanorc || die |
| 118 |
+ |
| 119 |
+ # Since nano-5.0 these are no longer being "enabled" by default |
| 120 |
+ # (bug #736848) |
| 121 |
+ local rcdir="/usr/share/nano" |
| 122 |
+ mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die |
| 123 |
+ rmdir "${ED}"${rcdir}/extra || die |
| 124 |
fi |
| 125 |
|
| 126 |
if use split-usr || ( use prefix && ! use prefix-guest ) ; then |
Archives