commit: 8412e9e79fd3cfa21099a2287fed58937edf74c7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 2 22:28:47 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 2 22:28:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8412e9e7
app-editors/nano: bump to 5.4
Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/nano/Manifest | 1 +
app-editors/nano/{nano-9999.ebuild => nano-5.4.ebuild} | 16 ++++++++++++++--
app-editors/nano/nano-9999.ebuild | 16 ++++++++++++++--
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index d0fe9c4999..2ab0b4f0e1 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,2 +1,3 @@
DIST nano-2.7.3.tar.gz 2048675 BLAKE2B
df7bb6b64b2b273e94e2584043f50292a646e76fee2aa634c5b8f25878ffab4b78320f25f9879fa97313b36463d58274020ea00cf2149168887684d3c7817314
SHA512
cd159cf193f05b37f770ac79e532fe96be158688d241ab7090861016fe0da9dde2ab504d0703b8feea8043e1deded3f10f0ab4dd5cceba99fe4a1dfcf5062b0b
DIST nano-4.9.3.tar.gz 2999198 BLAKE2B
a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e
SHA512
233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
+DIST nano-5.4.tar.gz 2898561 BLAKE2B
7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18
SHA512
711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
diff --git a/app-editors/nano/nano-9999.ebuild
b/app-editors/nano/nano-5.4.ebuild
similarity index 77%
copy from app-editors/nano/nano-9999.ebuild
copy to app-editors/nano/nano-5.4.ebuild
index 83537e7423..8fb6906314 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-5.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz";
- 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"
+ 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"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nano-editor.org/
https://wiki.gentoo.org/wiki/Nano/Basics_
LICENSE="GPL-3"
SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static
unicode"
+IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static
unicode"
LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
sys-libs/ncurses:0=[static-libs(+)]
@@ -32,6 +32,12 @@ BDEPEND="
nls? ( sys-devel/gettext )
virtual/pkgconfig
"
+
+REQUIRED_USE="
+ !ncurses? ( slang? ( minimal ) )
+ magic? ( !minimal )
+"
+
src_prepare() {
default
if [[ ${PV} == "9999" ]] ; then
@@ -74,6 +80,12 @@ src_install() {
sed -i \
-e '/^# include /s:# *::' \
"${ED}"/etc/nanorc || 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
if use split-usr || ( use prefix && ! use prefix-guest ) ; then
diff --git a/app-editors/nano/nano-9999.ebuild
b/app-editors/nano/nano-9999.ebuild
index 83537e7423..8fb6906314 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz";
- 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"
+ 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"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nano-editor.org/
https://wiki.gentoo.org/wiki/Nano/Basics_
LICENSE="GPL-3"
SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static
unicode"
+IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static
unicode"
LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
sys-libs/ncurses:0=[static-libs(+)]
@@ -32,6 +32,12 @@ BDEPEND="
nls? ( sys-devel/gettext )
virtual/pkgconfig
"
+
+REQUIRED_USE="
+ !ncurses? ( slang? ( minimal ) )
+ magic? ( !minimal )
+"
+
src_prepare() {
default
if [[ ${PV} == "9999" ]] ; then
@@ -74,6 +80,12 @@ src_install() {
sed -i \
-e '/^# include /s:# *::' \
"${ED}"/etc/nanorc || 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
if use split-usr || ( use prefix && ! use prefix-guest ) ; then
