gentoo resync : 25.09.2021

9 files changed, 124 insertions, 99 deletions

diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index bae1a945ab06..ad6e446a178a 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,12 +1,13 @@
+AUX lnav-0.10.0-disable-remote-tests.patch 3986 BLAKE2B 62dcbb23d92a86caefdbd718d76a9c624d5d71249c60bb104dc0ce9db00c521fd99868e0ad7924d18a7895f437455a8af2ae36316d7d3271c08419b3b89012d3 SHA512 b956427959500ea80ca647c85530cd7a5c2db8368d5ed387e4c7153ba536d5840db0e627c17c911d51ce511f7db07377f51b868ae011cce2db55b0e1a4c99b98
+AUX lnav-0.10.0-disable-tests.patch 915 BLAKE2B 5a96465a1870d670af76c28b46c31ce725e82d98da89ed3912d08c3051161dbd2d384234b3567fd605959d9a3fbd6960275b17474a1db5dfa0de1673dc53a273 SHA512 30d0a832ebe38db0c904d2032523ea904f4ea4636dace68c2a1e5d33029c14b97fe54cf3278d6db88fb89c61a49e3606eef96966b846c1a118e482495e8a5970
 AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489
 AUX lnav-0.9.0-bug639332-tinfow.patch 579 BLAKE2B 17707472f4fa764e27d98a1ae426f65a1ad45dacdc34e4c19b608298b7bbc094ddf3c49ded6987ac2c2f145dc58ff9f520a49c44551b277182b76ef13b2fc2fb SHA512 b69da2eac944affd7c70bdf9bcc2be333d5d67d1415e05ebbfd87bff85369ffbe61399b05440637941bdfa4d220ae1ba100342a9e028ee789f3c9f0f1e2dec2c
-AUX lnav-0.9.0-bug713600_0.patch 1077 BLAKE2B e4f2978bac67ec15e6c0320d2136a1edf020941d26bc1b7a63ba23a0139b8a00731c9a8e4e3d5667d9179d05b46e795f99dada4eeafca0b97f24d805ba754e25 SHA512 a90ec77439c9ab74d7b5742542fb2904f154219f63c27ab4e91656f674387bad0cc316c02a60cad72623952e2260b7f4c42dba2f4bdb96c549e2122942ebb039
-AUX lnav-0.9.0-bug713600_1.patch 1090 BLAKE2B 2bf0a77205fa38fd5bd5ca28c65f2b67562b3cbcffd740ee82f1d59e017b1fce9a8ce3a70282d642ce34667a69de2c3a20b20f0fdf9640dc6f9cdb644c923e91 SHA512 821e9f49cd990edff0061f694666a6c9875b023bda2218cd598ef2e2a5d6ae5b6c405249834259035d7d2ee6a91de72f915977ef0bc9ba1bb4936ece72597c95
-AUX lnav-0.9.0-bug786456.patch 12401 BLAKE2B 698644b7b573dd15e3c91125ad80f6794be037f1ccbd8e9505166a0a13968222515672ca502dfc85acffd2d3e594ba8d3802f5561825f7c2a25943970f565f0e SHA512 8c2f6da60355aa9b0b90e9cdbe00b389e5b473bbf2b7705635b1167ab22c2add8c6fd3ec4e8903f6e457c6b1c5e60536b393357b4e5b3403a124f83413d4de33
-AUX lnav-0.9.0-bug792582.patch 3615 BLAKE2B 3e1c71ea871aa909067f3d6a1fa75dc314e4000dc4c8875fa806fcd92bdfd74c2fff4f248742691aa0c1797b7343700f9ab03450ec4504f993750b6e2f020a8f SHA512 2704893f2ae634cf4f15d61a40b3276fc27d40b08373d928b05123e16bc364f0f874dd09c34eeb493604e5f92676d69a7e552c3f9f7362c27998214060bc79ee
-DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
+AUX lnav-0.9.0-bug713600_0.patch 896 BLAKE2B 2fbd1d499a615051438bbeaf1a57ee6120f42bc8b99d4fe368f929a19bfcb6e745fe2a6942fe28d4085a9c939110865ec71dd62d52be50b9e1be5105d1f38b95 SHA512 433b60e379c582b25db5a321b91cbf332deb84430149b0a3d31e0cb8ce2c5cce0c6b01b35660e82550259768dcd42eb4758d21d5064739b8f4831029c77692b4
+AUX lnav-0.9.0-bug713600_1.patch 914 BLAKE2B 407c737471d4cda95c12aff862dbd3a1709c103c9c3c764aa26f7622f61590331e98ca72a29b18c92a72d6ff07c4e2292aa25f817575c6f3a41508beab10e927 SHA512 eb5fa19c29e496a2e3cedca5f7df9e8f5bd306959116257fa029f32d26a9316cd1879be22c071ace082d34ef9228fc685f0a8c1d5aaa541a45788eb79e870d5e
+AUX lnav-0.9.0-bug786456.patch 12017 BLAKE2B 0200e3b741e9b5d62cdeabf83c96d94be091f4895db492990404dfc0f41d8017aafe1afb8492688061c497e98bb0ea62bd96ed8c36f365782868ffed04904281 SHA512 94ae1e0590dab749923ca51bb407efc37db555c891df402f07143901077e8907b6bf90c1a6a7ec2d8365555d22e38d772ad39d7d4db86f0e76fbf98f5c10cffc
+AUX lnav-0.9.0-bug792582.patch 3148 BLAKE2B 8392a375e0d47996a9e2afd6d34a5c0b38efd5ad187e83ecfad9d4badec3565cff549dbe5ad64ae7417e1c2bedeb4f5461dcf96f54e6301b3ac0496a1ae7326e SHA512 4bf60c52f8678189f6e61415d5ca1859122f67603ccbfddd991ad4f825fcda4c01ae4992f2696e93c726f19d83488231da83b02c8d20bf6ee3f7def022e73547
+DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd
 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
