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

["Sam James" <sam@gentoo.org>]

commit:     3579c48f74d801239cace66a6701b1c8a0e90c79
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 02:10:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 02:13:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3579c48f

app-editors/nano: add 6.4

Closes: https://github.com/gentoo/gentoo/pull/26628
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/nano/Manifest                          |  1 +
 app-editors/nano/files/gentoo.nanorc               |  2 +-
 .../nano/files/{gentoo.nanorc => gentoo.nanorc-r1} | 42 +++++++++++++++++-----
 .../nano/{nano-9999.ebuild => nano-6.4.ebuild}     | 34 +++++++++++-------
 app-editors/nano/nano-9999.ebuild                  | 34 +++++++++++-------
 5 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 08f2fa8a0eee..c5b73d5ebd4a 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,2 +1,3 @@
 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
+DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b

diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc
index 84e9bcf28ebf..edf4ae109b1e 100644
--- a/app-editors/nano/files/gentoo.nanorc
+++ b/app-editors/nano/files/gentoo.nanorc
@@ -60,7 +60,7 @@ color magenta ":[^[:space:]]+([[:space:]]|$)"
 color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+"
 color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+"
 ## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>"
+color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>"
 color white "[[:space:]][*~-]?\*"
 ## Categories:
 color cyan "^[[:space:]]*[^/]*/"

diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc-r1
similarity index 62%
copy from app-editors/nano/files/gentoo.nanorc
copy to app-editors/nano/files/gentoo.nanorc-r1
index 84e9bcf28ebf..26767774a0e3 100644
--- a/app-editors/nano/files/gentoo.nanorc
+++ b/app-editors/nano/files/gentoo.nanorc-r1
@@ -4,6 +4,8 @@
 syntax ebuild "\.e(build|class)$"
 comment "#"
 
+linter bash -n
+
 ## All the standard portage functions:
 color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
 color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
@@ -13,29 +15,51 @@ color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|
 color green "\<(declare|eval|exec|export|let|local)\>"
 color green "[][{}():;|`$<>!=&\]"
 color green "-[defhnrsuwxzL]\>"
-color green "-(eq|ne|gt|lt|ge|le)\>"
+color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>"
+
 ## Variables... official portage ones in red, all others in bright red:
 color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
 color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
 color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
 color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>"
-color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
+color red "\<(T|TMPDIR|HOME)\>"
+color red "\<(AS|C(PP|XX)?|FF|GO|LD|RUST)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
 color red "\<EBUILD_PHASE(_FUNC)?\>"
 color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
-color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AUTOTOOLS_(AUTO_)?DEPEND\>" "\<AM_OPTS\>" "\<AT_(NOEAUTOHEADER|NOEAUTOMAKE|NOELIBTOOLIZE|M4DIR)\>"
+color red "\<ECONF_SOURCE\>"
+
 ## Portage commands:
-color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\<e(apply(_user)?|begin|end|conf|install|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
+color magenta "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(apply(_user)?|begin|end|conf|install(docs)?|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
 color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
 color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<get_libdir\>" "\<ver_(cut|rs|test)\>" "\<version_is_at_least\>"
 color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
-color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
+color brightblue "\<(assert|die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse)\>" "\<(has|best)_version\>"
 color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
 color brightblue "\<do(compress|dir|html|mo|strip|sym)\>" "\<keepdir\>"
 color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip)\>"
 color brightblue "\<(doc|ins|exe)?into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
-color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
-color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp)|is-cross-compiler)\>"
+color brightblue "\<add(read|write|predict|deny)\>"
+### common eclasses
+color brightblue "\<edo(b)?\>"
+### flag-o-matic.eclass, toolchain-funcs.eclass
+color brightblue "\<(all-flag-vars)\>"
+color brightblue "\<(filter-(flags|lfs-flags|lto|mfpmath))\>"
+color brightblue "\<strip-flags\>"
+color brightblue "\<append-(cpp|c|cxx|f|lfs|ld)flags\>"
+color brightblue "\<replace-flags\>" "\<replace-cpu-flags\>"
+color brightblue "\<is-(ld?)flagq?\>"
+color brightblue "\<(append-atomic-flags|no-as-needed|raw-ldflags|append-libs|replace-sparc64-flags|get-flag|strip-unsupported-flags)\>"
+color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|DLLWRAP|F77|FC|GCJ|GO|LD|STRINGS|STRIP|NM|OBJCOPY|OBJDUMP|PKG_CONFIG|RANLIB|RC|READELF)\>"
+color brightblue "\<test-flag(s)?-(CC|CXX|F77|FC|CCLD)\>"
+color brightblue "\<tc-ld-(is-(gold|lld)|disable-gold|force-bfd)\>"
+color brightblue "\<tc-(arch(-kernel)?|check-openmp|export|has-(tls|openmp)|is-cross-compiler)\>"
+color brightblue "\<tc-is-(clang|gcc)\>"
+color brightblue "\<(clang|gcc)-(fullversion|(major-|minor|micro-)version)\>"
+### debugging
+color brightblue "\<debug-print(-function|-section)\>"
+
 ## Common commands used in ebuilds:
 color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
 ## Comments (doesn't work that well):
