gentoo auto-resync : 09:09:2022 - 10:40:04

19 files changed, 239 insertions, 1030 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 296d2f4eb28d..0949f0214a06 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0f4adfbb33f9..c487118fa29b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.25.64.gh.tar.gz 2263441 BLAKE2B d68ef0a3dabba879d9d650a911d5f2861
 DIST aws-cli-1.25.65.gh.tar.gz 2263933 BLAKE2B 5c516e6a95a333073cf7200eff476e625e9b832b32b44fc41e3656c5c78710ba8272fdb5fbafcfe85fe17853c1f40e26fd6de84a6c4c42a7cd6d7d2ce41ab8f5 SHA512 7dcdd2d0e05000f09d41a24c8e14ee7b4623e89f027c193c67635296f568c8d1f383956c5c351c85b7c48150796203dce777ef2f6376c3778ea2ec8b8f39072b
 DIST aws-cli-1.25.66.gh.tar.gz 2264111 BLAKE2B 7aaa42d654a873fea44fe64e0805c240700830c653ecfbfab4bf8838ba2aca5ec9508241e9fd9329b546d098eb4c68f886dac1afc31e12cea4779cc35ec091fb SHA512 dcddfebf2051fad23208c2617596c6aa4462e940056f5963526983c15b6c33bb118a769f139a8c8297d413e9a6ae129d7e14a6ffa56aa595dcde0128ea10d5c2
 DIST aws-cli-1.25.67.gh.tar.gz 2264702 BLAKE2B 88bdeab8fe85d17d7aa78ff00125e1c3e1d098093d68b7e7213896d101bff443cb2ed23b8ed9245eb3727b41abd34a8047616eee777f802d52b3a26594e214c5 SHA512 a01b333d36160a43c1f28d01600e1f1d095e4713500bac3b13fc336bf790943251fefb72dc7bc177eaf4265b794658d62ff72ee00abd348c1265d04b58564136
+DIST aws-cli-1.25.70.gh.tar.gz 2267239 BLAKE2B e20606c8b3df77698f6ad67eb28a63d8ddb5750782a5ca5a690d36bf5ec5d171aebda115a3c828fbae948037d71e11ead73e163fdaa55e81614ea245a51f54e5 SHA512 7984a56f4e224389822ebb6aa56927cc669630ba8fbebbb59178406ce1dcbb298ef0f83353c02ab37eaf4e0bfcd6b86363712d3f711540993044fa6517b84364
 EBUILD awscli-1.25.56.ebuild 1841 BLAKE2B 8e87e521eb4464071ec89abd904be4b8056e6be8ed6a4b9aee005c952d5ef4da7e0468e0827e99cf1e460068fa9cff9b974cce96c0e0b87798e5a15f602ec600 SHA512 244149f5d56a3d1f5b4e8fdc3c2a15a4c6357998237cb5a8dc39e66af7aac968d61ba7a5873a10548af57bd08058b18ef3a97b335b42270fa896ecf7bc502f79
 EBUILD awscli-1.25.61.ebuild 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020
 EBUILD awscli-1.25.64.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 EBUILD awscli-1.25.65.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 EBUILD awscli-1.25.66.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 EBUILD awscli-1.25.67.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
+EBUILD awscli-1.25.70.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.70.ebuild b/app-admin/awscli/awscli-1.25.70.ebuild
new file mode 100644
index 000000000000..3d5bba5c1200
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.70.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index cdbb5adf82d5..ba5794818a06 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,18 +1,9 @@
-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.10.0-use-system-doctest.patch 2167 BLAKE2B 6f573b41e49f2408bc2f63e998fca555145a5444af297e01540488943c761d1ab9fe025d0c2877b6f8f73ffe64ad37719670e3825f774df26b50a7bb5adac573 SHA512 70b9a139bb60d57ac5341c5d015072efab203f45c3ca9d81ea68fa413ba56bbed381c92c1bbd042591e825aefabc95eb5698b8fb5fbd74ea0bf564bd02cae64c
 AUX lnav-0.10.1-gcc12.patch 1943 BLAKE2B f9cbee821b2f7b0ce6cf52353cc897fbe2a1aa4597ab9363b2030fca1f4b47f6115b117cbe6660df0bcec089f6d8f1eabe66e92ff218716822d44f076a012462 SHA512 cd7fd3f8df81a3e9fbf48bf9450c52980111bf0de35f701076661c1f3983b89c1145d47b2d17fea78ce4dd43e3fb0def411ab3dcac5a37865d4a9ebfff9b7e8a