-EBUILD lnav-0.8.5-r1.ebuild 771 BLAKE2B 609d5809483dfc348a4979ed7760e804bf3b12f7391c4ef54e3df7062a33deccbaa538f72d1ba743cff7d1ffa7c582b5415bd6b7d0e4829348ef959a44f7d19b SHA512 9e17a7aa378d23baeb26c55c74e947b868f60fbcbacda28795add54ed6f83d5f6e12f5562b5bb01e45e9be62d82e7071d6d8f944296c863ae90de893404e2ef4
-EBUILD lnav-0.9.0-r2.ebuild 946 BLAKE2B 2588e27c8d698fc0f225327433a9a740d46f5137399586bf66466d99ec3d710e04b57c46e6da12fb1478ca962633456cdf5d46d3b8452190dd8e7580dd652e48 SHA512 b38de5ff9bf039a45ef8ab9e2444a9395650b99a684b8c80cce8eea58f5686fae55d19bca9c595541d0801c7706d0a8028bbdbeae075ffed5c2288d2096347eb
+EBUILD lnav-0.10.0-r1.ebuild 868 BLAKE2B 21f7e1abdb467c1dcbeae316d3d8f96fe844ad9ff9dd13ae2208ef4e81688664e71918217ca0010c88082a536807dfe7dfa540ada306cb46f6a6e9c134ea49bf SHA512 b01777e82754e0300582edd9037ccd1c478b97ccf51f1fa51756bb305d0cad62a0b29fc0a3df5d001eb13c6a86738413677a6ef23df794997be6ec0aaedbb29d
 EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b
 MISC metadata.xml 781 BLAKE2B 6c7ff3da9a9dc1a5369ca51771ac4f11185426296f806e674a67a95a341ee5b466261387913ccc96e1d9c1b10c3719ae52f529f24004f5a464cb3f6d884e9fdd SHA512 b928e1a51306e3e48dfb27a50b240f2d855380988b6bbd4650cc04583b73385cf052f947cbd7ed089efa4e1131d23503f4c3fe539c20c724dd29c6e43195a48f
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..5e8c80fb90a5
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
@@ -0,0 +1,75 @@
+--- a/test/test_remote.sh
++++ b/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..c7a49d45f1d7
--- /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
+--- 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.9.0-bug713600_0.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
index 47aef6d593da..d2f26a436ff8 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
@@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:23:56 -0800
 Subject: [PATCH] [tests] fix test to make it insensitive to the current date
 
 Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- test/test_sql.sh | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/test_sql.sh b/test/test_sql.sh
-index c7480ecc..bbb98dce 100644
 --- a/test/test_sql.sh
 +++ b/test/test_sql.sh
 @@ -1012,13 +1012,13 @@ EOF
@@ -31,6 +25,3 @@ index c7480ecc..bbb98dce 100644
  EOF
  
  
