sys-apps/less: Version bump

Signed-off-by: Martin Väth <mvath@google.com>

4 files changed, 2 insertions, 57 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index af607a39..81c82c33 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -97,7 +97,7 @@ sci-geosciences/googleearth 7.1.8.3036-r1 7.3.0.3832-r1 7.3.2: A 3D interface to
 sci-mathematics/genius 1.0.21: Genius Mathematics Tool and the GEL Language
 sci-mathematics/reduce 20141130-r2: A general-purpose computer algebra system
 sys-apps/cpi 3.1: A wrapper for cp -i -a, making use of diff
-sys-apps/less 549-r1: Excellent text file viewer, optionally with additional selection feature
+sys-apps/less 550: Excellent text file viewer, optionally with additional selection feature
 sys-apps/openrc-wrapper 2.3-r1: Use openrc init scripts with systemd or other init systems
 sys-apps/paxopen 1.2: A wrapper script to set PAX kernel variables to an insecure/safe state
 sys-apps/schedule 8.0-r1: script to schedule jobs in a multiuser multitasking environment
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index a532e27b..c6fd69c8 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,2 +1,2 @@
-DIST less-549.tar.gz 346978 SHA512 f0f86db00ee7a0ed638dfe2183e5cd6a9728d6e4cb9f054a746716abf6fe297f33b6f1d44bd4eac8ad360da564c4ea50cd6f41d297f857c78414961d28f4155c
+DIST less-550.tar.gz 347026 SHA512 a3d2769d90589a8e6afbfc9ac10cd1b544e0b0bbe28884e5ad980a71c541a37545c11d3450984b346b516fe082dfc0cf89d246c5a2d6002a7a2b4a4296a15494
 DIST less-select-2.9.tar.gz 28609 SHA512 e948948bf7d02ec17253fa248bbaa4de85e097cf2e2368454d3e5e399f8fe95ffa477013db376733e125768cfcf020cb5c9f54e3b2bba65bcc37ae4eae49bfb1
diff --git a/sys-apps/less/files/less-549-mouse_fix.patch b/sys-apps/less/files/less-549-mouse_fix.patch
deleted file mode 100644
index 495073a3..00000000
--- a/sys-apps/less/files/less-549-mouse_fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d5015d29f79e70fb70489616c0f2d0ff32e52898 Mon Sep 17 00:00:00 2001
-From: Mark Nudelman <markn@greenwoodsoftware.com>
-Date: Sat, 16 Feb 2019 07:20:42 -0800
-Subject: [PATCH] Don't emit mouse controls if --mouse is not set.
-
----
- screen.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/screen.c b/screen.c
-index 9a32685..b58fe26 100644
---- a/screen.c
-+++ b/screen.c
-@@ -1549,6 +1549,8 @@ win32_deinit_term(VOID_PARAM)
- 	public void
- init_mouse(VOID_PARAM)
- {
-+	if (!mousecap)
-+		return;
- #if !MSDOS_COMPILER
- 	tputs(sc_s_mousecap, sc_height, putchr);
- #else
-@@ -1565,6 +1567,8 @@ init_mouse(VOID_PARAM)
- 	public void
- deinit_mouse(VOID_PARAM)
- {
-+	if (!mousecap)
-+		return;
- #if !MSDOS_COMPILER
- 	tputs(sc_e_mousecap, sc_height, putchr);
- #else
-@@ -1587,8 +1591,7 @@ init(VOID_PARAM)
- 			tputs(sc_init, sc_height, putchr);
- 		if (!no_keypad)
- 			tputs(sc_s_keypad, sc_height, putchr);
--		if (mousecap)
--			init_mouse();
-+		init_mouse();
- 	}
- 	if (top_scroll) 
- 	{
-@@ -1626,8 +1629,7 @@ deinit(VOID_PARAM)
- #if !MSDOS_COMPILER
- 	if (!(quit_if_one_screen && one_screen))
- 	{
--		if (mousecap)
--			deinit_mouse();
-+		deinit_mouse();
- 		if (!no_keypad)
- 			tputs(sc_e_keypad, sc_height, putchr);
- 		if (!no_init)
diff --git a/sys-apps/less/less-549-r1.ebuild b/sys-apps/less/less-550.ebuild
index eda41727..e79a69a6 100644
--- a/sys-apps/less/less-549-r1.ebuild
+++ b/sys-apps/less/less-550.ebuild
@@ -27,10 +27,6 @@ RDEPEND="${DEPEND}
 #		|| ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 )
 PDEPEND="lesspipe? ( app-text/lesspipe )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-mouse_fix.patch #678102
-)
-
 pkg_setup() {
 	if use source && ! use less-select
 	then	ewarn 'ignoring USE=source without USE=less-select'