gentoo auto-resync : 14:12:2022 - 03:28:57

4 files changed, 21 insertions, 91 deletions

diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index a2c465a71181..f455c4370a28 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,9 +1,7 @@
-AUX lnav-0.10.0-disable-tests.patch 915 BLAKE2B 5a96465a1870d670af76c28b46c31ce725e82d98da89ed3912d08c3051161dbd2d384234b3567fd605959d9a3fbd6960275b17474a1db5dfa0de1673dc53a273 SHA512 30d0a832ebe38db0c904d2032523ea904f4ea4636dace68c2a1e5d33029c14b97fe54cf3278d6db88fb89c61a49e3606eef96966b846c1a118e482495e8a5970
-AUX lnav-0.10.1-gcc12.patch 1943 BLAKE2B f9cbee821b2f7b0ce6cf52353cc897fbe2a1aa4597ab9363b2030fca1f4b47f6115b117cbe6660df0bcec089f6d8f1eabe66e92ff218716822d44f076a012462 SHA512 cd7fd3f8df81a3e9fbf48bf9450c52980111bf0de35f701076661c1f3983b89c1145d47b2d17fea78ce4dd43e3fb0def411ab3dcac5a37865d4a9ebfff9b7e8a
 AUX lnav-0.11.0-conditional-ssh-keygen.patch 1109 BLAKE2B 9abe69b110a0119f9900cb6776baada9f1c708589372437e3f3d2a0f298a91f502a152b2754c06a3b7c7c8fe0e3dbdaa1272cf08992bc53547f892112ceeb3f8 SHA512 f702dc9f1ac1c650dc1bd562e48df9d43dedf30e962cc77032ecbab4d1ccd76d651eb58a3c09feba43ad99d7fce75359c260eb002cc3ec080d8a3b1ad774d5f8
 AUX lnav-0.11.0-disable-tests.patch 1784 BLAKE2B e4c0184793b19eff53dea12a81f0e8c7fab6fee44a77304f268365cdec0fa13fb916b35e25fb032a992147338a8028ffb799d9cd14db147f2396f5d54c74173c SHA512 e4c3ddee7c0747196a4ec5cdd409f1c088e06938762677d05757113ff8c8a1834a8ee2d132befef4fa84f4e34633d1d9a64d39f06e423f2a262e79ac121ea202
-DIST lnav-0.10.1.tar.gz 5707151 BLAKE2B ae82b705830c6ea38e2fa4f3832a2fd1d8ce8b5ef00d6a3fe750e4f5e7080ae29fde845f2c5055e2684aad1959368ff90abdc130130f8d6f0152426487e7396c SHA512 fff9632c1acbef80ba9d4214fd3ef485727792353fe493cfa4f2e9412bb371f50f2e1a735ded3d7bd8b16df5e93e03b0f3def296770e7dd0ad2206fd9f94690d
 DIST lnav-0.11.0.tar.gz 9586979 BLAKE2B fa333d2dbc3c2a5cb8b96ea4cbf84412be117b9d9ec999bab784e7aefab25cd01edcb65617468b8a1fbc46d554cf20a02bc901c9d75f2c5831359da37a19fd22 SHA512 f10938aacb1e170a6912090c5de8e85e9aae5bc456e57b49192a21020e7dfa20414d1f5b66fd25b3c1ea5a3d1fd3bd92af6fe7e0c6b73953688c3d861266fd97
-EBUILD lnav-0.10.1.ebuild 1080 BLAKE2B 6bdac79cae613881d152a8a09431592006ba51e198e9c08f30eb7c8459c1c7977732efc51578d56db21f0defd29fb048d0283643ece4872f85597e47d69bbc97 SHA512 98c47a516f2b2ae42ded735b6294ad5eff3467f723fee36b907930846fe503680bfd6fbde8a5cb3e37b5626b2e4f3b4e04c57b8b775e4ba03fc5d99fb6e3c836
+DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef
 EBUILD lnav-0.11.0.ebuild 1155 BLAKE2B 59efdb1660359e7b6a3cedd81447640fcf8412da5a3660f3f7fbdec190d7acdaad2466c64500fede135742808b1f06b1b775763201196fa6e2b91b4bcc6459f5 SHA512 24e86205749e7d85678fe24bafe477390f2398991bf19ce7da26d82ba2f895e656222f1dc79298ac0659ea7f4d546fbd74c77733660592d11f08b1ea807fb290
