gentoo resync : 15.09.2018

5 files changed, 61 insertions, 10 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 3dc2f960906b..035ecbf2380c 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,10 @@
 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
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
-DIST nano-2.9.7.tar.gz 2913055 BLAKE2B 87e04c50a6485c961dddeb7e4fe4b3defda874eb91f373ae1357afdcafd4c207cdf789d72563fdfecb22eabb8dca29559d8fe8abdb0bd36ba1cae7fdf14b1447 SHA512 b62eda79d5d65e4d2020b22624aca06a891747e0e7eeb7b0698bfd9f90d7d1163240d123b7f727868aac09d815e9835f146f7f16e9cbdd5acd7f55311d4acbb7
 DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
+DIST nano-3.0.tar.xz 1508248 BLAKE2B 1af09a02b9a7c2aac5ce48e9df12d682d1b213885330e5e936c674602249ca6227fb190611a03d9253c93749e892c1ef5e9569c72bb7df749b6b0888da90fdcd SHA512 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1
 EBUILD nano-2.8.7.ebuild 2296 BLAKE2B 0136026fb72a5b1978057e7f9ae7348bd3fd32f47c64316a5b65eb8c74689f8effc4011ef6c1e058cb22f05df001a80e9c7607cd616d8f731ab9f052239389da SHA512 bef42b685a5afb428083378cb084b9c8a0ce679ce4aedf59056eefa4976543babeab6b411f3c002d878fbc50c78fba1e91ef24cd20ae9cb62efd40b36a770305
-EBUILD nano-2.9.7.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
-EBUILD nano-2.9.8.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
-EBUILD nano-9999.ebuild 2288 BLAKE2B 3f927891c8ecaead7d7a5372cd03babc0b90ade7ba4fe961c93e667fd5d01aac46c4ffefc80f608a96e724179c69f155edea60004d498631fc074d16eafcc7eb SHA512 ca6d15c6f962aab6cc1a67c67cf75320bbdc68404a83b83a5d85e0e469130c6ac6ff6c2f2e25fa4995619e3e8df2a07b506be50739cf784d8752764d44a11f2d
+EBUILD nano-2.9.8.ebuild 2286 BLAKE2B 0da2a2bba67859cc560133330db6ba5636ed810af14e6559fc0f8590d9d8b5bbcba122253724b36286ef75ce958da9d9d651b8fa28735e93dfd33742f20e5577 SHA512 528d69630d6fe08e104888fefa954019b14e52eeb8f1bb575c8d307a41ca699271d4f45d98c7926c0e3c6714f42db4befd5b5da6aa4baff184b17d1a875af4e8
+EBUILD nano-3.0-r1.ebuild 2329 BLAKE2B ba5b2dcd3e38887a4a1e21789fc2955bfdd9f5328a65edc159d728b97b93612bb4addb9b239cd7175a1a51346f77018597fed1e67bc4a55751570a2320c1079a SHA512 439aef7945a4dbb37a9132a922179440d011d7b172318cd875f065db8a20f92ed58c6c4c507d28dfd5df5eedad02bbbb199b3982378c6ee0fde8db216c5e990d
+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.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch
new file mode 100644
index 000000000000..2312edcff06c
--- /dev/null
+++ b/app-editors/nano/files/nano-3.0-misbinding.patch
@@ -0,0 +1,46 @@
+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.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index d19e8febb93e..e4692ff63dd4 100644
--- a/app-editors/nano/nano-2.9.8.ebuild
+++ b/app-editors/nano/nano-2.9.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 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"
+	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-2.9.7.ebuild b/app-editors/nano/nano-3.0-r1.ebuild
index d19e8febb93e..44b716308be0 100644
--- a/app-editors/nano/nano-2.9.7.ebuild
+++ b/app-editors/nano/nano-3.0-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils flag-o-matic
+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:3}/${MY_P}.tar.gz"
+	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
 
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-misbinding.patch
+)
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index d19e8febb93e..f4eec8c7c12a 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
 	inherit git-r3 autotools