nano: upgraded package to upstream
Upgraded app-editors/nano to version 2.7.5 on amd64, arm, x86
BUG=chromium:732541
TEST=for b in x86-generic bob link; do
FEATURES=test emerge-${b} -q nano; done
Change-Id: I1f1a1de15ed8d734ea6387706d21fc931351ce89
Reviewed-on: https://chromium-review.googlesource.com/574727
Commit-Ready: Benjamin Gordon <bmgordon@chromium.org>
Tested-by: Benjamin Gordon <bmgordon@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index ead036d..6f35c6e 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1 +1 @@
-DIST nano-2.7.3.tar.gz 2048675 SHA256 3574d4594d051f3b572c47d63bfc3763fb1148c50b811ba7a016bacd94887a88 SHA512 cd159cf193f05b37f770ac79e532fe96be158688d241ab7090861016fe0da9dde2ab504d0703b8feea8043e1deded3f10f0ab4dd5cceba99fe4a1dfcf5062b0b WHIRLPOOL 19b042c29be4c8afca33870e85f0b893aa9f9d958be3043272dcef5ad8d775dc3b43fe1a418efee283c89a301be1503b04b825758666be1a8e25596f3a36b8be
+DIST nano-2.7.5.tar.gz 2031723 SHA256 226be22f46359007aa76499623739f4a7d5fa294a2899c70b21bc09b8d81d907 SHA512 a5332a361c4d0d9d0a77ebb11cdcffa976bee4981d5665b2732a9e6d7a2997566d9345332f2e6e5cb74f0a81be4413f54ca8f719962ab10b32d7ec1c9271973c WHIRLPOOL bd28cde96896ad531bb499504bb1438b358b64e7f6080fa24758bee7c222b4d1df0c395d480d0cef54de8e78a7e457db403a9ef2d6a56033e65299b6d7f95634
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..0000000
--- 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.5.ebuild
similarity index 92%
rename from app-editors/nano/nano-2.7.3.ebuild
rename to app-editors/nano/nano-2.7.5.ebuild
index c2789fe..2cc767b 100644
--- a/app-editors/nano/nano-2.7.3.ebuild
+++ b/app-editors/nano/nano-2.7.5.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 @@
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
- epatch "${FILESDIR}"/${P}-tiny.patch #604000
epatch_user
}
@@ -67,11 +66,11 @@
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/metadata/md5-cache/app-editors/nano-2.4.2 b/metadata/md5-cache/app-editors/nano-2.4.2
deleted file mode 100644
index 75626f3..0000000
--- a/metadata/md5-cache/app-editors/nano-2.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=4
-HOMEPAGE=http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml
-IUSE=debug justify +magic minimal ncurses nls slang +spell unicode
-KEYWORDS=*
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r1[unicode?] magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) )
-SLOT=0
-SRC_URI=http://www.nano-editor.org/dist/v2.4/nano-2.4.2.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=a2e9a4224d0fa3029e541fcbc96c25f0
diff --git a/metadata/md5-cache/app-editors/nano-2.7.5 b/metadata/md5-cache/app-editors/nano-2.7.5
new file mode 100644
index 0000000..cb9bb77
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-2.7.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig static? ( >=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(+)] ) ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=5
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v2.7/nano-2.7.5.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=5f1c6ae60f56395e9828d97652930034