+EBUILD lnav-0.11.1-r1.ebuild 1055 BLAKE2B cfd4a1c4eb261b8d0285e68f2d4825e9385ec587ec64fc22a370d277c6353c74af8b5d96192bbc5b49678f3e4f89f0c05b9fd26a85770f2234f756ccd45ac605 SHA512 7f53810583850be5eb30bdd3d7eeaaab0574e44b847dd17796445112ea74c15ee48e58d2895c2ffb5a71511abae0b5bd964cf14af4c7fd05d682bf57ff0b2251
 MISC metadata.xml 858 BLAKE2B 6596baed4200d06faeacd61693e5d2e257587a30555469e0b6661755ab563cfc6693dd7e0970856a78c132544cde04655ca7febac482c9406c26a3b7cbdfc201 SHA512 1787552bd321e245a49a1b5b95d6e6f58362422153b6ee0b51ce644bf67ab098dd3c5ea11cb144dc5dae089208360fcf2a732845c24bb1e4c5dd5c67987e88bf
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
deleted file mode 100644
index c7a49d45f1d7..000000000000
--- a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Certain tests commented out for stability reasons:
-# listview: Fails when building inside sandbox
-# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911
-# logfile: Flaky. Fails some times and not others. i.e. Race condition
-# tui: Can hang the build
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -355,14 +355,14 @@
- 	test_cli.sh \
- 	test_cmds.sh \
- 	test_config.sh \
--	test_listview.sh \
-+	#test_listview.sh \
- 	test_meta.sh \
--	test_mvwattrline.sh \
-+	#test_mvwattrline.sh \
- 	test_grep_proc.sh \
- 	test_grep_proc2 \
- 	test_json_format.sh \
- 	test_log_accel \
--	test_logfile.sh \
-+	#test_logfile.sh \
- 	test_reltime \
- 	test_remote.sh \
- 	test_scripts.sh \
-@@ -376,7 +376,7 @@
- 	test_sql_str_func.sh \
- 	test_sql_time_func.sh \
- 	test_sql_xml_func.sh \
--	test_tui.sh \
-+	#test_tui.sh \
- 	test_data_parser.sh \
- 	test_pretty_print.sh \
-     test_view_colors.sh \
diff --git a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch b/app-admin/lnav/files/lnav-0.10.1-gcc12.patch
deleted file mode 100644
index 6ed4a73cebb2..000000000000
--- a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/839909
-https://github.com/tstack/lnav/pull/961
-
-From b8a31ae9b4bcd5690a2b3d2fbd6373caffbc4a57 Mon Sep 17 00:00:00 2001
-From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com>
-Date: Mon, 21 Feb 2022 21:09:30 +0100
-Subject: [PATCH] Add `#include <iterator>` to `string_util.cc`
-
-Lnav fails to build on the next Fedora version due to the following error:
-```
-make[3]: Entering directory '/builddir/build/BUILD/lnav-0.10.1/src/base'
-g++ -std=c++14 -DHAVE_CONFIG_H -I. -I../../src   -Wall -I../../src/ -I../../src/third-party -I../../src/fmtlib     -I../../src/third-party/doctest-root  -I/usr/local/include -D_ISOC99_SOURCE -D__STDC_LIMIT_MACROS -D_GNU_SOURCE  -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o string_util.o string_util.cc
-make[3]: Leaving directory '/builddir/build/BUILD/lnav-0.10.1/src/base'
-string_util.cc: In function 'std::string repeat(const std::string&, size_t)':
-string_util.cc:199:22: error: 'ostream_iterator' is not a member of 'std'
-  199 |     std::fill_n(std::ostream_iterator<std::string>(os), num, input);
-      |                      ^~~~~~~~~~~~~~~~
-string_util.cc:38:1: note: 'std::ostream_iterator' is defined in header '<iterator>'; did you forget to '#include <iterator>'?
-   37 | #include "string_util.hh"
-  +++ |+#include <iterator>
-   38 |
-```
-
-Reason is probably the updated GNU toolchain, more info:
-https://fedoraproject.org/wiki/Changes/GNUToolchainF36
-
-This patch fixes the issue.
---- a/src/base/string_util.cc
-+++ b/src/base/string_util.cc
-@@ -29,6 +29,7 @@
-
- #include "config.h"
-
-+#include <iterator>
- #include <regex>
- #include <sstream>
-
diff --git a/app-admin/lnav/lnav-0.10.1.ebuild b/app-admin/lnav/lnav-0.11.1-r1.ebuild
index efa86cff1cf6..dce0dbdd165c 100644
--- a/app-admin/lnav/lnav-0.10.1.ebuild
+++ b/app-admin/lnav/lnav-0.11.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="A curses-based tool for viewing and analyzing log files"
 HOMEPAGE="https://lnav.org"
@@ -11,41 +11,44 @@ SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="unicode test"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcap test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/bzip2:0=
 	app-arch/libarchive:=
 	>=dev-db/sqlite-3.9.0
-	dev-libs/libpcre[cxx]
+	dev-libs/libpcre2
 	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:=[unicode(+)?]
-	sys-libs/readline:0=
-	sys-libs/zlib:0="
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	sys-libs/zlib:=
+	pcap? ( net-analyzer/wireshark[tshark] )"
+# The tests use ssh-keygen and use dsa and rsa keys (which is why ssl is required)
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/doctest )"
+	test? (
+		net-misc/openssh[ssl]
+		dev-cpp/doctest
+	)"
 
-DOCS=( AUTHORS NEWS README )
+DOCS=( AUTHORS NEWS.md README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.0-disable-tests.patch
-	"${FILESDIR}"/${PN}-0.10.1-gcc12.patch
+	"${FILESDIR}"/${PN}-0.11.0-disable-tests.patch
 )
 
 src_prepare() {
 	default
 
 	eautoreconf
-
-	# These tests use network and expect a running sshd, so we'll just delete them.
-	echo "#! /bin/bash" > test/test_remote.sh || die
 }
 
 src_configure() {
+	filter-lto
+
 	econf \
 		--disable-static \
-		$(use_with test system-doctest) \
-		$(use_with unicode ncursesw)
+		--with-ncurses \
+		$(use_with test system-doctest)
 }