gentoo resync : 22.10.2018

6 files changed, 2 insertions, 266 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index f7c12f5ecd2e..397aaac2f51a 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,13 +1,7 @@
-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
 DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03bc0bebafc458f4766561962c94f22f84cf714ece7052670c987272029d3fd6cbda20e5f09460d3bcc0ce1 SHA512 86cc1210cbc45ce2e392d6888e6e22a9214afcc24e95657f7bdb4c59476b4bea2e8ebd8b23c06b32f3acfe1da6da689135f25fcf09db34f6b1dfcc838ea5528f
-EBUILD nano-2.8.7.ebuild 2296 BLAKE2B 0136026fb72a5b1978057e7f9ae7348bd3fd32f47c64316a5b65eb8c74689f8effc4011ef6c1e058cb22f05df001a80e9c7607cd616d8f731ab9f052239389da SHA512 bef42b685a5afb428083378cb084b9c8a0ce679ce4aedf59056eefa4976543babeab6b411f3c002d878fbc50c78fba1e91ef24cd20ae9cb62efd40b36a770305
-EBUILD nano-2.9.8.ebuild 2276 BLAKE2B 29928b676aca3a4b9321e5458c88983021ddf2c688ac722dc0a6be231091717a6f31c7949077baf2657407b301b1b08b71e629911a962294f25476726a53aef7 SHA512 c44028414fbb1503ce1ce4e62820fbf18a5d07c669f21cdd5a272b662292bc11d6afc71cfe3446682768382185eb02086d8dfb46d0ddd3d66735d9ce24d71209
-EBUILD nano-3.0-r1.ebuild 2329 BLAKE2B ba5b2dcd3e38887a4a1e21789fc2955bfdd9f5328a65edc159d728b97b93612bb4addb9b239cd7175a1a51346f77018597fed1e67bc4a55751570a2320c1079a SHA512 439aef7945a4dbb37a9132a922179440d011d7b172318cd875f065db8a20f92ed58c6c4c507d28dfd5df5eedad02bbbb199b3982378c6ee0fde8db216c5e990d
+EBUILD nano-2.9.8.ebuild 2272 BLAKE2B 5c338053fba942e24c5e0da0073afc6dc6e78a09997ce82539e1ba069f23f6045b1f6299b7623294620839ba7067e5c08a66bf71263d8c52f50069b684d97f6b SHA512 f7b44353b2568c794e91f56177bab887f3e68bc25ab48a124dad3895e9e6a1691c8ec755da31b1c59985ab7f7a879cd1c10b91842bb28fa057839a793991440f
 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-2.8.7-minimal_compile_fix.patch b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
deleted file mode 100644
index ef8d74910164..000000000000
--- a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Tue, 29 Aug 2017 19:28:44 +0200
-Subject: tweaks: fix compilation when configured with --enable-tiny
-
-When moving the cursor to the top-left corner, it is not necessary
-to compute leftedge because firstcolumn IS the relevant leftedge.
-
-Reported-by: Jordi Mallach <jordi@debian.org>
----
- src/move.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/move.c b/src/move.c
-index d138356..ce276e4 100644
---- a/src/move.c
-+++ b/src/move.c
-@@ -121,7 +121,7 @@ void do_page_up(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
-@@ -152,7 +152,7 @@ void do_page_down(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
--- 
-cgit v1.0-41-gc330
-
diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch
deleted file mode 100644
index 2312edcff06c..000000000000
--- a/app-editors/nano/files/nano-3.0-misbinding.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
deleted file mode 100644
index 9c57e32be25e..000000000000
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils 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"
-	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"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=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(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-minimal_compile_fix.patch" #629510
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(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)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(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
-	rm -rf "${D}"/trash
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dodir /usr/bin
-	dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-2.9.8.ebuild
index ab539d9df7ff..a8742cb86825 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-3.0-r1.ebuild b/app-editors/nano/nano-3.0-r1.ebuild
deleted file mode 100644
index 44b716308be0..000000000000
--- a/app-editors/nano/nano-3.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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: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
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
-
-LIB_DEPEND=">=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(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-misbinding.patch
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(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)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(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
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED%/}"/etc/nanorc || die
-	fi
-
-	dosym ../../bin/nano /usr/bin/nano
-}