gentoo resync : 05.04.2019

6 files changed, 60 insertions, 55 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index f76ddf753a3b..db625834eeb1 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,9 @@
-AUX nano-3.1-enable_tiny_build_fix.patch 828 BLAKE2B 70899179a7f4d27202b7f70886f8ef73719e37d44c0b538432986bbb888a2d03620d7e4822550b1f5648f6733cbfbc6585c0c86ad02208cd38f7fe3b543c4e99 SHA512 b3ac68f0d64fcf4b92d59768342debefe24d8e4cabee9a649a94339ff4b0d0d014cd9f4c3a3dc32ff3e84850dbd1f71c5525d3c422cb964f380d6504b1985eec
+AUX nano-4.0-variable_initialization.patch 1249 BLAKE2B bdcae72c88fd3e76bb5d22d69351977a00125e54deffcf2f4d16c85a00cd661b147db3aca680c905a977e05aeeda9a5a2c0a04303f98990f4d95787e18fce16f SHA512 d2b59bd5614a52d496c1a22bcd7ad9090a833fac2f1c3d46264d2ace37916495fccc04a248f8c255eb23a142335a13992db0f99ca2de27dd8efe984f6ce75876
 DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
-DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03bc0bebafc458f4766561962c94f22f84cf714ece7052670c987272029d3fd6cbda20e5f09460d3bcc0ce1 SHA512 86cc1210cbc45ce2e392d6888e6e22a9214afcc24e95657f7bdb4c59476b4bea2e8ebd8b23c06b32f3acfe1da6da689135f25fcf09db34f6b1dfcc838ea5528f
 DIST nano-3.2.tar.gz 2944045 BLAKE2B 8d29d574ebf543f82608d4df26f551c0b3c77863b2ac8cfd0d3aea45340954abe6221069c9c72beab256c2c8cc4fcd3de27804404d97a98144c69ad26223de09 SHA512 33b3bbc5b5044b4003347e87926046fb5a0e83edfd6de858085526b7eaa9ea7ee26a598da00060a6b62edbd0366c7cb06b5a9878f6f0149a9501e4ada80b88f3
+DIST nano-4.0.tar.gz 2997716 BLAKE2B b5b7c172119518dc25ad1b77fda4a011225292b36bfeb042ede3191f7b7d576273c9172c9ab32271b4a648d8720c3745496526f0feb871e02d88ae3865cfacd5 SHA512 7548a3cf37aaa5f7ed9e951c18b3d058e8f587bcfbae0e707668f51ab9932aa467b8191117a7d1a76f090124cfe3e0e93ce4e1cccd8aa0bf7fd0d282caede5c1
 EBUILD nano-2.9.8.ebuild 2272 BLAKE2B 5c338053fba942e24c5e0da0073afc6dc6e78a09997ce82539e1ba069f23f6045b1f6299b7623294620839ba7067e5c08a66bf71263d8c52f50069b684d97f6b SHA512 f7b44353b2568c794e91f56177bab887f3e68bc25ab48a124dad3895e9e6a1691c8ec755da31b1c59985ab7f7a879cd1c10b91842bb28fa057839a793991440f