@@ -60,7 +84,7 @@ color magenta ":[^[:space:]]+([[:space:]]|$)"
 color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+"
 color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+"
 ## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>"
+color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>"
 color white "[[:space:]][*~-]?\*"
 ## Categories:
 color cyan "^[[:space:]]*[^/]*/"

diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-6.4.ebuild
similarity index 80%
copy from app-editors/nano/nano-9999.ebuild
copy to app-editors/nano/nano-6.4.ebuild
index c2da47a585b9..1422c12825ff 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-6.4.ebuild
@@ -4,13 +4,14 @@
 EAPI=8
 
 inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
+
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
+	inherit autotools git-r3
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -24,10 +25,13 @@ LIB_DEPEND="
 	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
 	sys-libs/ncurses:=[static-libs(+)]
 	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
 BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
@@ -39,14 +43,16 @@ REQUIRED_USE="
 
 src_prepare() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
+
+	if [[ ${PV} == 9999 ]] ; then
 		eautoreconf
 	fi
 }
 
 src_configure() {
 	use static && append-ldflags -static
-	local myconf=(
+
+	local myconfargs=(
 		--bindir="${EPREFIX}"/bin
 		--htmldir=/trash
 		$(use_enable !minimal color)
@@ -60,12 +66,14 @@ src_configure() {
 		$(use_enable unicode utf8)
 		$(use_enable minimal tiny)
 	)
-	econf "${myconf[@]}"
+
+	econf "${myconfargs[@]}"
 }
 
 src_install() {
 	default
-	# don't use "${ED}" here or things break (#654534)
+
+	# Don't use "${ED}" here or things break (#654534)
 	rm -r "${D}"/trash || die
 
 	dodoc doc/sample.nanorc
@@ -73,6 +81,7 @@ src_install() {
 	dodoc doc/faq.html
 	insinto /etc
 	newins doc/sample.nanorc nanorc
+
 	if ! use minimal ; then
 		# Enable colorization by default.
 		sed -i \
@@ -86,15 +95,16 @@ src_install() {
 		rmdir "${ED}"${rcdir}/extra || die
 
 		insinto "${rcdir}"
-		doins "${FILESDIR}/gentoo.nanorc"
+		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
 	fi
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
 }
 
 pkg_postrm() {
-	local e
 	[[ -n ${REPLACED_BY_VERSION} ]] && return
+
+	local e
 	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
 	if [[ ${e##*/} == nano ]]; then
 		ewarn "The EDITOR variable is still set to ${e}."

diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index c2da47a585b9..1422c12825ff 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -4,13 +4,14 @@
 EAPI=8
 
 inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
+
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
+	inherit autotools git-r3
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
@@ -24,10 +25,13 @@ LIB_DEPEND="
 	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
 	sys-libs/ncurses:=[static-libs(+)]
 	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
 BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
@@ -39,14 +43,16 @@ REQUIRED_USE="
 
 src_prepare() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
+
+	if [[ ${PV} == 9999 ]] ; then
 		eautoreconf
 	fi
 }
 
 src_configure() {
 	use static && append-ldflags -static
-	local myconf=(
+
+	local myconfargs=(
 		--bindir="${EPREFIX}"/bin
 		--htmldir=/trash
 		$(use_enable !minimal color)
@@ -60,12 +66,14 @@ src_configure() {
 		$(use_enable unicode utf8)
 		$(use_enable minimal tiny)
 	)
-	econf "${myconf[@]}"
+
+	econf "${myconfargs[@]}"
 }
 
 src_install() {
 	default
-	# don't use "${ED}" here or things break (#654534)
+
+	# Don't use "${ED}" here or things break (#654534)
 	rm -r "${D}"/trash || die
 
 	dodoc doc/sample.nanorc
@@ -73,6 +81,7 @@ src_install() {
 	dodoc doc/faq.html
 	insinto /etc
 	newins doc/sample.nanorc nanorc
+
 	if ! use minimal ; then
 		# Enable colorization by default.
 		sed -i \
@@ -86,15 +95,16 @@ src_install() {
 		rmdir "${ED}"${rcdir}/extra || die
 
 		insinto "${rcdir}"
-		doins "${FILESDIR}/gentoo.nanorc"
+		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
 	fi
 
 	use split-usr && dosym ../../bin/nano /usr/bin/nano
 }
 
 pkg_postrm() {
-	local e
 	[[ -n ${REPLACED_BY_VERSION} ]] && return
+
+	local e
 	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
 	if [[ ${e##*/} == nano ]]; then
 		ewarn "The EDITOR variable is still set to ${e}."