-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 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
+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.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
-EBUILD lnav-0.10.0-r1.ebuild 868 BLAKE2B 21f7e1abdb467c1dcbeae316d3d8f96fe844ad9ff9dd13ae2208ef4e81688664e71918217ca0010c88082a536807dfe7dfa540ada306cb46f6a6e9c134ea49bf SHA512 b01777e82754e0300582edd9037ccd1c478b97ccf51f1fa51756bb305d0cad62a0b29fc0a3df5d001eb13c6a86738413677a6ef23df794997be6ec0aaedbb29d
-EBUILD lnav-0.10.0-r2.ebuild 1869 BLAKE2B 258ea8166f16e92c9f5673b25beaa9d10d61a0e8189e8cacace55995879f7895162c8696d60ac50d241ebcde70955b883e9ee7bc7b62fa44efdd664e9f8b1037 SHA512 b3f853d1b5e9636760a9c754c88d0c50c722c41d4e4b043f45e0b14b2372c161a40397354cb845296d8591adb6a76d21b0801528e33b7ef9b3e000b58d2948d8
+DIST lnav-0.11.0.tar.gz 9586979 BLAKE2B fa333d2dbc3c2a5cb8b96ea4cbf84412be117b9d9ec999bab784e7aefab25cd01edcb65617468b8a1fbc46d554cf20a02bc901c9d75f2c5831359da37a19fd22 SHA512 f10938aacb1e170a6912090c5de8e85e9aae5bc456e57b49192a21020e7dfa20414d1f5b66fd25b3c1ea5a3d1fd3bd92af6fe7e0c6b73953688c3d861266fd97
 EBUILD lnav-0.10.1.ebuild 1080 BLAKE2B 6bdac79cae613881d152a8a09431592006ba51e198e9c08f30eb7c8459c1c7977732efc51578d56db21f0defd29fb048d0283643ece4872f85597e47d69bbc97 SHA512 98c47a516f2b2ae42ded735b6294ad5eff3467f723fee36b907930846fe503680bfd6fbde8a5cb3e37b5626b2e4f3b4e04c57b8b775e4ba03fc5d99fb6e3c836
-EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b
-MISC metadata.xml 781 BLAKE2B 6c7ff3da9a9dc1a5369ca51771ac4f11185426296f806e674a67a95a341ee5b466261387913ccc96e1d9c1b10c3719ae52f529f24004f5a464cb3f6d884e9fdd SHA512 b928e1a51306e3e48dfb27a50b240f2d855380988b6bbd4650cc04583b73385cf052f947cbd7ed089efa4e1131d23503f4c3fe539c20c724dd29c6e43195a48f
+EBUILD lnav-0.11.0.ebuild 1157 BLAKE2B 753dc4d1466a7de8c99a0957b5e4b89bfeb67abb51c19d07b65b3ecae1362b4aaeee574cc347596939f42998678a808c428d7b281289bafe760cab116e21ec71 SHA512 1c89382ad32db2f31d0ae592d2690a76d0e5f8981bdcc6ad2330ab672baa5eca9a9976e659b154726fd72cb84161d4214b36a08752e9c2ce8d4aadd0e21542c4
+MISC metadata.xml 858 BLAKE2B 6596baed4200d06faeacd61693e5d2e257587a30555469e0b6661755ab563cfc6693dd7e0970856a78c132544cde04655ca7febac482c9406c26a3b7cbdfc201 SHA512 1787552bd321e245a49a1b5b95d6e6f58362422153b6ee0b51ce644bf67ab098dd3c5ea11cb144dc5dae089208360fcf2a732845c24bb1e4c5dd5c67987e88bf
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
deleted file mode 100644
index 5e8c80fb90a5..000000000000
--- a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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-use-system-doctest.patch b/app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch
deleted file mode 100644
index 09fe364487bf..000000000000
--- a/app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 85515b2c196f2e361e93c158201f74177dc4ae37 Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sat, 18 Sep 2021 21:56:19 -0400
-Subject: [PATCH] Provide a configure flag to use the system doctest
-
-This will allow distributions to more easily maintain
-incompatibilies between doctest and the rest of their software.
-
-Fixes #912
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- configure.ac            |   21 +
- src/Makefile.am         |    4 +
- src/doctest.hh          | 5502 +--------------------------------------
- src/doctest_vendored.hh | 5464 ++++++++++++++++++++++++++++++++++++++
- 4 files changed, 5527 insertions(+), 5464 deletions(-)
- create mode 100644 src/doctest_vendored.hh
-
-diff --git a/configure.ac b/configure.ac
-index f2127def..33746d1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -153,6 +153,27 @@ AS_IF([test "x$enable_simd" = "xyes"], [
- ])
- 
- 
-+AC_ARG_WITH([system_doctest],
-+    AS_HELP_STRING(
-+        [--with-system-doctest],
-+        [Use the system provided doctest library rather than the bundled one]
-+    ),
-+    [], []
-+)
-+
-+AS_IF([test "x$with_system_doctest" = "xyes"], [
-+    AC_CHECK_HEADERS(doctest/doctest.h)
-+    AS_IF([test "x$ac_cv_header_doctest_doctest_h" != "xyes"], [
-+        AC_MSG_ERROR([system doctest not found])dnl
-+    ])
-+    AC_DEFINE([DOCTEST_HEADER], ["doctest/doctest.h"], [doctest include path])
-+])
-+AS_IF([test "x$with_system_doctest" != "xyes"], [
-+    AC_DEFINE([DOCTEST_HEADER], ["doctest_vendored.hh"], [doctest include path])
-+    AS_VAR_SET(doctest_vendored_h, "doctest_vendored.hh")
-+    AC_SUBST(doctest_vendored_h)
-+])
-+
- 
- LNAV_WITH_JEMALLOC
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9be9168e..8dc0cd94 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -151,6 +151,9 @@ dist_noinst_DATA = \
- 	$(FORMAT_FILES) \
- 	xterm-palette.json
- 
-+EXTRA_HEADERS = \
-+	doctest_vendored.hh
-+
- noinst_HEADERS = \
- 	all_logs_vtab.hh \
- 	ansi_scrubber.hh \
-@@ -174,6 +177,7 @@ noinst_HEADERS = \
- 	db_sub_source.hh \
- 	doc_status_source.hh \
- 	doctest.hh \
-+	$(doctest_vendored_h) \
- 	elem_to_json.hh \
- 	environ_vtab.hh \
- 	field_overlay_source.hh \
diff --git a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch b/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
new file mode 100644
index 000000000000..a0396182b8af
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
@@ -0,0 +1,34 @@
+From b16833392b74826f8cd437675fc29e4a0b88efcd Mon Sep 17 00:00:00 2001
+From: Randy Barlow <randy@electronsweatshop.com>
+Date: Sun, 4 Sep 2022 00:03:33 -0400
+Subject: [PATCH] Only build ssh keys when needed
+
+I believe the test/remote folder only needs to be setup for
+test/test_remote.sh. Prior to this commit, it was being built during
+make, rather than just during make check. This commit adjusts things so
+that the test/remote folder is only generated during make check, and
+only when test/test_remote.sh is being executed.
+
+Fixes #1040
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ test/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index fd09a656..457f3cb0 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -478,7 +478,7 @@ DISTCLEANFILES = \
+ 	empty \
+ 	scripts-empty
+ 
+-all-local: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
++test_remote.sh.log: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
+ 
+ distclean-local:
+ 	$(RM_V)rm -rf remote remote-tmp not:a:remote:dir
+-- 
+2.37.2
+
diff --git a/app-admin/lnav/files/lnav-0.11.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.11.0-disable-tests.patch
new file mode 100644
index 000000000000..8aa000d30c63
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.11.0-disable-tests.patch
@@ -0,0 +1,67 @@
+From 70231dce88cf47f2f3e2b396fe0623ea74eeadfc Mon Sep 17 00:00:00 2001
+From: Randy Barlow <randy@electronsweatshop.com>
+Date: Sat, 3 Sep 2022 18:13:08 -0400
+Subject: [PATCH] Disable some flaky tests
+
+Certain tests commented out for stability reasons:
+ * listview: Fails when building inside sandbox
+   https://github.com/tstack/lnav/issues/1039
+ * 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
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ test/Makefile.am | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index fd09a656..07d6758e 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -188,10 +188,7 @@ dist_noinst_SCRIPTS = \
+ 	test_grep_proc.sh \
+ 	test_json_format.sh \
+ 	test_line_buffer.sh \
+-	test_listview.sh \
+-	test_logfile.sh \
+ 	test_meta.sh \
+-	test_mvwattrline.sh \
+ 	test_regex101.sh \
+ 	test_remote.sh \
+ 	test_scripts.sh \
+@@ -211,7 +208,6 @@ dist_noinst_SCRIPTS = \
+ 	test_sql_xml_func.sh \
+ 	test_sql_yaml_func.sh \
+ 	test_text_file.sh \
+-	test_tui.sh \
+ 	test_view_colors.sh \
+ 	test_vt52_curses.sh \
+ 	test_pretty_print.sh
+@@ -391,14 +387,11 @@ TESTS = \
+ 	test_cmds.sh \
+ 	test_config.sh \
+ 	test_events.sh \
+-	test_listview.sh \
+ 	test_meta.sh \
+-	test_mvwattrline.sh \
+ 	test_grep_proc.sh \
+ 	test_grep_proc2 \
+ 	test_json_format.sh \
+ 	test_log_accel \
+-	test_logfile.sh \
+ 	test_reltime \
+ 	test_scripts.sh \
+ 	test_sessions.sh \
+@@ -417,7 +410,6 @@ TESTS = \
+ 	test_sql_xml_func.sh \
+ 	test_sql_yaml_func.sh \
+ 	test_text_file.sh \
+-	test_tui.sh \
+ 	test_data_parser.sh \
+ 	test_pretty_print.sh \
+     test_view_colors.sh \
+-- 
+2.37.2
+
diff --git a/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
deleted file mode 100644
index 6b431c33b133..000000000000
--- a/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lnav-0.8.4/test/Makefile.am
-+++ lnav-0.8.4/test/Makefile.am
-@@ -373,7 +373,6 @@
- 	test_concise \
- 	test_line_buffer2 \
- 	test_line_buffer.sh \
--	test_listview.sh \
- 	test_meta.sh \
- 	test_grep_proc.sh \
- 	test_grep_proc2 \
-@@ -381,7 +380,6 @@
- 	test_json_op.sh \
- 	test_json_ptr_walk.sh \
- 	test_log_accel \
--	test_logfile.sh \
- 	test_pcrepp \
- 	test_reltime \
- 	test_scripts.sh \
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch b/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch
deleted file mode 100644
index 8399412f0cf1..000000000000
--- a/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/m4/ax_with_curses.m4      2019-07-28 08:49:13.670014444 -0500
-+++ b/m4/ax_with_curses.m4      2019-07-28 08:46:32.280013473 -0500
-@@ -216,6 +216,8 @@
-             ax_cv_curses=yes
-             ax_cv_curses_which=ncursesw
-             CURSES_LIB="-lncursesw"
-+            temp_lib=`echo $ax_saved_LIBS|sed 's/tinfo/tinfow/'`
-+            ax_saved_LIBS=$temp_lib
-             AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
-             AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
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
deleted file mode 100644
index d2f26a436ff8..000000000000
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 60dde499ac87c2399ac24ae85c98ed8cce564858 Mon Sep 17 00:00:00 2001
-From: Timothy Stack <timothyshanestack@gmail.com>
-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>
---- a/test/test_sql.sh
-+++ b/test/test_sql.sh
-@@ -1012,13 +1012,13 @@ EOF
- 
- 
- cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
--    -c ";select log_time from syslog_log where log_procname = 'automount'"
-+    -c ";select log_body from syslog_log where log_procname = 'automount'"
- 
- check_output "querying against stdin is not working?" <<EOF
--        log_time
--2020-11-03 09:23:38.000
--2020-11-03 09:23:38.000
--2020-11-03 09:23:38.000
-+                log_body
-+ lookup(file): lookup for foobar failed
-+ attempting to mount entry /auto/opt
-+ lookup(file): lookup for opt failed
- EOF
- 
- 
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
deleted file mode 100644
index 83380fae4d8c..000000000000
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cc072d29ead6f1df896bc61b83d7d41dab0b7132 Mon Sep 17 00:00:00 2001
-From: Timothy Stack <timothyshanestack@gmail.com>
-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>
---- a/test/test_sql.sh
-+++ b/test/test_sql.sh
-@@ -1023,11 +1023,11 @@ EOF
- 
- 
- cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
--    -c ";select log_time from syslog_log where log_procname = 'sudo'"
-+    -c ";select log_body from syslog_log where log_procname = 'sudo'"
- 
- check_output "single result is not working?" <<EOF
--        log_time
--2020-11-03 09:47:02.000
-+                                                      log_body
-+ timstack : TTY=pts/6 ; PWD=/auto/wstimstack/rpms/lbuild/test ; USER=root ; COMMAND=/usr/bin/tail /var/log/messages
- EOF
- 
- # Create a dummy database for the next couple of tests to consume.
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
deleted file mode 100644
index 0d3ab64282c3..000000000000
--- a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-From e6d2e2d2b95c27cc85397d4af9528111c5304d02 Mon Sep 17 00:00:00 2001
-From: Timothy Stack <timothyshanestack@gmail.com>
-Date: Sun, 30 May 2021 13:33:05 -0700
-Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile
- errors
-
-Fixes #864
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---- a/m4/ax_cxx_compile_stdcxx.m4
-+++ b/m4/ax_cxx_compile_stdcxx.m4
-@@ -1,5 +1,5 @@
- # ===========================================================================
--#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
- # ===========================================================================
- #
- # SYNOPSIS
-@@ -16,7 +16,7 @@
- #   The second argument, if specified, indicates whether you insist on an
- #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
- #   -std=c++11).  If neither is specified, you get whatever works, with
--#   preference for an extended mode.
-+#   preference for no added switch, and then for an extended mode.
- #
- #   The third argument, if specified 'mandatory' or if left unspecified,
- #   indicates that baseline support for the specified C++ standard is
-@@ -33,21 +33,24 @@
- #   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
- #   Copyright (c) 2015 Paul Norman <penorman@mac.com>
- #   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-+#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
-+#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
-+#   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
- #
- #   Copying and distribution of this file, with or without modification, are
- #   permitted in any medium without royalty provided the copyright notice
- #   and this notice are preserved.  This file is offered as-is, without any
- #   warranty.
- 
--#serial 4
-+#serial 12
- 
- dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
- dnl  (serial version number 13).
- 
- AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
--  m4_if([$1], [11], [],
--        [$1], [14], [],
--        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
-+  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-+        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-+        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-         [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-   m4_if([$2], [], [],
-         [$2], [ext], [],
-@@ -59,18 +62,21 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-         [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-   AC_LANG_PUSH([C++])dnl
-   ac_success=no
--  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
--  ax_cv_cxx_compile_cxx$1,
--  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
--    [ax_cv_cxx_compile_cxx$1=yes],
--    [ax_cv_cxx_compile_cxx$1=no])])
--  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
--    ac_success=yes
--  fi
-+
-+  m4_if([$2], [], [dnl
-+    AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-+		   ax_cv_cxx_compile_cxx$1,
-+      [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+        [ax_cv_cxx_compile_cxx$1=yes],
-+        [ax_cv_cxx_compile_cxx$1=no])])
-+    if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-+      ac_success=yes
-+    fi])
- 
-   m4_if([$2], [noext], [], [dnl
-   if test x$ac_success = xno; then
--    for switch in -std=gnu++$1 -std=gnu++0x; do
-+    for alternative in ${ax_cxx_compile_alternatives}; do
-+      switch="-std=gnu++${alternative}"
-       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-       AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                      $cachevar,
-@@ -96,22 +102,27 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-     dnl HP's aCC needs +std=c++11 according to:
-     dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-     dnl Cray's crayCC needs "-h std=c++11"
--    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
--      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
--      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
--                     $cachevar,
--        [ac_save_CXX="$CXX"
--         CXX="$CXX $switch"
--         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
--          [eval $cachevar=yes],
--          [eval $cachevar=no])
--         CXX="$ac_save_CXX"])
--      if eval test x\$$cachevar = xyes; then
--        CXX="$CXX $switch"
--        if test -n "$CXXCPP" ; then
--          CXXCPP="$CXXCPP $switch"
-+    for alternative in ${ax_cxx_compile_alternatives}; do
-+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-+        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-+        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-+                       $cachevar,
-+          [ac_save_CXX="$CXX"
-+           CXX="$CXX $switch"
-+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-+            [eval $cachevar=yes],
-+            [eval $cachevar=no])
-+           CXX="$ac_save_CXX"])
-+        if eval test x\$$cachevar = xyes; then
-+          CXX="$CXX $switch"
-+          if test -n "$CXXCPP" ; then
-+            CXXCPP="$CXXCPP $switch"
-+          fi
-+          ac_success=yes
-+          break
-         fi
--        ac_success=yes
-+      done
-+      if test x$ac_success = xyes; then
-         break
-       fi
-     done
-@@ -148,6 +159,11 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
- )
- 
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-+)
- 
- dnl  Tests for new features in C++11
- 
-@@ -185,11 +201,13 @@ namespace cxx11
- 
-     struct Base
-     {
-+      virtual ~Base() {}
-       virtual void f() {}
-     };
- 
-     struct Derived : public Base
-     {
-+      virtual ~Derived() override {}
-       virtual void f() override {}
-     };
- 
-@@ -518,7 +536,7 @@ namespace cxx14
- 
-   }
- 
--  namespace test_digit_seperators
-+  namespace test_digit_separators
-   {
- 
-     constexpr auto ten_million = 100'000'000;
-@@ -560,3 +578,385 @@ namespace cxx14
- #endif  // __cplusplus >= 201402L
- 
- ]])
-+
-+
-+dnl  Tests for new features in C++17
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-+
-+// If the compiler admits that it is not ready for C++17, why torture it?
-+// Hopefully, this will speed up the test.
-+
-+#ifndef __cplusplus
-+
-+#error "This is not a C++ compiler"
-+
-+#elif __cplusplus < 201703L
-+
-+#error "This is not a C++17 compiler"
-+
-+#else
-+
-+#include <initializer_list>
-+#include <utility>
-+#include <type_traits>
-+
-+namespace cxx17
-+{
-+
-+  namespace test_constexpr_lambdas
-+  {
-+
-+    constexpr int foo = [](){return 42;}();
-+
-+  }
-+
-+  namespace test::nested_namespace::definitions
-+  {
-+
-+  }
-+
-+  namespace test_fold_expression
-+  {
-+
-+    template<typename... Args>
-+    int multiply(Args... args)
-+    {
-+      return (args * ... * 1);
-+    }
-+
-+    template<typename... Args>
-+    bool all(Args... args)
-+    {
-+      return (args && ...);
-+    }
-+
-+  }
-+
-+  namespace test_extended_static_assert
-+  {
-+
-+    static_assert (true);
-+
-+  }
-+
-+  namespace test_auto_brace_init_list
-+  {
-+
-+    auto foo = {5};
-+    auto bar {5};
-+
-+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-+    static_assert(std::is_same<int, decltype(bar)>::value);
-+  }
-+
-+  namespace test_typename_in_template_template_parameter
-+  {
-+
-+    template<template<typename> typename X> struct D;
-+
-+  }
-+
-+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-+  {
-+
-+    int f1()
-+    {
-+      return 42;
-+    }
-+
-+    [[nodiscard]] int f2()
-+    {
-+      [[maybe_unused]] auto unused = f1();
-+
-+      switch (f1())
-+      {
-+      case 17:
-+        f1();
-+        [[fallthrough]];
-+      case 42:
-+        f1();
-+      }
-+      return f1();
-+    }
-+
-+  }
-+
-+  namespace test_extended_aggregate_initialization
-+  {
-+
-+    struct base1
-+    {
-+      int b1, b2 = 42;
-+    };
-+
-+    struct base2
-+    {
-+      base2() {
-+        b3 = 42;
-+      }
-+      int b3;
-+    };
-+
-+    struct derived : base1, base2
-+    {
-+        int d;
-+    };
-+
-+    derived d1 {{1, 2}, {}, 4};  // full initialization
-+    derived d2 {{}, {}, 4};      // value-initialized bases
-+
-+  }
-+
-+  namespace test_general_range_based_for_loop
-+  {
-+
-+    struct iter
-+    {
-+      int i;
-+
-+      int& operator* ()
-+      {
-+        return i;
-+      }
-+
-+      const int& operator* () const
-+      {
-+        return i;
-+      }
-+
-+      iter& operator++()
-+      {
-+        ++i;
-+        return *this;
-+      }
-+    };
-+
-+    struct sentinel
-+    {
-+      int i;
-+    };
-+
-+    bool operator== (const iter& i, const sentinel& s)
-+    {
-+      return i.i == s.i;
-+    }
-+
-+    bool operator!= (const iter& i, const sentinel& s)
-+    {
-+      return !(i == s);
-+    }
-+
-+    struct range
-+    {
-+      iter begin() const
-+      {
-+        return {0};
-+      }
-+
-+      sentinel end() const
-+      {
-+        return {5};
-+      }
-+    };
-+
-+    void f()
-+    {
-+      range r {};
-+
-+      for (auto i : r)
-+      {
-+        [[maybe_unused]] auto v = i;
-+      }
-+    }
-+
-+  }
-+
-+  namespace test_lambda_capture_asterisk_this_by_value
-+  {
-+
-+    struct t
-+    {
-+      int i;
-+      int foo()
-+      {
-+        return [*this]()
-+        {
-+          return i;
-+        }();
-+      }
-+    };
-+
-+  }
-+
-+  namespace test_enum_class_construction
-+  {
-+
-+    enum class byte : unsigned char
-+    {};
-+
-+    byte foo {42};
-+
-+  }
-+
-+  namespace test_constexpr_if
-+  {
-+
-+    template <bool cond>
-+    int f ()
-+    {
-+      if constexpr(cond)
-+      {
-+        return 13;
-+      }
-+      else
-+      {
-+        return 42;
-+      }
-+    }
-+
-+  }
-+
-+  namespace test_selection_statement_with_initializer
-+  {
-+
-+    int f()
-+    {
-+      return 13;
-+    }
-+
-+    int f2()
-+    {
-+      if (auto i = f(); i > 0)
-+      {
-+        return 3;
-+      }
-+
-+      switch (auto i = f(); i + 4)
-+      {
-+      case 17:
-+        return 2;
-+
-+      default:
-+        return 1;
-+      }
-+    }
-+
-+  }
-+
-+  namespace test_template_argument_deduction_for_class_templates
-+  {
-+
-+    template <typename T1, typename T2>
-+    struct pair
-+    {
-+      pair (T1 p1, T2 p2)
-+        : m1 {p1},
-+          m2 {p2}
-+      {}
-+
-+      T1 m1;
-+      T2 m2;
-+    };
-+
-+    void f()
-+    {
-+      [[maybe_unused]] auto p = pair{13, 42u};
-+    }
-+
-+  }
-+
-+  namespace test_non_type_auto_template_parameters
-+  {
-+
-+    template <auto n>
-+    struct B
-+    {};
-+
-+    B<5> b1;
-+    B<'a'> b2;
-+
-+  }
-+
-+  namespace test_structured_bindings
-+  {
-+
-+    int arr[2] = { 1, 2 };
-+    std::pair<int, int> pr = { 1, 2 };
-+
-+    auto f1() -> int(&)[2]
-+    {
-+      return arr;
-+    }
-+
-+    auto f2() -> std::pair<int, int>&
-+    {
-+      return pr;
-+    }
-+
-+    struct S
-+    {
-+      int x1 : 2;
-+      volatile double y1;
-+    };
-+
-+    S f3()
-+    {
-+      return {};
-+    }
-+
-+    auto [ x1, y1 ] = f1();
-+    auto& [ xr1, yr1 ] = f1();
-+    auto [ x2, y2 ] = f2();
-+    auto& [ xr2, yr2 ] = f2();
-+    const auto [ x3, y3 ] = f3();
-+
-+  }
-+
-+  namespace test_exception_spec_type_system
-+  {
-+
-+    struct Good {};
-+    struct Bad {};
-+
-+    void g1() noexcept;
-+    void g2();
-+
-+    template<typename T>
-+    Bad
-+    f(T*, T*);
-+
-+    template<typename T1, typename T2>
-+    Good
-+    f(T1*, T2*);
-+
-+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-+
-+  }
-+
-+  namespace test_inline_variables
-+  {
-+
-+    template<class T> void f(T)
-+    {}
-+
-+    template<class T> inline T g(T)
-+    {
-+      return T{};
-+    }
-+
-+    template<> inline void f<>(int)
-+    {}
-+
-+    template<> int g<>(int)
-+    {
-+      return 5;
-+    }
-+
-+  }
-+
-+}  // namespace cxx17
-+
-+#endif  // __cplusplus < 201703L
-+
-+]])
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
deleted file mode 100644
index 125f86b57a6e..000000000000
--- a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 141436933a8d30edfd33aa5fcfb0c93cfa3ae9d5 Mon Sep 17 00:00:00 2001
-From: Timothy Stack <timothyshanestack@gmail.com>
-Date: Wed, 9 Dec 2020 15:35:06 -0800
-Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible
- and fix segv in mvwattrline
-
-Fixes #806
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---- a/src/highlighter.cc
-+++ b/src/highlighter.cc
-@@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const
-                                     vc.match_color(this->h_bg));
-                 }
-                 if (this->h_role != view_colors::VCR_NONE) {
--                    attrs |= vc.attrs_for_role(this->h_role);
-+                    sa.emplace_back(lr,
-+                                    &view_curses::VC_ROLE,
-+                                    this->h_role);
-                 }
-                 sa.emplace_back(lr, &view_curses::VC_STYLE, attrs);
- 
---- 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,
- 
-         shift_string_attrs(value_out, 0, time_offset_end);
- 
--        attrs = vc.attrs_for_role(view_colors::VCR_OFFSET_TIME);
--        value_out.emplace_back(lr, &view_curses::VC_STYLE, attrs);
-+        value_out.emplace_back(lr,
-+                               &view_curses::VC_ROLE,
-+                               view_colors::VCR_OFFSET_TIME);
-         value_out.emplace_back(line_range(12, 13),
-             &view_curses::VC_GRAPHIC, ACS_VLINE);
- 
--        int bar_attrs = 0;
-+        view_colors::role_t bar_role = view_colors::VCR_NONE;
- 
-         switch (this->get_line_accel_direction(vis_line_t(row))) {
-         case log_accel::A_STEADY:
-             break;
-         case log_accel::A_DECEL:
--            bar_attrs = vc.attrs_for_role(view_colors::VCR_DIFF_DELETE);
-+            bar_role = view_colors::VCR_DIFF_DELETE;
-             break;
-         case log_accel::A_ACCEL:
--            bar_attrs = vc.attrs_for_role(view_colors::VCR_DIFF_ADD);
-+            bar_role = view_colors::VCR_DIFF_ADD;
-             break;
-         }
--        value_out.push_back(
--            string_attr(line_range(12, 13), &view_curses::VC_STYLE, bar_attrs));
-+        if (bar_role != view_colors::VCR_NONE) {
-+            value_out.emplace_back(
-+                line_range(12, 13), &view_curses::VC_ROLE, bar_role);
-+        }
-     }
- 
-     lr.lr_start = 0;
---- a/src/view_curses.cc
-+++ b/src/view_curses.cc
-@@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window,
-             }
-         }
- 
-+        if (attr_range.lr_end == -1) {
-+            attr_range.lr_end = line_width_chars;
-+        }
-+        if (attr_range.lr_end < lr_chars.lr_start) {
-+            continue;
-+        }
-         attr_range.lr_start = max(0, attr_range.lr_start - lr_chars.lr_start);
-         if (attr_range.lr_start > line_width_chars) {
-             continue;
-         }
--        if (attr_range.lr_end == -1) {
--            attr_range.lr_end = lr_chars.lr_start + line_width_chars;
--        }
- 
-         attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start);
- 
diff --git a/app-admin/lnav/lnav-0.10.0-r1.ebuild b/app-admin/lnav/lnav-0.10.0-r1.ebuild
deleted file mode 100644
index 50823da7ecce..000000000000
--- a/app-admin/lnav/lnav-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,43 +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/${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=
-	app-arch/libarchive:=
-	>=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)
-}
diff --git a/app-admin/lnav/lnav-0.10.0-r2.ebuild b/app-admin/lnav/lnav-0.10.0-r2.ebuild
deleted file mode 100644
index e3da36aee5c5..000000000000
--- a/app-admin/lnav/lnav-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,62 +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/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	app-arch/libarchive:=
-	test? ( dev-cpp/doctest )
-	>=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
-	# This allows us to use the --with-system-doctest configure flag, and should not be needed in
-	# the next release of lnav. See https://github.com/tstack/lnav/pull/915
-	# This patch isn't completely identical to the one in PR #915 because that patch was too large
-	# for repoman's tastes. See the comment in src_prepare() for how I applied the rest of this
-	# patch with rm and a heredoc.
-	# https://bugs.gentoo.org/812353
-	"${FILESDIR}"/${PN}-0.10.0-use-system-doctest.patch
-)
-
-src_prepare() {
-	# repoman didn't like having a ~500 kiB patch file, so I'm just manually removing the doctest we
-	# don't want (the bundled one) and putting the one we do want here.
-	# We won't need this once we get rid of lnav-0.10.0-use-system-doctest.patch
-	cat <<EOF > src/doctest.hh
-#include "config.h"
-#include DOCTEST_HEADER
-EOF
-	# We won't need this once we get rid of lnav-0.10.0-use-system-doctest.patch
-	touch src/doctest_vendored.hh
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with test system-doctest) \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/lnav-0.11.0.ebuild b/app-admin/lnav/lnav-0.11.0.ebuild
new file mode 100644
index 000000000000..f55799d7af66
--- /dev/null
+++ b/app-admin/lnav/lnav-0.11.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+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="pcap test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	app-arch/libarchive:=
+	>=dev-db/sqlite-3.9.0
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.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? (
+		net-misc/openssh[ssl]
+		dev-cpp/doctest
+	)"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.0-disable-tests.patch
+	# https://github.com/tstack/lnav/pull/1041
+	"${FILESDIR}"/${PN}-0.11.0-conditional-ssh-keygen.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-lto
+
+	econf \
+		--disable-static \
+		--with-ncurses \
+		$(use_with test system-doctest)
+}
diff --git a/app-admin/lnav/lnav-0.9.0-r3.ebuild b/app-admin/lnav/lnav-0.9.0-r3.ebuild
deleted file mode 100644
index 46fd2ba10a93..000000000000
--- a/app-admin/lnav/lnav-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,52 +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
-	# Fix a segfault when using right arrow
-	# bug 792582
-	"${FILESDIR}"/${PN}-0.9.0-bug792582.patch
-	# Fix a build failure on gcc
-	# bug 786456
-	"${FILESDIR}"/${PN}-0.9.0-bug786456.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with unicode ncursesw)
-}
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
index bee876353a9d..49ed98af6520 100644
--- a/app-admin/lnav/metadata.xml
+++ b/app-admin/lnav/metadata.xml
@@ -17,4 +17,7 @@
   <upstream>
     <remote-id type="github">tstack/lnav</remote-id>
   </upstream>
+  <use>
+    <flag name="pcap">Enable support for pcap files.</flag>
+  </use>
 </pkgmetadata>