-EBUILD nano-3.1.ebuild 2337 BLAKE2B 13b03e1a7d6c511f07205e717ba46db0a812ea33b83fea240f19260558e789d0d6aac75dec56373290673c008166c6caa4de5f574ec3fa3319ab8e3e8b97d52e SHA512 488cf08e5b026af85c5ef01a0160b5e6c6973c14df1162e0bc66dd1a7732a06ce35599a8b733fa4056e76db4906796b7e6c6fa6c1f84b5dd83bd217756c905c0
-EBUILD nano-3.2.ebuild 2276 BLAKE2B badeb96f9c4d4777c3f727ee74ba372a69f2d140ebff46071b8f5e932a7c84671f07ccf949101af9bee9b3a02d2aeacfa3dc8af2471771e41ea77dba2b6b8d50 SHA512 ce906885ac76601b00d7f9d7c6865fd5a80ef1078263959ab97d5686b738a1f3384fb91331f2ee3c44ad3009c6882e40eaf9104d7ecd9f1601f03cafc1197c2e
-EBUILD nano-9999.ebuild 2279 BLAKE2B 6a4a167d78038e7c982383f87a94d8ced33eab3beb9a7765ec4de6832ffcc21a8105e5f8d2799e9df25545de224cc687365110db0f80cc6ef1578bd0b52e80ca SHA512 b9e7bbb9924ce98ed642ec963dfa0a585fd8bdda095fe19029df3b61c98d769e88760afb535e2f5fd728d1e9df39bd9c29524c90b1b3779b6e5d374917652955
+EBUILD nano-3.2.ebuild 2270 BLAKE2B fb1f7add3bdbcd2518df7289d06fd86c90e825926d003307860347e622aa8b5e047d40697f526c810037ead3619bc10e37fc999d9d94ac40736ed6f94c2cd314 SHA512 7ccc714b8e6604f1d64ec7579b418a3b1f78d2e210be7775a3523f1f1398b3ea449bfd2dd211dcda9dadedac0aeefd1d8f0d6c2cf1f03de7355bdf20d8d05591
+EBUILD nano-4.0-r1.ebuild 2231 BLAKE2B f0933acb7077d144406a96035341ce37459cb899b0d79f3fe6693c2a29cfd7f075974688b3dce5bdd63f921e5c1658de5309d926dff38ee3fbf34c691b38d19a SHA512 da8f8eb8d4c844b96a7d752e6fd3a9f0d97b053d74b9645712c166041b9931b4bff436385156754db8223d42674007f82dca4e222017ff4567e734e129255dbf
+EBUILD nano-9999.ebuild 2167 BLAKE2B 080b22cb427c898adae6c8a92d3ff006631cc23af17eb60e81562e3229a13813411c1f92d5fefc32d78ecec915c7e09662b2073c2b578d8088e59b145eed0942 SHA512 42f845600a37f56804f3cbcc02c6c52dc79c23e0e391125edfe9fb449dc5cead82fad043af3086bdbe7e5561223e74630131220ebb36b4ec795f0cb2cc82055d
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
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
deleted file mode 100644
index 58fe1982be9c..000000000000
--- a/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/files/nano-4.0-variable_initialization.patch b/app-editors/nano/files/nano-4.0-variable_initialization.patch
new file mode 100644
index 000000000000..c72122ed7035
--- /dev/null
+++ b/app-editors/nano/files/nano-4.0-variable_initialization.patch
@@ -0,0 +1,39 @@
+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-3.2.ebuild b/app-editors/nano/nano-3.2.ebuild
index ab30b722f856..1e3b8fded42d 100644
--- a/app-editors/nano/nano-3.2.ebuild
+++ b/app-editors/nano/nano-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
+	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"
diff --git a/app-editors/nano/nano-3.1.ebuild b/app-editors/nano/nano-4.0-r1.ebuild
index a9712a1c464c..05e4012530b3 100644
--- a/app-editors/nano/nano-3.1.ebuild
+++ b/app-editors/nano/nano-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,12 +27,14 @@ LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	!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
-	static? ( ${LIB_DEPEND} )"
+"
 
 PATCHES=(
-	"${FILESDIR}/${P}-enable_tiny_build_fix.patch"
+	"${FILESDIR}/${P}-variable_initialization.patch"
 )
 
 src_prepare() {
@@ -50,7 +52,6 @@ src_configure() {
 		$(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)
@@ -60,16 +61,13 @@ src_configure() {
 		$(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
+	rm -r "${D}"/trash || die
 
 	dodoc doc/sample.nanorc
 	docinto html
@@ -80,7 +78,7 @@ src_install() {
 		# Enable colorization by default.
 		sed -i \
 			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
+			"${ED}"/etc/nanorc || die
 	fi
 
 	dosym ../../bin/nano /usr/bin/nano
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index f4eec8c7c12a..aa130516a9a2 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	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
 
@@ -27,10 +27,11 @@ LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	!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
-	static? ( ${LIB_DEPEND} )"
-
+"
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
@@ -46,7 +47,6 @@ src_configure() {
 		$(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)
@@ -56,16 +56,13 @@ src_configure() {
 		$(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
+	rm -r "${D}"/trash || die
 
 	dodoc doc/sample.nanorc
 	docinto html
@@ -76,7 +73,7 @@ src_install() {
 		# Enable colorization by default.
 		sed -i \
 			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
+			"${ED}"/etc/nanorc || die
 	fi
 
 	dosym ../../bin/nano /usr/bin/nano