--- 
-2.31.1
-
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
index 58aa7264a0de..83380fae4d8c 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
@@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:26:57 -0800
 Subject: [PATCH] [tests] update another date-sensitive test
 
 Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- test/test_sql.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_sql.sh b/test/test_sql.sh
-index bbb98dce..22941c2a 100644
 --- a/test/test_sql.sh
 +++ b/test/test_sql.sh
 @@ -1023,11 +1023,11 @@ EOF
@@ -27,6 +21,3 @@ index bbb98dce..22941c2a 100644
  EOF
  
  # Create a dummy database for the next couple of tests to consume.
--- 
-2.31.1
-
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
index e77dd17854e5..0d3ab64282c3 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
@@ -7,16 +7,6 @@ Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile
 Fixes #864
 
 Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- m4/ax_cxx_compile_stdcxx.m4 | 462 +++++++++++++++++++++++++++++++++---
- src/base/result.h           |   1 +
- src/logfile.hh              |  13 +
- src/optional.hpp            |  45 +++-
- src/pcrepp/pcrepp.hh        |   1 +
- 5 files changed, 482 insertions(+), 40 deletions(-)
-
-diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
-index 2c18e49c..9413da62 100644
 --- a/m4/ax_cxx_compile_stdcxx.m4
 +++ b/m4/ax_cxx_compile_stdcxx.m4
 @@ -1,5 +1,5 @@
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
index 9059712242a6..125f86b57a6e 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
@@ -7,14 +7,6 @@ Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible
 Fixes #806
 
 Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- src/highlighter.cc        |  4 +++-
- src/logfile_sub_source.cc | 17 ++++++++++-------
- src/view_curses.cc        |  9 ++++++---
- 3 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/highlighter.cc b/src/highlighter.cc
-index 24aafebd..110ca03f 100644
 --- a/src/highlighter.cc
 +++ b/src/highlighter.cc
 @@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const
@@ -28,8 +20,6 @@ index 24aafebd..110ca03f 100644
                  }
                  sa.emplace_back(lr, &view_curses::VC_STYLE, attrs);
  
-diff --git a/src/logfile_sub_source.cc b/src/logfile_sub_source.cc
-index 14e87002..dce0d4ae 100644
 --- a/src/logfile_sub_source.cc
 +++ b/src/logfile_sub_source.cc
 @@ -468,25 +468,28 @@ void logfile_sub_source::text_attrs_for_line(textview_curses &lv,
@@ -68,8 +58,6 @@ index 14e87002..dce0d4ae 100644
      }
  
      lr.lr_start = 0;
-diff --git a/src/view_curses.cc b/src/view_curses.cc
-index 4a36a3ad..2456d53d 100644
 --- a/src/view_curses.cc
 +++ b/src/view_curses.cc
 @@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window,
@@ -92,6 +80,3 @@ index 4a36a3ad..2456d53d 100644
  
          attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start);
  
--- 
-2.31.1
-
diff --git a/app-admin/lnav/lnav-0.8.5-r1.ebuild b/app-admin/lnav/lnav-0.10.0-r1.ebuild
index 2e91e591669e..50823da7ecce 100644
--- a/app-admin/lnav/lnav-0.8.5-r1.ebuild
+++ b/app-admin/lnav/lnav-0.10.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="A curses-based tool for viewing and analyzing log files"
 HOMEPAGE="https://lnav.org"
-SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -16,7 +16,8 @@ IUSE="unicode"
 
 RDEPEND="
 	app-arch/bzip2:0=
-	dev-db/sqlite:3
+	app-arch/libarchive:=
+	>=dev-db/sqlite-3.9.0
 	dev-libs/libpcre[cxx]
 	>=net-misc/curl-7.23.0
 	sys-libs/ncurses:=[unicode(+)?]
@@ -25,7 +26,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
-PATCHES=( "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.0-disable-tests.patch
+	"${FILESDIR}"/${PN}-0.10.0-disable-remote-tests.patch
+)
 
 src_prepare() {
 	default
diff --git a/app-admin/lnav/lnav-0.9.0-r2.ebuild b/app-admin/lnav/lnav-0.9.0-r2.ebuild
deleted file mode 100644
index 6849f2beec08..000000000000
--- a/app-admin/lnav/lnav-0.9.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/lnav/releases/download/v${PV}/${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.8.4-disable-tests.patch
-	# bug 723242
-	"${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch
-	# bug 713600
-	"${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch
-	"${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}