* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2016-02-12 17:39 Mike Frysinger
0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger @ 2016-02-12 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 5815ecbb9e1f5e5539b38258cba3b01192b18214
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 17:38:49 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 17:39:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5815ecbb
app-editor/nano: drop old <2.4.3 versions
app-editors/nano/Manifest | 4 -
app-editors/nano/files/awk.nanorc | 38 ----------
app-editors/nano/files/css.nanorc | 9 ---
app-editors/nano/files/gentoo.nanorc | 50 ------------
app-editors/nano/files/nano-2.4.0-no-speller.patch | 88 ----------------------
app-editors/nano/files/xml.nanorc | 9 ---
app-editors/nano/nano-2.3.6.ebuild | 79 -------------------
app-editors/nano/nano-2.4.0.ebuild | 80 --------------------
app-editors/nano/nano-2.4.1.ebuild | 79 -------------------
app-editors/nano/nano-2.4.2.ebuild | 83 --------------------
10 files changed, 519 deletions(-)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 2b30e71..0fd52b0 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,7 +1,3 @@
-DIST nano-2.3.6.tar.gz 1816012 SHA256 a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534 SHA512 00d66dbbd1ee59b3d606af8688599ce627aa98cee494611e255293347b9aa4f3f583820ac28adae5f7209410a28669cdd5211258411d83364d3eb788d909bb73 WHIRLPOOL 6900e40e41f7bbd23a0dc76fe24bbf29c46b65bead328cb574008045f397e92643a7cee35605ef044e1921029dca54e49831548828490abbf24b2c63f0f9092b
-DIST nano-2.4.0.tar.gz 1886052 SHA256 5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd SHA512 7f079e307521a47405ba6d107d481df6869dbd7ea9297de6c69e831d00335cee403ac3ec1ef3578488cbec65c2e2ddec15edfddd45071f0fb4e2eccc94cbef1d WHIRLPOOL 1e4aaaa67c44bf051210b9c65db80c30189606fc2ba0d3e1a6802a41e7244901e60858ad412a0c6ee6e0eaa90d65925d8c954b398387cc12109a626811d8ad07
-DIST nano-2.4.1.tar.gz 1890805 SHA256 6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2 SHA512 0e2bc99627682350496853b2dc8d3d4c25303b3723fd1dec2e26f2860b21d0f4c6cb99810517fc4e86312f3bec5481c327afab84dac55f4c388799453e6f5f11 WHIRLPOOL 3c3decdd0c94c33a2cb3854e6b8cda4082a9a98d55d8e1d256ec73febaa0de597d41b1f63c18cb6308fb7174b6ced0995434697f6c05a2efb53e3588f2ca7d8a
-DIST nano-2.4.2.tar.gz 1898633 SHA256 c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9 SHA512 487b03b33ac8fac4a774223e038b00463ca03e08093c506b10f4df56795039eff1c23518c1a4f32695cee1bb9bb5eb0a2dd3e1f8a9befcc573e7fca3d69fa9d3 WHIRLPOOL ac5942114a48d428e64db47afb919feef506e18da8b21627ea421e59bf3c235083b17ffaf7a6e510193b6617c0e2ad9d2460f64d5d8bbd6b828547bcd41b5c7c
DIST nano-2.4.3.tar.gz 1878096 SHA256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 SHA512 53c9f93b0f001a3d6c292a6995d66b6bcca033407b6b69995c62b9e9f721fd5566fbd0e22ece1b2561a47e56ef19c3f1ee196e23edfe832289704e0ebef45de9 WHIRLPOOL cd2e4d7175521835c71f0338a2115d2d9fec4da1d4eb2abbb633cfef907fde69fb12acd5e0db343d1f90945f05d60abb85daa5a045d9b97ef8cd19fb9b226607
DIST nano-2.5.0.tar.gz 1909625 SHA256 ff323e6fef74caf0a924304841c07ac65ec30db99dc5c1f8272b4c536a5c89ee SHA512 f05f1afa6a79ff6b87359c46fbdaf6161eacdc265ac6be155a0173e3ab5a17023e205d0b9667a942e754556182a9007fe4438f337a830d20b9546aad9d522ba6 WHIRLPOOL 29fbb67ce561da8255dca70d7554d604094a21e89e39ce94fadb67bc3236550ea1ee3f08838616deed8a4e37657df0ef6d320c701cc77a086d8d1ce2dae43d1d
DIST nano-2.5.2.tar.gz 1964016 SHA256 89bd6ac5120880d2a95431d8bad22bf92c7ccbf10b8f1716d4ea062f3faeeb41 SHA512 ec4e35cfb23494dd09c23b195556dfb36b9329007d61bdfe6a25a43c9914e432160969c92ed991bb2221ea5facd5ae1c1e9aef0029dfa259d827b7ea4943a1d3 WHIRLPOOL 3963ed7fad9296ea0d85300dc7ad518a33e2b793d9b94e98056a4c82c9b7984ef187dfa10653f787b262755521321c1e2c37562c1f95cfd338927329c6d0aa97
diff --git a/app-editors/nano/files/awk.nanorc b/app-editors/nano/files/awk.nanorc
deleted file mode 100644
index 696ab6a..0000000
--- a/app-editors/nano/files/awk.nanorc
+++ /dev/null
@@ -1,38 +0,0 @@
-## Here is an example for awk.
-##
-syntax "awk" "\.awk$"
-## records
-icolor brightred "\$[0-9A-Z_!@#$*?-]+"
-## awk-set variables
-color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
-color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
-color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
-## function declarations and special patterns
-color brightgreen "\<(function|extension|BEGIN|END)\>"
-## operators
-color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
-## flow control
-color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
-color brightyellow "\<(break|continue|return)\>"
-## I/O statements
-color brightgreen "\<(close|getline|next|nextfile|print|printf)\>"
-color brightgreen "\<(system|fflush)\>"
-## standard functions
-color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
-color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"
-color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
-color magenta "\<(mktime|strftime|systime)\>"
-color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
-color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
-
-##
-## String highlighting. You will in general want your comments and
-## strings to come last, because syntax highlighting rules will be
-## applied in the order they are read in.
-color brightyellow "<[^= ]*>" ""(\\.|[^"])*""
-
-## Comment highlighting
-color brightblue "(^|[[:space:]])#.*$"
-
-## Trailing whitespace
-color ,green "[[:space:]]+$"
diff --git a/app-editors/nano/files/css.nanorc b/app-editors/nano/files/css.nanorc
deleted file mode 100644
index 62126e8..0000000
--- a/app-editors/nano/files/css.nanorc
+++ /dev/null
@@ -1,9 +0,0 @@
-## Here is an example for css files.
-##
-syntax "css" "\.css$"
-color brightred "."
-color brightyellow start="\{" end="\}"
-color brightwhite start=":" end="[;^\{]"
-color brightblue ":active|:focus|:hover|:link|:visited|:link|:after|:before|$"
-color brightblue start="\/\*" end="\\*/"
-color green ";|:|\{|\}"
diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc
deleted file mode 100644
index f08d2e9..0000000
--- a/app-editors/nano/files/gentoo.nanorc
+++ /dev/null
@@ -1,50 +0,0 @@
-## Here is an example for ebuilds/eclasses
-##
-syntax "ebuild" "\.e(build|class)$"
-## All the standard portage functions
-color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
-## Highlight bash related syntax
-color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color green "-(e|d|f|r|g|u|w|x|L)\>"
-color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
-## Highlight variables ... official portage ones in red, all others in bright red
-color brightred "\$\{?[a-zA-Z_0-9]+\}?"
-color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\>"
-color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
-## Highlight portage commands
-color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>"
-color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
-color brightblue "\<do(header|python|sed|dir|hard|sym|html|jar|mo)\>" "\<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\>" "\<usex\>"
-## Highlight common commands used in ebuilds
-color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
-## Highlight comments (doesnt work that well)
-color yellow "#.*$"
-## Highlight strings (doesnt work that well)
-color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
-## Trailing space is bad!
-color ,green "[[:space:]]+$"
-
-## Here is an example for Portage control files
-##
-syntax "/etc/portage" "\.(keywords|mask|unmask|use)$"
-## Base text:
-color green "^.+$"
-## Use flags:
-color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
-color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
-## Likely version numbers:
-color magenta "-[[:digit:]].*([[:space:]]|$)"
-## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
-color white "[[:space:]][~-]?\*"
-## Categories:
-color cyan "^[[:space:]]*.*/"
-## Masking regulators:
-color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
-## Comments:
-color yellow "#.*$"
diff --git a/app-editors/nano/files/nano-2.4.0-no-speller.patch b/app-editors/nano/files/nano-2.4.0-no-speller.patch
deleted file mode 100644
index 4405266..0000000
--- a/app-editors/nano/files/nano-2.4.0-no-speller.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=544296
-https://savannah.gnu.org/bugs/?44607
-
-From 14a9c8aa0b124dc580c4805e848e6ff0880b43bd Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@justemail.net>
-Date: Fri, 27 Mar 2015 16:55:49 +0000
-Subject: [PATCH] Treating the formatter like a speller, to fix compilation
- with --disable-speller. This fixes Savannah bug #44607.
-
-git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5168 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
----
- ChangeLog | 2 ++
- src/global.c | 10 ++++++++--
- src/text.c | 3 ++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-ChangeLog
- * src/global.c, src/text.c: Treat the formatter like a speller, to fix
- compilation with --disable-speller. Fixes Savannah bug #44607.
-
-diff --git a/src/global.c b/src/global.c
-index 4643af2..27ff938 100644
---- a/src/global.c
-+++ b/src/global.c
-@@ -639,8 +639,10 @@ void shortcut_init(void)
- const char *nano_lint_msg = N_("Invoke the linter, if available");
- const char *nano_prevlint_msg = N_("Go to previous linter msg");
- const char *nano_nextlint_msg = N_("Go to next linter msg");
-+#ifndef DISABLE_SPELLER
- const char *nano_formatter_msg = N_("Invoke formatter, if available");
- #endif
-+#endif
- #endif /* !DISABLE_HELP */
-
- #ifndef DISABLE_HELP
-@@ -736,9 +738,11 @@ void shortcut_init(void)
- #ifndef DISABLE_COLOR
- add_to_funcs(do_linter, MMAIN,
- N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW);
-+#ifndef DISABLE_SPELLER
- add_to_funcs(do_formatter, MMAIN,
- N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW);
- #endif
-+#endif
-
- #ifndef NANO_TINY
- add_to_funcs(case_sens_void, MWHEREIS|MREPLACE,
-@@ -1006,12 +1010,14 @@ void shortcut_init(void)
- #ifndef DISABLE_SPELLER
- add_to_sclist(MMAIN, "^T", do_spell, 0);
- add_to_sclist(MMAIN, "F12", do_spell, 0);
-+#ifndef DISABLE_COLOR
-+ add_to_sclist(MMAIN, "^T", do_formatter, 0);
-+ add_to_sclist(MMAIN, "F12", do_formatter, 0);
-+#endif
- #else
- #ifndef DISABLE_COLOR
- add_to_sclist(MMAIN, "^T", do_linter, 0);
- add_to_sclist(MMAIN, "F12", do_linter, 0);
-- add_to_sclist(MMAIN, "^T", do_formatter, 0);
-- add_to_sclist(MMAIN, "F12", do_formatter, 0);
- #endif
- #endif
- add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0);
-diff --git a/src/text.c b/src/text.c
-index 8814b49..98b2f80 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -3223,6 +3223,7 @@ free_lints_and_return:
- lint_cleanup();
- }
-
-+#ifndef DISABLE_SPELLER
- /* Run a formatter for the given syntax.
- * Expects the formatter to be non-interactive and
- * operate on a file in-place, which we'll pass it
-@@ -3370,7 +3371,7 @@ void do_formatter(void)
-
- statusbar(finalstatus);
- }
--
-+#endif /* !DISABLE_SPELLER */
- #endif /* !DISABLE_COLOR */
-
- #ifndef NANO_TINY
---
-2.3.3
-
diff --git a/app-editors/nano/files/xml.nanorc b/app-editors/nano/files/xml.nanorc
deleted file mode 100644
index 1f68c05..0000000
--- a/app-editors/nano/files/xml.nanorc
+++ /dev/null
@@ -1,9 +0,0 @@
-## Here is an example for xml files.
-##
-syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$"
-color green start="<" end=">"
-color cyan "<[^> ]+"
-color cyan ">"
-color yellow start="<!DOCTYPE" end="[/]?>"
-color yellow start="<!--" end="-->"
-color red "&[^;]*;"
diff --git a/app-editors/nano/nano-2.3.6.ebuild b/app-editors/nano/nano-2.3.6.ebuild
deleted file mode 100644
index ee21f62..0000000
--- a/app-editors/nano/nano-2.3.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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"
-HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
- epatch_user
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/nanorc.sample
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.4.0.ebuild b/app-editors/nano/nano-2.4.0.ebuild
deleted file mode 100644
index 7e824c2..0000000
--- a/app-editors/nano/nano-2.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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"
-HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
- epatch "${FILESDIR}"/${P}-no-speller.patch #544296
- epatch_user
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/nanorc.sample
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.4.1.ebuild b/app-editors/nano/nano-2.4.1.ebuild
deleted file mode 100644
index 2644916..0000000
--- a/app-editors/nano/nano-2.4.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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"
-HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
- magic? ( sys-apps/file )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
- epatch_user
-}
-
-src_configure() {
- eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/nanorc.sample
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.4.2.ebuild b/app-editors/nano/nano-2.4.2.ebuild
deleted file mode 100644
index 58fa18e..0000000
--- a/app-editors/nano/nano-2.4.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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"
-HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
- sys-libs/ncurses:0=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
- epatch_user
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable magic libmagic) \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/nanorc.sample
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2016-12-29 18:47 Mike Frysinger
0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger @ 2016-12-29 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 9aad551a8ad2a1f1a1328df225fca8df7e9930f9
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 18:44:53 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 18:47:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aad551a
app-editors/nano: add upstream fix for USE=minimal builds #604000
app-editors/nano/files/nano-2.7.3-tiny.patch | 29 ++++++++++++++++++++++++++++
app-editors/nano/nano-2.7.3.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/app-editors/nano/files/nano-2.7.3-tiny.patch b/app-editors/nano/files/nano-2.7.3-tiny.patch
new file mode 100644
index 00000000..148716d
--- /dev/null
+++ b/app-editors/nano/files/nano-2.7.3-tiny.patch
@@ -0,0 +1,29 @@
+From fc89ac11d25a5d052a63c01006c1fd767d9f5879 Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Thu, 29 Dec 2016 13:43:06 -0500
+Subject: [PATCH] speller: fix build when tiny build is enabled
+
+URL: https://bugs.gentoo.org/604000
+---
+ src/text.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/text.c b/src/text.c
+index bd1737687e65..a8b34f2f6bba 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -3079,9 +3079,11 @@ const char *do_alt_speller(char *tempfile_name)
+ stat(tempfile_name, &spellfileinfo);
+ if (spellfileinfo.st_mtime != timestamp) {
+ set_modified();
++#ifndef NANO_TINY
+ /* Flush the undo stack, to avoid making a mess when the user
+ * tries to undo things in spell-corrected lines. */
+ discard_until(NULL, openfile);
++#endif
+ }
+ #ifndef NANO_TINY
+ /* Unblock SIGWINCHes again. */
+--
+2.11.0
+
diff --git a/app-editors/nano/nano-2.7.3.ebuild b/app-editors/nano/nano-2.7.3.ebuild
index ea75851b..26259bc 100644
--- a/app-editors/nano/nano-2.7.3.ebuild
+++ b/app-editors/nano/nano-2.7.3.ebuild
@@ -35,6 +35,7 @@ src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
+ epatch "${FILESDIR}"/${P}-tiny.patch #604000
epatch_user
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2017-01-19 4:55 Mike Frysinger
0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger @ 2017-01-19 4:55 UTC (permalink / raw
To: gentoo-commits
commit: d667baf2c48d90d6052372e3bce0faf8ab9c8c8b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 04:54:59 2017 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 04:54:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d667baf2
app-editors/nano: version bump to 2.7.4
app-editors/nano/Manifest | 2 +-
app-editors/nano/files/nano-2.7.3-tiny.patch | 29 ----------------------
.../nano/{nano-2.7.3.ebuild => nano-2.7.4.ebuild} | 7 +++---
app-editors/nano/nano-9999.ebuild | 9 +++----
4 files changed, 8 insertions(+), 39 deletions(-)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 4045fce..3183cbf 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,3 +1,3 @@
DIST nano-2.5.3.tar.gz 1967760 SHA256 b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee SHA512 1d859f0bd88b9d907cfcaa84edc212bcaea4335c203922eb5b7378c2b45d88dffe1f3e4cb499a824d33781485834ef564997c58cf1fd92610d08f6ce8dcb67d5 WHIRLPOOL a2ca1c41d3cb26756cc9aba5b5fa0aeaea220626b98d0abfa1c5c4d4d57c3a5ef688d5edf00a6a00849ee25a67b2bbab93c4d454f6eb5a204b10fa01de3e298f
DIST nano-2.6.3.tar.gz 2019354 SHA256 4f4054e12f2181c8e436163e931a0a565612242ff9e566c4d1adeda0f91fd503 SHA512 5079c0da976e3cfef9f3980e37c2501837bc66bb98fadd6fe7f02b061b83c99454678833fd43c74e6796cdc4ee9028ccba7a8a05e0f86e7a6517ba4d4c6bc95e WHIRLPOOL 94520ca9c7a11342133adfd3a1e9e9c77a6c07ab18b1b51bf39918b331abc6bd7ebeb937c2ec8ed3e59b8d0468e40f4e5811e66a8aecd469ad42c595c1b61fe4
-DIST nano-2.7.3.tar.gz 2048675 SHA256 3574d4594d051f3b572c47d63bfc3763fb1148c50b811ba7a016bacd94887a88 SHA512 cd159cf193f05b37f770ac79e532fe96be158688d241ab7090861016fe0da9dde2ab504d0703b8feea8043e1deded3f10f0ab4dd5cceba99fe4a1dfcf5062b0b WHIRLPOOL 19b042c29be4c8afca33870e85f0b893aa9f9d958be3043272dcef5ad8d775dc3b43fe1a418efee283c89a301be1503b04b825758666be1a8e25596f3a36b8be
+DIST nano-2.7.4.tar.gz 2023560 SHA256 23ffc2de52d687739fed6dc2fc94df36aa7da7bb52c8740c523fdd7336fdbc8c SHA512 029fa2ef72a8762f376f1cfc3f4cdcabfcb226868e5c68c5980162333099f23e74e77da2dda66b4e70e2840b9a0e472db821248327b417b3cf5132093eeb80ee WHIRLPOOL 9fb363d52c538165d73828aec6564cf9b79612e2fd489c3edfa4db8049d676cba2c668f4f704df4fc31f9b6cea738c63fc2b2c3e0b0d0cde0b1f72a4226bc391
diff --git a/app-editors/nano/files/nano-2.7.3-tiny.patch b/app-editors/nano/files/nano-2.7.3-tiny.patch
deleted file mode 100644
index 148716d..00000000
--- a/app-editors/nano/files/nano-2.7.3-tiny.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fc89ac11d25a5d052a63c01006c1fd767d9f5879 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Thu, 29 Dec 2016 13:43:06 -0500
-Subject: [PATCH] speller: fix build when tiny build is enabled
-
-URL: https://bugs.gentoo.org/604000
----
- src/text.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/text.c b/src/text.c
-index bd1737687e65..a8b34f2f6bba 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -3079,9 +3079,11 @@ const char *do_alt_speller(char *tempfile_name)
- stat(tempfile_name, &spellfileinfo);
- if (spellfileinfo.st_mtime != timestamp) {
- set_modified();
-+#ifndef NANO_TINY
- /* Flush the undo stack, to avoid making a mess when the user
- * tries to undo things in spell-corrected lines. */
- discard_until(NULL, openfile);
-+#endif
- }
- #ifndef NANO_TINY
- /* Unblock SIGWINCHes again. */
---
-2.11.0
-
diff --git a/app-editors/nano/nano-2.7.3.ebuild b/app-editors/nano/nano-2.7.4.ebuild
similarity index 94%
rename from app-editors/nano/nano-2.7.3.ebuild
rename to app-editors/nano/nano-2.7.4.ebuild
index 26259bc..f68c6ce 100644
--- a/app-editors/nano/nano-2.7.3.ebuild
+++ b/app-editors/nano/nano-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -35,7 +35,6 @@ src_prepare() {
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
- epatch "${FILESDIR}"/${P}-tiny.patch #604000
epatch_user
}
@@ -67,11 +66,11 @@ src_install() {
default
rm -rf "${D}"/trash
- dodoc doc/nanorc.sample
+ dodoc doc/sample.nanorc
docinto html
dodoc doc/faq.html
insinto /etc
- newins doc/nanorc.sample nanorc
+ newins doc/sample.nanorc nanorc
if ! use minimal ; then
# Enable colorization by default.
sed -i \
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index c75dad9..ab05f55 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=6
+EAPI="6"
inherit eutils flag-o-matic
if [[ ${PV} == "9999" ]] ; then
@@ -67,11 +66,11 @@ src_install() {
default
rm -rf "${D}"/trash
- dodoc doc/nanorc.sample
+ dodoc doc/sample.nanorc
docinto html
dodoc doc/faq.html
insinto /etc
- newins doc/nanorc.sample nanorc
+ newins doc/sample.nanorc nanorc
if ! use minimal ; then
# Enable colorization by default.
sed -i \
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2017-06-25 17:31 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2017-06-25 17:31 UTC (permalink / raw
To: gentoo-commits
commit: 42d586daa34280ff6f8ad642ff75b3a5ad92fc64
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 17:31:13 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 17:31:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d586da
app-editors/nano: Removed old.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-editors/nano/Manifest | 2 -
app-editors/nano/files/nano-2.6.3-minimal.patch | 97 -------------------------
app-editors/nano/nano-2.6.3.ebuild | 83 ---------------------
app-editors/nano/nano-2.8.3.ebuild | 83 ---------------------
4 files changed, 265 deletions(-)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index ea363364b78..51fbb9f8df8 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,5 +1,3 @@
-DIST nano-2.6.3.tar.gz 2019354 SHA256 4f4054e12f2181c8e436163e931a0a565612242ff9e566c4d1adeda0f91fd503 SHA512 5079c0da976e3cfef9f3980e37c2501837bc66bb98fadd6fe7f02b061b83c99454678833fd43c74e6796cdc4ee9028ccba7a8a05e0f86e7a6517ba4d4c6bc95e WHIRLPOOL 94520ca9c7a11342133adfd3a1e9e9c77a6c07ab18b1b51bf39918b331abc6bd7ebeb937c2ec8ed3e59b8d0468e40f4e5811e66a8aecd469ad42c595c1b61fe4
DIST nano-2.7.5.tar.gz 2031723 SHA256 226be22f46359007aa76499623739f4a7d5fa294a2899c70b21bc09b8d81d907 SHA512 a5332a361c4d0d9d0a77ebb11cdcffa976bee4981d5665b2732a9e6d7a2997566d9345332f2e6e5cb74f0a81be4413f54ca8f719962ab10b32d7ec1c9271973c WHIRLPOOL bd28cde96896ad531bb499504bb1438b358b64e7f6080fa24758bee7c222b4d1df0c395d480d0cef54de8e78a7e457db403a9ef2d6a56033e65299b6d7f95634
-DIST nano-2.8.3.tar.gz 2773717 SHA256 2b3b7f383a40899db5367d3c4e663ba0088868c0f9aa4edfd7457c9a0eedbdd1 SHA512 ffedd36252bf13d57c9970840bc05b68c2b9211bf222a47a9aa559c078fdd993929c004d9aae3648e3190cbb32eef7ffb7a57de1c02e6e56b230366b9b55d9a1 WHIRLPOOL 63b4a3a0d93506788ba33553da3a6b7943e3559a2eae37b16700027665711f97313cc7199b189f4668d8a04584907dbf2a4b510f73ade8023729e6569890cd80
DIST nano-2.8.4.tar.gz 2785297 SHA256 78a2f3b3f6b500fad995c5e207d2816cbd6b531154aa2a3a2bd50c8fdf7dc57f SHA512 bbcaf710fdb5f403812b584a182ee472421d65c076f5fa2d538603c4cda8292485010157a2670e9890fcffc29d7db5c7334334d54d14f4e154b9bc3fe1ee919c WHIRLPOOL 9cce7539122b915b7b2a48c00b6cfce6ffe4e6af86605865a4e15f99e1a75cf0766f04ba81316dc92677c9fa78daf1513dce2a06c9cc668287cacf71f650fce5
DIST nano-2.8.5.tar.gz 2795845 SHA256 e2b929b24fba87f7a44285ce8d47af7170e379bee1bf2d04fbc728b7326a558a SHA512 f59e32395b63e64afe8fa9c98785c53f9f841a1fce0677b8591c0f570b3bec24188b5f7acf4fb66cf41a83e0b3ba9436ca4abcfb861c27c7c24f4a5b7dd249db WHIRLPOOL bc83966f2f7e952115185e648fc77517dd31e0e9adace43b3543d5944f08000675a03de9bf9d2841993df86016a52720538a5e8579d35801dd8ffd0416253e17
diff --git a/app-editors/nano/files/nano-2.6.3-minimal.patch b/app-editors/nano/files/nano-2.6.3-minimal.patch
deleted file mode 100644
index 7e5387e3d74..00000000000
--- a/app-editors/nano/files/nano-2.6.3-minimal.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-https://bugs.gentoo.org/591026
-
-From 928a24c20444a652212e544a506ed55c44efdf3b Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@justemail.net>
-Date: Thu, 11 Aug 2016 12:37:11 +0200
-Subject: [PATCH] input: look at the modifier keys only when compiled on Linux
-
-This fixes https://savannah.gnu.org/bugs/?48751 reported by Andrew Ho.
-
-This also fixes compilation when configured with --enable-tiny.
----
- src/global.c | 3 +++
- src/nano.c | 3 ++-
- src/proto.h | 3 +++
- src/winio.c | 4 ++++
- 4 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/global.c b/src/global.c
-index 69c66473508d..3347476f1afb 100644
---- a/src/global.c
-+++ b/src/global.c
-@@ -33,8 +33,11 @@ volatile sig_atomic_t sigwinch_counter = 0;
- /* Is incremented by the handler whenever a SIGWINCH occurs. */
- #endif
-
-+#if defined(__linux__) && !defined(NANO_TINY)
- bool console;
- /* Whether we're running on a Linux VC (TRUE) or under X (FALSE). */
-+#endif
-+
- bool meta_key;
- /* Whether the current keystroke is a Meta key. */
- bool focusing = TRUE;
-diff --git a/src/nano.c b/src/nano.c
-index 6e55f4948346..4d82c938628c 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -2482,9 +2482,10 @@ int main(int argc, char **argv)
- /* Set up the terminal state. */
- terminal_init();
-
-+#if defined(__linux__) && !defined(NANO_TINY)
- /* Check whether we're running on a Linux console. */
- console = (getenv("DISPLAY") == NULL);
--
-+#endif
- #ifdef DEBUG
- fprintf(stderr, "Main: set up windows\n");
- #endif
-diff --git a/src/proto.h b/src/proto.h
-index 6396f3735127..4f6624ea0f16 100644
---- a/src/proto.h
-+++ b/src/proto.h
-@@ -30,7 +30,10 @@
- extern volatile sig_atomic_t sigwinch_counter;
- #endif
-
-+#if defined(__linux__) && !defined(NANO_TINY)
- extern bool console;
-+#endif
-+
- extern bool meta_key;
- extern bool focusing;
-
-diff --git a/src/winio.c b/src/winio.c
-index bcfb8a2adf3f..1f31195af5d3 100644
---- a/src/winio.c
-+++ b/src/winio.c
-@@ -23,7 +23,9 @@
- #include "proto.h"
- #include "revision.h"
-
-+#if defined(__linux__) && !defined(NANO_TINY)
- #include <sys/ioctl.h>
-+#endif
-
- #include <stdio.h>
- #include <stdarg.h>
-@@ -504,6 +506,7 @@ int parse_kbinput(WINDOW *win)
- return sc_seq_or(do_next_block, 0);
- #endif
-
-+#if defined(__linux__) && !defined(NANO_TINY)
- /* When not running under X, check for the bare arrow keys whether
- * the Ctrl key is being held together with them. */
- if (console && (retval == KEY_UP || retval == KEY_DOWN ||
-@@ -521,6 +524,7 @@ int parse_kbinput(WINDOW *win)
- return sc_seq_or(do_next_word_void, 0);
- }
- }
-+#endif /* __linux__ && !NANO_TINY */
-
- switch (retval) {
- #ifdef KEY_SLEFT
---
-2.11.1
-
diff --git a/app-editors/nano/nano-2.6.3.ebuild b/app-editors/nano/nano-2.6.3.ebuild
deleted file mode 100644
index 91c21c12143..00000000000
--- a/app-editors/nano/nano-2.6.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
- sys-libs/ncurses:0=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
- epatch "${FILESDIR}"/${P}-minimal.patch #591026
- epatch_user
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable magic libmagic) \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/nanorc.sample
- dohtml doc/faq.html
- insinto /etc
- newins doc/nanorc.sample nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.8.3.ebuild b/app-editors/nano/nano-2.8.3.ebuild
deleted file mode 100644
index ce5e828a27c..00000000000
--- a/app-editors/nano/nano-2.8.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
- sys-libs/ncurses:0=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
- default
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=()
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf \
- --bindir="${EPREFIX}"/bin \
- --htmldir=/trash \
- $(use_enable !minimal color) \
- $(use_enable !minimal multibuffer) \
- $(use_enable !minimal nanorc) \
- --disable-wrapping-as-root \
- $(use_enable magic libmagic) \
- $(use_enable spell speller) \
- $(use_enable justify) \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable unicode utf8) \
- $(use_enable minimal tiny) \
- $(usex ncurses --without-slang $(use_with slang)) \
- "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym /bin/nano /usr/bin/nano
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2018-09-27 11:28 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2018-09-27 11:28 UTC (permalink / raw
To: gentoo-commits
commit: d150c22c354afa61f9777c65f075e58e8d6780b4
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 11:28:33 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 11:28:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d150c22c
app-editors/nano: Added USE="minimal" build fix.
Closes: https://bugs.gentoo.org/667052
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../files/nano-3.1-enable_tiny_build_fix.patch | 29 ++++++++++++++++++++++
app-editors/nano/nano-3.1.ebuild | 6 ++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch b/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch
new file mode 100644
index 00000000000..58fe1982be9
--- /dev/null
+++ b/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch
@@ -0,0 +1,29 @@
+From 368ec04870a366b19f1c5801a6868786547968b0 Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@telfort.nl>
+Date: Wed, 19 Sep 2018 20:36:39 +0200
+Subject: build: fix compilation again when configured with --enable-tiny
+
+Reported-by: Jordi Mallach <jordi@mallach.net>
+---
+ src/nano.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/nano.c b/src/nano.c
+index ebb1f11..01f92a1 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -1756,7 +1756,10 @@ int do_input(bool allow_funcs)
+ if (shortcut == NULL)
+ pletion_line = NULL;
+ else {
+- if (ISSET(VIEW_MODE) && shortcut->func != do_toggle_void &&
++ if (ISSET(VIEW_MODE) &&
++#ifndef NANO_TINY
++ shortcut->func != do_toggle_void &&
++#endif
+ !okay_for_view(shortcut)) {
+ print_view_warning();
+ return ERR;
+--
+cgit v1.0-41-gc330
+
diff --git a/app-editors/nano/nano-3.1.ebuild b/app-editors/nano/nano-3.1.ebuild
index 7f0d1d7bfbd..a9712a1c464 100644
--- a/app-editors/nano/nano-3.1.ebuild
+++ b/app-editors/nano/nano-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
static? ( ${LIB_DEPEND} )"
+PATCHES=(
+ "${FILESDIR}/${P}-enable_tiny_build_fix.patch"
+)
+
src_prepare() {
default
if [[ ${PV} == "9999" ]] ; then
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2018-10-09 11:50 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2018-10-09 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 3533eb6746b13e6ceec83ba4681572d0fba97f60
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 9 11:50:21 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 11:50:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3533eb67
app-editors/nano: Removed old.
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-editors/nano/Manifest | 2 -
.../files/nano-2.8.7-minimal_compile_fix.patch | 38 ----------
app-editors/nano/files/nano-3.0-misbinding.patch | 46 ------------
app-editors/nano/nano-2.8.7.ebuild | 87 ----------------------
app-editors/nano/nano-3.0-r1.ebuild | 87 ----------------------
5 files changed, 260 deletions(-)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index dec79ce6f4d..3c2159b4f06 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,4 +1,2 @@
-DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
-DIST nano-3.0.tar.xz 1508248 BLAKE2B 1af09a02b9a7c2aac5ce48e9df12d682d1b213885330e5e936c674602249ca6227fb190611a03d9253c93749e892c1ef5e9569c72bb7df749b6b0888da90fdcd SHA512 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1
DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03bc0bebafc458f4766561962c94f22f84cf714ece7052670c987272029d3fd6cbda20e5f09460d3bcc0ce1 SHA512 86cc1210cbc45ce2e392d6888e6e22a9214afcc24e95657f7bdb4c59476b4bea2e8ebd8b23c06b32f3acfe1da6da689135f25fcf09db34f6b1dfcc838ea5528f
diff --git a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
deleted file mode 100644
index ef8d7491016..00000000000
--- a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Tue, 29 Aug 2017 19:28:44 +0200
-Subject: tweaks: fix compilation when configured with --enable-tiny
-
-When moving the cursor to the top-left corner, it is not necessary
-to compute leftedge because firstcolumn IS the relevant leftedge.
-
-Reported-by: Jordi Mallach <jordi@debian.org>
----
- src/move.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/move.c b/src/move.c
-index d138356..ce276e4 100644
---- a/src/move.c
-+++ b/src/move.c
-@@ -121,7 +121,7 @@ void do_page_up(void)
- openfile->current = openfile->edittop;
- openfile->current_y = 0;
-
-- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+ leftedge = openfile->firstcolumn;
- target_column = 0;
- } else
- get_edge_and_target(&leftedge, &target_column);
-@@ -152,7 +152,7 @@ void do_page_down(void)
- openfile->current = openfile->edittop;
- openfile->current_y = 0;
-
-- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+ leftedge = openfile->firstcolumn;
- target_column = 0;
- } else
- get_edge_and_target(&leftedge, &target_column);
---
-cgit v1.0-41-gc330
-
diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch
deleted file mode 100644
index 2312edcff06..00000000000
--- a/app-editors/nano/files/nano-3.0-misbinding.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Wed, 12 Sep 2018 13:18:17 +0200
-Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't
- use KEY_BSP
-
-When curses gives no code for Ctrl+Shift+Delete, do not fall back
-to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to
-'cutwordleft'.
-
-This fixes https://savannah.gnu.org/bugs/?54642.
-
-Bug was introduced with version 3.0, commit e6429e78.
----
- src/nano.c | 2 +-
- src/nano.h | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/nano.c b/src/nano.c
-index c7e0ca2d..74e12439 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -2580,7 +2580,7 @@ int main(int argc, char **argv)
- controlhome = get_keycode("kHOM5", CONTROL_HOME);
- controlend = get_keycode("kEND5", CONTROL_END);
- controldelete = get_keycode("kDC5", CONTROL_DELETE);
-- controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE);
-+ controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE);
- #ifndef NANO_TINY
- /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */
- shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT);
-diff --git a/src/nano.h b/src/nano.h
-index e1042759..7de34bf3 100644
---- a/src/nano.h
-+++ b/src/nano.h
-@@ -588,6 +588,7 @@ enum
- #define SHIFT_CONTROL_DOWN 0x414
- #define SHIFT_CONTROL_HOME 0x415
- #define SHIFT_CONTROL_END 0x416
-+#define CONTROL_SHIFT_DELETE 0x417
- #define ALT_LEFT 0x421
- #define ALT_RIGHT 0x422
- #define ALT_UP 0x423
---
-2.17.1
-
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
deleted file mode 100644
index 9c57e32be25..00000000000
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-else
- MY_P=${PN}-${PV/_}
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
- sys-libs/ncurses:0=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
- static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
- "${FILESDIR}/${P}-minimal_compile_fix.patch" #629510
-)
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- --disable-wrapping-as-root
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
- )
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- rm -rf "${D}"/trash
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED%/}"/etc/nanorc || die
- fi
-
- dodir /usr/bin
- dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-3.0-r1.ebuild b/app-editors/nano/nano-3.0-r1.ebuild
deleted file mode 100644
index 44b716308be..00000000000
--- a/app-editors/nano/nano-3.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
- sys-libs/ncurses:0=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
- static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-misbinding.patch
-)
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- --disable-wrapping-as-root
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
- )
- case ${CHOST} in
- *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
- esac
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D%/}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED%/}"/etc/nanorc || die
- fi
-
- dosym ../../bin/nano /usr/bin/nano
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2019-04-25 8:11 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2019-04-25 8:11 UTC (permalink / raw
To: gentoo-commits
commit: ee26eaa74e2f7c9ffeb961e07b9c1c6c6f7eb729
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 08:10:54 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 08:11:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee26eaa7
app-editors/nano: Removed old.
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-editors/nano/Manifest | 1 -
.../files/nano-4.0-variable_initialization.patch | 39 ----------
app-editors/nano/nano-4.0-r1.ebuild | 85 ----------------------
3 files changed, 125 deletions(-)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 8b692af14c1..46a5796874f 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,4 +1,3 @@
DIST nano-3.2.tar.gz 2944045 BLAKE2B 8d29d574ebf543f82608d4df26f551c0b3c77863b2ac8cfd0d3aea45340954abe6221069c9c72beab256c2c8cc4fcd3de27804404d97a98144c69ad26223de09 SHA512 33b3bbc5b5044b4003347e87926046fb5a0e83edfd6de858085526b7eaa9ea7ee26a598da00060a6b62edbd0366c7cb06b5a9878f6f0149a9501e4ada80b88f3
-DIST nano-4.0.tar.gz 2997716 BLAKE2B b5b7c172119518dc25ad1b77fda4a011225292b36bfeb042ede3191f7b7d576273c9172c9ab32271b4a648d8720c3745496526f0feb871e02d88ae3865cfacd5 SHA512 7548a3cf37aaa5f7ed9e951c18b3d058e8f587bcfbae0e707668f51ab9932aa467b8191117a7d1a76f090124cfe3e0e93ce4e1cccd8aa0bf7fd0d282caede5c1
DIST nano-4.1.tar.gz 2918354 BLAKE2B 6f5438b2e4bb9a6de405a7519d1767697df1504e67aae37a75743b658b82d9bf13e0b561177415445827f8a63456afd4f689b1d34b6a3eb53c940972fa01f93d SHA512 982b845197aa2942eb8a49b2ac1bfd8cc65ec9b6b7f60190059367b4f9156b4f0bb5e56a123f0659b23c6c9d1d85733123350a8f04c433ccb32d4c8ef1135d12
DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
diff --git a/app-editors/nano/files/nano-4.0-variable_initialization.patch b/app-editors/nano/files/nano-4.0-variable_initialization.patch
deleted file mode 100644
index c72122ed703..00000000000
--- a/app-editors/nano/files/nano-4.0-variable_initialization.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7ad232d71470cd8c4dc63aeb02f11c9e8df9ecdb Mon Sep 17 00:00:00 2001
-From: Devin Hussey <husseydevin@gmail.com>
-Date: Thu, 28 Mar 2019 17:28:47 -0400
-Subject: [PATCH] files: initialize a variable before referencing it
-
-The lack of initialization caused a nasty bug on some targets (such as
-ARMv7) which would make it so that ^S would just say "Cancelled".
-
-While x86 (both 64 and 32 bits) seems to initialize 'response' to zero or
-a positive number, ARM does not, and there is usually a negative value in
-its place, which triggers the 'if (response < 0)' check and, as a result,
-the code says "Cancelled".
-
-This fixes https://savannah.gnu.org/bugs/?56023.
-Reported-by: Devin Hussey <husseydevin@gmail.com>
-
-Bug existed since version 4.0, commit 0f9d60a3.
-
-Signed-off-by: Devin Hussey <husseydevin@gmail.com>
----
- src/files.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/files.c b/src/files.c
-index 84e3f684..fd54c168 100644
---- a/src/files.c
-+++ b/src/files.c
-@@ -2101,7 +2101,7 @@ int do_writeout(bool exiting, bool withprompt)
-
- while (TRUE) {
- const char *msg;
-- int response, choice;
-+ int response = 0, choice = 0;
- functionptrtype func;
- #ifndef NANO_TINY
- const char *formatstr, *backupstr;
---
-2.20.1
-
diff --git a/app-editors/nano/nano-4.0-r1.ebuild b/app-editors/nano/nano-4.0-r1.ebuild
deleted file mode 100644
index 05e4012530b..00000000000
--- a/app-editors/nano/nano-4.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
- sys-libs/ncurses:0=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-variable_initialization.patch"
-)
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- dosym ../../bin/nano /usr/bin/nano
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2021-02-24 12:22 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2021-02-24 12:22 UTC (permalink / raw
To: gentoo-commits
commit: 8aff3e95e11b7417e7a558761ed13842d69042e3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 12:22:05 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 12:22:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aff3e95
app-editors/nano: Removed old
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-editors/nano/Manifest | 2 -
.../nano-4.9.3-disable-speller_build_fix.patch | 342 ---------------------
.../nano/files/nano-4.9.3-minimal_build_fix.patch | 46 ---
app-editors/nano/nano-4.9.3.ebuild | 88 ------
app-editors/nano/nano-5.4.ebuild | 92 ------
5 files changed, 570 deletions(-)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 65ea113183a..224eabbe48b 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,5 +1,3 @@
-DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
-DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056
DIST nano-5.6.tar.gz 2956090 BLAKE2B 753c49e67403577ac272438b2a577f29978f621cb1823f3ccc4fb5df229b805c72a7123d5e5632cb9e1d4b50c7cf90675d748e7e88709703be44126e11231974 SHA512 fff8a558b435b9f372f19306e63c3bad34a60b4b1979ddf2a5724f96ca69fd7fd5850e841f714fad2e382ffc8e5c3f5085f6a6e965ff30f44bf12b8ac865fe6b
diff --git a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch b/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
deleted file mode 100644
index 978e24de805..00000000000
--- a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From 4b7f7a30c9ec593d68186b1dfef44d4e2bda735b Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Mon, 22 Jun 2020 08:39:59 +0200
-Subject: [PATCH] build: fix compilation when configured with
- --disable-speller
-
-Move two functions that are used by the formatter too
-to between the proper #ifdef.
-
-Problem existed since commit 8089f5ad from a month ago.
-
-Backported to v4.9.3
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/text.c | 302 ++++++++++++++++++++++++++---------------------------
- 1 file changed, 151 insertions(+), 151 deletions(-)
-
-diff --git a/src/text.c b/src/text.c
-index 93ad3704..c7690fd0 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -2011,8 +2011,159 @@ void construct_argument_list(char ***arguments, char *command, char *filename)
- (*arguments)[count - 2] = filename;
- (*arguments)[count - 1] = NULL;
- }
-+
-+/* Open the specified file, and if that succeeds, remove the text of the marked
-+ * region or of the entire buffer and read the file contents into its place. */
-+bool replace_buffer(const char *filename, undo_type action, const char *operation)
-+{
-+ linestruct *was_cutbuffer = cutbuffer;
-+ int descriptor;
-+ FILE *stream;
-+
-+ descriptor = open_file(filename, FALSE, &stream);
-+
-+ if (descriptor < 0)
-+ return FALSE;
-+
-+ cutbuffer = NULL;
-+
-+#ifndef NANO_TINY
-+ add_undo(COUPLE_BEGIN, operation);
-+
-+ /* Cut either the marked region or the whole buffer. */
-+ add_undo(action, NULL);
-+#endif
-+ do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
-+#ifndef NANO_TINY
-+ update_undo(action);
- #endif
-
-+ /* Discard what was cut. */
-+ free_lines(cutbuffer);
-+ cutbuffer = was_cutbuffer;
-+
-+ /* Insert the spell-checked file into the cleared area. */
-+ read_file(stream, descriptor, filename, TRUE);
-+
-+#ifndef NANO_TINY
-+ add_undo(COUPLE_END, operation);
-+#endif
-+ return TRUE;
-+}
-+
-+/* Execute the given program, with the given temp file as last argument. */
-+const char *treat(char *tempfile_name, char *theprogram, bool spelling)
-+{
-+ ssize_t lineno_save = openfile->current->lineno;
-+ size_t current_x_save = openfile->current_x;
-+ size_t pww_save = openfile->placewewant;
-+ bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
-+ struct stat fileinfo;
-+ long timestamp_sec, timestamp_nsec;
-+ static char **arguments = NULL;
-+ pid_t thepid;
-+ int program_status;
-+ bool replaced = FALSE;
-+
-+ /* Get the timestamp and the size of the temporary file. */
-+ stat(tempfile_name, &fileinfo);
-+ timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
-+ timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
-+
-+ /* If the number of bytes to check is zero, get out. */
-+ if (fileinfo.st_size == 0)
-+ return NULL;
-+
-+ /* Exit from curses mode to give the program control of the terminal. */
-+ endwin();
-+
-+ construct_argument_list(&arguments, theprogram, tempfile_name);
-+
-+ /* Fork a child process and run the given program in it. */
-+ if ((thepid = fork()) == 0) {
-+ execvp(arguments[0], arguments);
-+
-+ /* Terminate the child if the program is not found. */
-+ exit(9);
-+ } else if (thepid < 0)
-+ return _("Could not fork");
-+
-+ /* Block SIGWINCHes while waiting for the program to end,
-+ * so nano doesn't get pushed past the wait(). */
-+ block_sigwinch(TRUE);
-+ wait(&program_status);
-+ block_sigwinch(FALSE);
-+
-+ /* Restore the terminal state and reenter curses mode. */
-+ terminal_init();
-+ doupdate();
-+
-+ if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
-+ statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
-+ return NULL;
-+ } else if (WEXITSTATUS(program_status) != 0)
-+ statusline(ALERT, _("Program '%s' complained"), arguments[0]);
-+
-+ /* Stat the temporary file again. */
-+ stat(tempfile_name, &fileinfo);
-+
-+ /* When the temporary file wasn't touched, say so and leave. */
-+ if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
-+ (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
-+ statusbar(_("Nothing changed"));
-+ return NULL;
-+ }
-+
-+#ifndef NANO_TINY
-+ /* Replace the marked text (or entire text) with the corrected text. */
-+ if (spelling && openfile->mark) {
-+ ssize_t was_mark_lineno = openfile->mark->lineno;
-+ bool upright = mark_is_before_cursor();
-+
-+ replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
-+
-+ /* Adjust the end point of the marked region for any change in
-+ * length of the region's last line. */
-+ if (upright)
-+ current_x_save = openfile->current_x;
-+ else
-+ openfile->mark_x = openfile->current_x;
-+
-+ /* Restore the mark. */
-+ openfile->mark = line_from_number(was_mark_lineno);
-+ } else
-+#endif
-+ {
-+ openfile->current = openfile->filetop;
-+ openfile->current_x = 0;
-+
-+ replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
-+ /* TRANSLATORS: The next two go with Undid/Redid messages. */
-+ (spelling ? N_("spelling correction") : N_("formatting")));
-+ }
-+
-+ /* Go back to the old position. */
-+ goto_line_posx(lineno_save, current_x_save);
-+ if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
-+ openfile->current_x = strlen(openfile->current->data);
-+
-+#ifndef NANO_TINY
-+ if (replaced)
-+ update_undo(COUPLE_END);
-+#endif
-+
-+ openfile->placewewant = pww_save;
-+ adjust_viewport(STATIONARY);
-+
-+ if (spelling)
-+ statusbar(_("Finished checking spelling"));
-+ else
-+ statusbar(_("Buffer has been processed"));
-+
-+ return NULL;
-+}
-+#endif /* ENABLE_SPELLER || ENABLE_COLOR */
-+
- #ifdef ENABLE_SPELLER
- /* Let the user edit the misspelled word. Return FALSE if the user cancels. */
- bool fix_spello(const char *word)
-@@ -2307,157 +2458,6 @@ const char *do_int_speller(const char *tempfile_name)
- return NULL;
- }
-
--/* Open the specified file, and if that succeeds, remove the text of the marked
-- * region or of the entire buffer and read the file contents into its place. */
--bool replace_buffer(const char *filename, undo_type action, const char *operation)
--{
-- linestruct *was_cutbuffer = cutbuffer;
-- int descriptor;
-- FILE *stream;
--
-- descriptor = open_file(filename, FALSE, &stream);
--
-- if (descriptor < 0)
-- return FALSE;
--
-- cutbuffer = NULL;
--
--#ifndef NANO_TINY
-- add_undo(COUPLE_BEGIN, operation);
--
-- /* Cut either the marked region or the whole buffer. */
-- add_undo(action, NULL);
--#endif
-- do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
--#ifndef NANO_TINY
-- update_undo(action);
--#endif
--
-- /* Discard what was cut. */
-- free_lines(cutbuffer);
-- cutbuffer = was_cutbuffer;
--
-- /* Insert the spell-checked file into the cleared area. */
-- read_file(stream, descriptor, filename, TRUE);
--
--#ifndef NANO_TINY
-- add_undo(COUPLE_END, operation);
--#endif
-- return TRUE;
--}
--
--/* Execute the given program, with the given temp file as last argument. */
--const char *treat(char *tempfile_name, char *theprogram, bool spelling)
--{
-- ssize_t lineno_save = openfile->current->lineno;
-- size_t current_x_save = openfile->current_x;
-- size_t pww_save = openfile->placewewant;
-- bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
-- struct stat fileinfo;
-- long timestamp_sec, timestamp_nsec;
-- static char **arguments = NULL;
-- pid_t thepid;
-- int program_status;
-- bool replaced = FALSE;
--
-- /* Get the timestamp and the size of the temporary file. */
-- stat(tempfile_name, &fileinfo);
-- timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
-- timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
--
-- /* If the number of bytes to check is zero, get out. */
-- if (fileinfo.st_size == 0)
-- return NULL;
--
-- /* Exit from curses mode to give the program control of the terminal. */
-- endwin();
--
-- construct_argument_list(&arguments, theprogram, tempfile_name);
--
-- /* Fork a child process and run the given program in it. */
-- if ((thepid = fork()) == 0) {
-- execvp(arguments[0], arguments);
--
-- /* Terminate the child if the program is not found. */
-- exit(9);
-- } else if (thepid < 0)
-- return _("Could not fork");
--
-- /* Block SIGWINCHes while waiting for the program to end,
-- * so nano doesn't get pushed past the wait(). */
-- block_sigwinch(TRUE);
-- wait(&program_status);
-- block_sigwinch(FALSE);
--
-- /* Restore the terminal state and reenter curses mode. */
-- terminal_init();
-- doupdate();
--
-- if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
-- statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
-- return NULL;
-- } else if (WEXITSTATUS(program_status) != 0)
-- statusline(ALERT, _("Program '%s' complained"), arguments[0]);
--
-- /* Stat the temporary file again. */
-- stat(tempfile_name, &fileinfo);
--
-- /* When the temporary file wasn't touched, say so and leave. */
-- if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
-- (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
-- statusbar(_("Nothing changed"));
-- return NULL;
-- }
--
--#ifndef NANO_TINY
-- /* Replace the marked text (or entire text) with the corrected text. */
-- if (spelling && openfile->mark) {
-- ssize_t was_mark_lineno = openfile->mark->lineno;
-- bool upright = mark_is_before_cursor();
--
-- replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
--
-- /* Adjust the end point of the marked region for any change in
-- * length of the region's last line. */
-- if (upright)
-- current_x_save = openfile->current_x;
-- else
-- openfile->mark_x = openfile->current_x;
--
-- /* Restore the mark. */
-- openfile->mark = line_from_number(was_mark_lineno);
-- } else
--#endif
-- {
-- openfile->current = openfile->filetop;
-- openfile->current_x = 0;
--
-- replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
-- /* TRANSLATORS: The next two go with Undid/Redid messages. */
-- (spelling ? N_("spelling correction") : N_("formatting")));
-- }
--
-- /* Go back to the old position. */
-- goto_line_posx(lineno_save, current_x_save);
-- if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
-- openfile->current_x = strlen(openfile->current->data);
--
--#ifndef NANO_TINY
-- if (replaced)
-- update_undo(COUPLE_END);
--#endif
--
-- openfile->placewewant = pww_save;
-- adjust_viewport(STATIONARY);
--
-- if (spelling)
-- statusbar(_("Finished checking spelling"));
-- else
-- statusbar(_("Buffer has been processed"));
--
-- return NULL;
--}
--
- /* Spell check the current file. If an alternate spell checker is
- * specified, use it. Otherwise, use the internal spell checker. */
- void do_spell(void)
---
-2.28.0
-
diff --git a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch b/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
deleted file mode 100644
index 52112bab723..00000000000
--- a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a98f48b4e82db7d30aa04925fb28344f5bce8c7c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Mon, 22 Jun 2020 14:00:23 +0200
-Subject: [PATCH] build: fix compilation for --enable-tiny --enable-color
- --enable-nanorc
-
-Backported to v4.9.3
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/nano.c | 2 +-
- src/text.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/nano.c b/src/nano.c
-index be80a073..3ac81ba4 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -1079,7 +1079,7 @@ RETSIGTYPE do_continue(int signal)
- ungetch(KEY_FLUSH);
- }
-
--#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
-+#if !defined(NANO_TINY) || defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)
- /* Block or unblock the SIGWINCH signal, depending on the blockit parameter. */
- void block_sigwinch(bool blockit)
- {
-diff --git a/src/text.c b/src/text.c
-index c7690fd0..32727946 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -2032,10 +2032,10 @@ bool replace_buffer(const char *filename, undo_type action, const char *operatio
-
- /* Cut either the marked region or the whole buffer. */
- add_undo(action, NULL);
--#endif
- do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
--#ifndef NANO_TINY
- update_undo(action);
-+#else
-+ do_snip(FALSE, TRUE, FALSE, FALSE);
- #endif
-
- /* Discard what was cut. */
---
-2.28.0
-
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
deleted file mode 100644
index 869ecf6995d..00000000000
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-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 ~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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-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(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
-
-PATCHES=(
- "${FILESDIR}/${P}-disable-speller_build_fix.patch"
- "${FILESDIR}/${P}-minimal_build_fix.patch" #734856
-)
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-5.4.ebuild b/app-editors/nano/nano-5.4.ebuild
deleted file mode 100644
index 92473ae856c..00000000000
--- a/app-editors/nano/nano-5.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-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 ~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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-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(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- !ncurses? ( slang? ( minimal ) )
- magic? ( !minimal )
-"
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- 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
-
- use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2021-12-18 14:14 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2021-12-18 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 7f05d540bf2d571619d630d375c6ca5eff14cdaa
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 18 14:12:08 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Dec 18 14:14:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f05d540
app-editors/nano: Bump to version 6.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-editors/nano/Manifest | 1 +
app-editors/nano/files/gentoo.nanorc | 74 ++++++++++++++++++++++++++++
app-editors/nano/nano-6.0.ebuild | 93 ++++++++++++++++++++++++++++++++++++
3 files changed, 168 insertions(+)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 8b3194b5ca78..037fbe1c759f 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,2 +1,3 @@
DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f
DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
+DIST nano-6.0.tar.gz 3114631 BLAKE2B d89abcbd3673867447bbfd4eedfcd7b7d5250a3ebc1048068cf03f690b2fbd072c0224c00bef9b829bff8343dacf669e8e784fa24dafaa6441746471b692c55a SHA512 fa5726810cfb53fd2cc451d5a34e8f5c316c496f8d649a3899fae0b61cc5ca0bffd28deb780e4e0c98169487b8c34468fd401534b9110ba968d2d4ab6847bc87
diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc
new file mode 100644
index 000000000000..84e9bcf28ebf
--- /dev/null
+++ b/app-editors/nano/files/gentoo.nanorc
@@ -0,0 +1,74 @@
+## Syntax highlighting for Gentoo ebuilds/eclasses,
+## and (further down) for Portage control files.
+
+syntax ebuild "\.e(build|class)$"
+comment "#"
+
+## 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))\>"
+color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
+## Bash-related syntax:
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[][{}():;|`$<>!=&\]"
+color green "-[defhnrsuwxzL]\>"
+color green "-(eq|ne|gt|lt|ge|le)\>"
+## 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 "\<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\>"
+## 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 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 "\<(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)\>"
+## 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):
+color yellow "(^|[[:space:]])#.*"
+## Strings (doesn't work that well):
+color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " "
+
+
+syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+comment "#"
+
+## Base text:
+color green ".+"
+## Likely version and slot numbers:
+color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
+## Use flags (must come after version/slot):
+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 "[[:space:]][*~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*[^/]*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
+## Comments:
+color yellow "#.*"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " "
diff --git a/app-editors/nano/nano-6.0.ebuild b/app-editors/nano/nano-6.0.ebuild
new file mode 100644
index 000000000000..ad20434b2ed1
--- /dev/null
+++ b/app-editors/nano/nano-6.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
+ inherit git-r3 autotools
+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 ~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"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
+
+LIB_DEPEND="
+ >=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
+ sys-libs/ncurses:=[static-libs(+)]
+ magic? ( sys-apps/file[static-libs(+)] )
+ nls? ( virtual/libintl )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+REQUIRED_USE="
+ magic? ( !minimal )
+"
+
+src_prepare() {
+ default
+ if [[ ${PV} == "9999" ]] ; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myconf=(
+ --bindir="${EPREFIX}"/bin
+ --htmldir=/trash
+ $(use_enable !minimal color)
+ $(use_enable !minimal multibuffer)
+ $(use_enable !minimal nanorc)
+ $(use_enable magic libmagic)
+ $(use_enable spell speller)
+ $(use_enable justify)
+ $(use_enable debug)
+ $(use_enable nls)
+ $(use_enable unicode utf8)
+ $(use_enable minimal tiny)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ # don't use "${ED}" here or things break (#654534)
+ rm -r "${D}"/trash || die
+
+ dodoc doc/sample.nanorc
+ docinto html
+ dodoc doc/faq.html
+ insinto /etc
+ newins doc/sample.nanorc nanorc
+ if ! use minimal ; then
+ # Enable colorization by default.
+ 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
+
+ insinto "${rcdir}"
+ doins "${FILESDIR}/gentoo.nanorc"
+ fi
+
+ use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
@ 2022-08-03 2:14 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-08-03 2:14 UTC (permalink / raw
To: gentoo-commits
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}."
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-08-03 2:14 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-19 4:55 [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2022-08-03 2:14 Sam James
2021-12-18 14:14 Lars Wendler
2021-02-24 12:22 Lars Wendler
2019-04-25 8:11 Lars Wendler
2018-10-09 11:50 Lars Wendler
2018-09-27 11:28 Lars Wendler
2017-06-25 17:31 Lars Wendler
2016-12-29 18:47 Mike Frysinger
2016-02-12 17:39 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox