gentoo resync : 30.09.2018

3 files changed, 36 insertions, 2 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 68ba6c6e3d6e..d00fb0ff1819 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,5 +1,6 @@
 AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
 AUX nano-3.0-misbinding.patch 1517 BLAKE2B 2feac73d587beaed77649b7d6c92e3eabd411203e38f8b55ae874dcedcd4813ee6abc6b4e54fb33236c380e263257ac7e58b1c027446a4bc6caf5ab067a50c47 SHA512 0ba212b5b076ddb81f8ca723cc9c8656cf00375a913afe35036c84b3a3de23b773d11661d92d389275b26cb090a20445825fd91648579fb8a340b6992930f6bc
+AUX nano-3.1-enable_tiny_build_fix.patch 828 BLAKE2B 70899179a7f4d27202b7f70886f8ef73719e37d44c0b538432986bbb888a2d03620d7e4822550b1f5648f6733cbfbc6585c0c86ad02208cd38f7fe3b543c4e99 SHA512 b3ac68f0d64fcf4b92d59768342debefe24d8e4cabee9a649a94339ff4b0d0d014cd9f4c3a3dc32ff3e84850dbd1f71c5525d3c422cb964f380d6504b1985eec
 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
@@ -7,6 +8,6 @@ DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03
 EBUILD nano-2.8.7.ebuild 2296 BLAKE2B 0136026fb72a5b1978057e7f9ae7348bd3fd32f47c64316a5b65eb8c74689f8effc4011ef6c1e058cb22f05df001a80e9c7607cd616d8f731ab9f052239389da SHA512 bef42b685a5afb428083378cb084b9c8a0ce679ce4aedf59056eefa4976543babeab6b411f3c002d878fbc50c78fba1e91ef24cd20ae9cb62efd40b36a770305
 EBUILD nano-2.9.8.ebuild 2280 BLAKE2B b644ee6fab01ff53146e0fab085d5547ed4f11743e41a0f856f2ed552bec3f2dbe7a32439e816fac5f96234f1aa9d600761b9687e864854d29978f503168fa77 SHA512 8042d5e3fe58e71af3d928e4ed385665c65d21598f45fd58c1830ded958879cb8642fd98894f147b5b87cfc8a47a24386502084d740fccec5569acd532294220
 EBUILD nano-3.0-r1.ebuild 2329 BLAKE2B ba5b2dcd3e38887a4a1e21789fc2955bfdd9f5328a65edc159d728b97b93612bb4addb9b239cd7175a1a51346f77018597fed1e67bc4a55751570a2320c1079a SHA512 439aef7945a4dbb37a9132a922179440d011d7b172318cd875f065db8a20f92ed58c6c4c507d28dfd5df5eedad02bbbb199b3982378c6ee0fde8db216c5e990d
-EBUILD nano-3.1.ebuild 2279 BLAKE2B 7593cfafb9f968b27a417bc7ae06ca04204922d01760dcc535542a17c534f32bf86b72b85c45a345f4fb1980a5806ecef784f1a0feee34359c5adf60ba38b2c9 SHA512 c85d9ac732fc1136271c162875028ec486120eb9733dd300b677b7657581db9bc32725aeb5c3447cf775e2f6422409788a82e24a48a35685cad40356f712d9a4
+EBUILD nano-3.1.ebuild 2337 BLAKE2B 13b03e1a7d6c511f07205e717ba46db0a812ea33b83fea240f19260558e789d0d6aac75dec56373290673c008166c6caa4de5f574ec3fa3319ab8e3e8b97d52e SHA512 488cf08e5b026af85c5ef01a0160b5e6c6973c14df1162e0bc66dd1a7732a06ce35599a8b733fa4056e76db4906796b7e6c6fa6c1f84b5dd83bd217756c905c0
 EBUILD nano-9999.ebuild 2279 BLAKE2B 6a4a167d78038e7c982383f87a94d8ced33eab3beb9a7765ec4de6832ffcc21a8105e5f8d2799e9df25545de224cc687365110db0f80cc6ef1578bd0b52e80ca SHA512 b9e7bbb9924ce98ed642ec963dfa0a585fd8bdda095fe19029df3b61c98d769e88760afb535e2f5fd728d1e9df39bd9c29524c90b1b3779b6e5d374917652955
 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
new file mode 100644
index 000000000000..58fe1982be9c
--- /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 7f0d1d7bfbdc..a9712a1c464c 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