From 054067d3783875810353abe20e108c0e4872150a Mon Sep 17 00:00:00 2001
From: Brian Mego <brianmego@gmail.com>
Date: Wed, 8 Sep 2021 22:23:24 -0500
Subject: app-admin/lnav: 0.10.0-r1 version bump

Closes: https://bugs.gentoo.org/812191
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Brian Mego <brianmego@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22250
Signed-off-by: Sam James <sam@gentoo.org>
---
 app-admin/lnav/Manifest                            |  1 +
 .../files/lnav-0.10.0-disable-remote-tests.patch   | 75 ++++++++++++++++++++++
 .../lnav/files/lnav-0.10.0-disable-tests.patch     | 34 ++++++++++
 app-admin/lnav/lnav-0.10.0.ebuild                  | 42 ++++++++++++
 4 files changed, 152 insertions(+)
 create mode 100644 app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
 create mode 100644 app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
 create mode 100644 app-admin/lnav/lnav-0.10.0.ebuild

diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index e99a849c3996..5776fb8f7d82 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,2 +1,3 @@
+DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd
 DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
new file mode 100644
index 000000000000..2177cc1adf35
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
@@ -0,0 +1,75 @@
+--- lnav-0.10.0/test/test_remote.sh
++++ lnav-0.10.0/test/test_remote.sh
+@@ -76,38 +76,38 @@
+ error: unable to open file: nonexistent-host: -- failed to ssh to host: ...
+ EOF
+
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+-    localhost:nonexistent-file
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++#     localhost:nonexistent-file
+
+-check_error_output "no error for nonexistent-file?" <<EOF
+-error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2]
+-EOF
+-
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+-    localhost:${test_dir}/logfile_access_log.0
+-
+-check_output "could not download remote file?" <<EOF
+-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
+-EOF
+-
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+-    "localhost:${test_dir}/logfile_access_log.*"
+-
+-check_output "could not download remote file?" <<EOF
+-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
+-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
+-EOF
+-
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+-    "localhost:${test_dir}/remote-log-dir"
+-
+-check_output "could not download remote file?" <<EOF
+-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
+-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
+-EOF
++# check_error_output "no error for nonexistent-file?" <<EOF
++# error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2]
++# EOF
++
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++#     localhost:${test_dir}/logfile_access_log.0
++
++# check_output "could not download remote file?" <<EOF
++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
++# EOF
++
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++#     "localhost:${test_dir}/logfile_access_log.*"
++
++# check_output "could not download remote file?" <<EOF
++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
++# EOF
++
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++#     "localhost:${test_dir}/remote-log-dir"
++
++# check_output "could not download remote file?" <<EOF
++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
++# EOF
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
new file mode 100644
index 000000000000..48a7e9b8cd43
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
@@ -0,0 +1,34 @@
+# 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
+--- lnav-0.10.0/test/Makefile.am
++++ lnav-0.10.0/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/lnav-0.10.0.ebuild b/app-admin/lnav/lnav-0.10.0.ebuild
new file mode 100644
index 000000000000..c7d1b21547a3
--- /dev/null
+++ b/app-admin/lnav/lnav-0.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="https://lnav.org"
+SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	>=dev-db/sqlite-3.9.0
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.0
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/readline:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.0-disable-tests.patch
+	"${FILESDIR}"/${PN}-0.10.0-disable-remote-tests.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with unicode ncursesw)
+}
-- 
cgit v1.2.3-65-gdbad