summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2017-01-18 22:54:59 -0600
committerMike Frysinger <vapier@gentoo.org>2017-01-18 22:54:59 -0600
commitd667baf2c48d90d6052372e3bce0faf8ab9c8c8b (patch)
treeef8d1be4acc52314d65fa02363899a3a69787e84 /app-editors
parentnet-libs/libmbim: move libgudev to RDEPEND (diff)
downloadgentoo-d667baf2c48d90d6052372e3bce0faf8ab9c8c8b.tar.gz
gentoo-d667baf2c48d90d6052372e3bce0faf8ab9c8c8b.tar.bz2
gentoo-d667baf2c48d90d6052372e3bce0faf8ab9c8c8b.zip
app-editors/nano: version bump to 2.7.4
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/nano/Manifest2
-rw-r--r--app-editors/nano/files/nano-2.7.3-tiny.patch29
-rw-r--r--app-editors/nano/nano-2.7.4.ebuild (renamed from app-editors/nano/nano-2.7.3.ebuild)7
-rw-r--r--app-editors/nano/nano-9999.ebuild9
4 files changed, 8 insertions, 39 deletions
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 4045fce54138..3183cbfc0d4f 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 148716d5db7b..000000000000
--- 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
index 26259bc64c99..f68c6ce0d99e 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 c75dad952a4f..ab05f553eb84 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 \