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

14 files changed, 125 insertions, 377 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index eb00f4b21d8d..9977d5659e80 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 39e948ad593c..195d637f33d6 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,18 +5,6 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180
 AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4a8c19cd51fdb3cedce2cbe2a1680dcbb407890aa3e75ab9ffc5c88566b3c1e44158b1b480e5119f SHA512 d0f73304d644cf26e609a2136f1107efe36afe54721cbbd6208cfe279629ef5603a94ecd786e83ad37d7828c038f01baa4482872fa65c625646fa73684e3e477
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-1.12.5-deps.tar.xz 289550768 BLAKE2B d64d074987dd8abaed5defdfbcab1ffe56b89c52b4912fc098ff0dfc29ae5dda65ce1ae0d83ee23a1d9b4ce22b6a09680575480c65d56d8ad9ad9442afc64e46 SHA512 afec76f7a8769b165c6a3df3faac4e6371017f3c51e0f3cb5e45f2302d2db1b7779c5d857718606edac0799cf13410373643294d466519076dc9dce549a793ae
-DIST consul-1.12.5.tar.gz 25159461 BLAKE2B 4e2bdffd77d032037c6999bee0e2ba4ac6c83daee422097f7cec37c74375419336ec50b19abf9b17db9375a9ee69894ad6577499c137945f7f0557d38d6aa4dc SHA512 df735447dae074ac84dc9dbf5bf2e6d907152d233841137fc4ba632bad19b6db49a60cb79473e6432f76c99ac3c1e287be00416a6553eb3acef8b2fcc4c5dcda
-DIST consul-1.12.6.tar.gz 25112396 BLAKE2B 18b77e909bee012817cd11b784d451929781ac19cecbc3c7804f37d7ad42328df1aa0bbb3b83fd9c311c5f9a60ac710ff166ea9fcb4fe58cb30dff163d793e03 SHA512 755944b0b8e59cdc2e7e86fc5360b447398f27e3d7f91fc278d2f86548ec8cea4af2f12be44d602d96691d2479d6bf8a74e6506cb118c5057181bceae60e92d5
-DIST consul-1.13.3-deps.tar.xz 251812624 BLAKE2B 0ce8fe76298defc83c174d1d02ee25b28ce9253fdd6abafe810ed0e0b63b8f9c82a1b5650508ad746b46f39261b7e3f41395129780d0feed5b61be50c04469ac SHA512 0b7d662a9c48e2509208045194ca5fff477245977d87ba570a0218d4f34a91c4b19a28871eea7104b3918cd54da01b71f5f533e5d93215a7767038977993d6c5
-DIST consul-1.13.3.tar.gz 25380333 BLAKE2B 6dbb8f3e9e3dd6b7e5192a6f050000cfb48a7730e63e474f2d24787608f21781b5f3810400b42f38ad93995d048fe41cc9643ffa3923c297699cc1a8e975a44d SHA512 a978e25f89b7fb9ebc56fd2857493559756981b6e63e57d74b2749af9cce44897b7b5dc136a38d5861296105bedcc591adef972e18edb02efec1952c2f67add9
-DIST consul-1.14.0-vendor.tar.gz 39530717 BLAKE2B 62672e0383353bcccdfcaa25ffd7409b31d8ba650080f315d8a8b68d0be4afa60a12b45ec548be0ecd5a9a703c1888c781a985f1b67fe6128fd82f69a984c42a SHA512 a2ada95b7e890c3f466009a78fdd1dfb0aa46494583811531653230adf0ead98016d22cfdeba45d68e03a6aa7fe711660c17c438c6c9038cbc732021ec011e7a
-DIST consul-1.14.1-vendor.tar.gz 39669654 BLAKE2B bb4fbe3df71354ee46d5a08e532226f2a0cfd8f5eb46b20a9ba5a324e1166a64a9b6cd3e44c5eebbd16c3bd4ff6a72b3afbfe117b7cd1b7fc5b9bf68cf58aa73 SHA512 9bfef09a7df0a0d4230d7e25ba113b985a29532240f235592af480867fb2c803671e2ed6563bbb7f07c64c15a8b1a5b00a9a05151387a01049067a75ffade169
 DIST consul-1.14.2-vendor.tar.gz 40549325 BLAKE2B af0135de2b781d69707246a8f7f48fb677d3b9cfff59ee95ae6c37cdbe634bc04c2e853ce3dd2f70bd9a7a1d72438cdcd382939a5e361e152180c7ae1905bf85 SHA512 8e4d160993272a99901b83821b2e29686a53c2700a3e9e2355080eaa15d74f0a0d8f0d8ff86f08a131549cb3e70f77f59da302bb3f6f6b7a367c2ccd6f3ccfd2
-EBUILD consul-1.12.5.ebuild 1348 BLAKE2B 2e307d128275fe16ba00c9f59e4343173a33adb67cf5e0efabe39551916d26799051582e5bb28f6d2e028854e0f10b876e0d7faa4232aab86b5b4988a94a7726 SHA512 537e5dff9baa5b2654c8a8bb3c2b28401859706ea33c7c90fc4fc81e77f1d0410bfc95d8eee59ff4174e89f7c9516994e2fbd854af5c5c2fc8691f08dc91b832
-EBUILD consul-1.12.6.ebuild 1358 BLAKE2B 8b8f7f3ec8c7b1e4513b792f7ae3cb433cb85f3f3ded471cafd9f1ea85f766ee1fdf8170e829c219793d49b31433e2655028c7d717ecc377b6a5c41dd620ac83 SHA512 2cd161dee702f2aa0472efb785203bc69fc204ebe43825ba7ef2bee927a2217f78578471ad14d8898754e8cbccdb05b06ee8b9d998f298b8ef8ac1764100eb7e
-EBUILD consul-1.13.3.ebuild 1450 BLAKE2B dcac7443f99d0b59e59405c544ab6b2acaff9f1a88739a5a2582092a45cbeedb872fe5069f1622995190f320b926ed95494b8f8ec1ec28f7d5c891c1a58177be SHA512 072e60f28c53da8db659487889c2aa75ddc220d083d990f90009824cefcf55fa21856db4cb69319cfb0b40de18148ffe6e6fca2930521dec1b5809b500c9b81e
-EBUILD consul-1.14.0.ebuild 1433 BLAKE2B fb73ae8584816a78ac7799fdb7ebeef637bdaf2558180fa8436a0d1d5a689b334e0ef82b3499281c872c29ff7e8bb3900616fe76dc64fa22205ab096a2c9ead0 SHA512 601e0662b494f1421ec6256a1e1abf626ec7b512ac5f9f705669d8d9ebadfa67977355f9ed44f41272749dcd49e46f6d867cbbb64d8302d81db0226e3efdc237
-EBUILD consul-1.14.1.ebuild 1433 BLAKE2B 0eebbb105211742812aa91b1b0a01370a6fdd2ddca6aa4e0acd1d8ad8b93749e0366bfb1f77dfb21cd34896da76bbb7b4b943d7239df546bc1d9a20a9cd7b238 SHA512 73062dbba9f5bad0638991baf8f43115b407f59511476f38b81e85b5bb53aabe74138bf952bb63a7eab8515494aea61f9b3a986246520bd1f2b0045d0ed8cf56
-EBUILD consul-1.14.2.ebuild 1433 BLAKE2B 081e7ce46d6b56a31f203945ad9d84f5c3e37ff5d8e1d5a715e2dcdecf40433050766835b32e802dcdd2c29168a6f0ca66fe174395a480d1cf2a83bfcf1a24d3 SHA512 3856eeeab74a17d987c14d417bdea791ae69c31723053abb6d7cceda32f341802b3b542671fe444b15bcfbcb830d9b3f330f12a758cc4ee21ae989a4d24a6e3e
+EBUILD consul-1.14.2.ebuild 1437 BLAKE2B 872a6839ad85e60f61524303f26abdf6f2338067a02ace82d8e1a311c1aa8816610d097c0020e840742d6fa48dffea95955d1eedb4c8ee8d4c1c69f6740f8b61 SHA512 0fa1e42f04f61cf2812f59a3bbecc83b234babb6caace45b73c9fbac9b220df5cb074750293ad9e923cbcfc3db750548e7fba2328245bdd222c6d8e5c0e32f53
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.12.5.ebuild b/app-admin/consul/consul-1.12.5.ebuild
deleted file mode 100644
index ae84b874b6af..000000000000
--- a/app-admin/consul/consul-1.12.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="778b5eaa98c8e68d5f9cacdaa0f8e472fff4d3d3"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.12.6.ebuild b/app-admin/consul/consul-1.12.6.ebuild
deleted file mode 100644
index 0cf1172ec310..000000000000
--- a/app-admin/consul/consul-1.12.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="950fcb85a7a242ac8512391b81fae20c5b8be962"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/consul-1.12.5-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.13.3.ebuild b/app-admin/consul/consul-1.13.3.ebuild
deleted file mode 100644
index 7e5166882447..000000000000
--- a/app-admin/consul/consul-1.13.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="b29e5894f2322c9294b1f03c9b264ae2e6ae0eb0"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-10-19T19:49:59Z|' -i GNUmakefile || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.14.0.ebuild b/app-admin/consul/consul-1.14.0.ebuild
deleted file mode 100644
index fcfd8c276399..000000000000
--- a/app-admin/consul/consul-1.14.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="fdfdddb9e1803d5b2257c99af8c259773ed05b3d"
-
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	default
-	sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-11-15T16:39:54Z|' -i GNUmakefile || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.14.1.ebuild b/app-admin/consul/consul-1.14.1.ebuild
deleted file mode 100644
index 1bcbba0d09f4..000000000000
--- a/app-admin/consul/consul-1.14.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="cac392a17d3f71048a949599a0f977bf9645df62"
-
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	default
-	sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-11-21T16:56:07Z|' -i GNUmakefile || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.14.2.ebuild b/app-admin/consul/consul-1.14.2.ebuild
index 6033d7f63dfa..c78ede7b6e9e 100644
--- a/app-admin/consul/consul-1.14.2.ebuild
+++ b/app-admin/consul/consul-1.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 RESTRICT+=" test"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND="dev-go/gox"
 COMMON_DEPEND="
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)
 }
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 1cb150a2b147..06cb6cb091a2 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -5,6 +5,9 @@ AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe
 DIST logrotate-3.19.0.tar.xz 166276 BLAKE2B bb19690ca092905e527f6a0a7915373a65b29d3b50d97456ed31aa9b5b5698b3ae266c8e247a167198dcd8891a7e330f4913dfefa3563e5b2de7a6e0d067a6c3 SHA512 7838e14a5b147f6e5edf6efdf743deeca39fdb563fc6f14aa010ac5b7bdef9c2bb8005415481d1b042b31975052d5ed6e75c4bcd7e378003427ebe5ec02a1f2c
 DIST logrotate-3.20.1.tar.xz 166712 BLAKE2B 8481e0d746c6bcbe10f2686a921334c6f957c8d92520927de7bc8fb0b7631a444fedaa80f35bc2de7961b3d5833ce4ab885b1298b235b7f8b33cc3ae05438da6 SHA512 a9ed5796ab254f511d0029a8f29ef7557f62e12e3ea9af24e30b5b9f348b1c1a16df26d44314b78299916fb3b5000b9cd9eed7cee2cee8df11cfd8e40c79b092
 DIST logrotate-3.20.1.tar.xz.asc 833 BLAKE2B afc02177335bcd580e0617af8c50846b371c2d00ecd8fe329c2e298dc8c48823137625f455cea3d983a0d9971733297fa2c4d98ba3c6f72d2c07f8f21108cfe4 SHA512 2dd207feec431b223ff12f09f6cce14409d45e5bb3abaf2275dd773c7ee7c59ed7d32395e5869bfed70c970be4158fd299e6e269838378843dcb63ca5ebfa029
+DIST logrotate-3.21.0.tar.xz 168532 BLAKE2B f7fa0050bde51e2517eac8456ecf87648bc8423621830894ceb2a3ff6b9dfe32c5b53df6a4ee59aa91bd563ed94376a635159535f4fdc170fbc673354bcef508 SHA512 c576df7d2bc1a1db2f99befdd0ea627aef2d97bdcd4a7cdea76870623ba92fb1f04f1af6d15b75e4a9085f4aef2ae5e9843c4094cdd01e24d89872ccaf9c0d4a
+DIST logrotate-3.21.0.tar.xz.asc 833 BLAKE2B b2099a0b8c15d1ea7f7325884027dff08dcc8305113411448797b8089d17026242a3f10bd6d7f3d865e3e339ec6fb5faf4ff48f8fd65bca3af4da8b335c3b5f1 SHA512 8f4c1853cd84f85c796b72b43048f4cf04e3409703e7669ee91e1d1aa5e9e5c04261fac1cdf85ec303508d5b6dbf126a44eb9ec819bcc772c664830d39e1068c
 EBUILD logrotate-3.19.0.ebuild 2257 BLAKE2B 0a66afed01ac2efcefccbb3abc5309ae27fcde5429368e13a17dc4672d06c6c67bd5546cf5e80da69eaa3f1cf36149409db004682e27d4e9995056deb0fe06df SHA512 f3d7b346b50e086bb50fa7d1b5d854d4c5fdf9a9700d9212eeb992da8a0dbf6c4a8b21ee0bf5a26d917ed2a581980952121d2c0c88f6fe1d3ca474db30a96d3f
 EBUILD logrotate-3.20.1-r1.ebuild 2513 BLAKE2B c94c72483cb4c065b63cb313db67a8d28f534c7f204c852f79c05d363d2ee29f766136c98ff324b92d085f0b083093e4c73d7aea099f05b8c3ef85adad5811b0 SHA512 d6e9474b5de6a6ce945f9e7b1b0863e309956989064ab28ba14565f1b88cb434a12e1e2ee8cc6240dd64b49dd3a9b299c366d6b9b359eb410769b198750ae788
+EBUILD logrotate-3.21.0.ebuild 2489 BLAKE2B d9047543641c3302a2c827b95b49f556b5d95944876d7348eacc288147a94b0255dfeb09610e3965b74767fdd7fc5a6cb1b20016e35c124fbb64dbdb1396f5ed SHA512 f3780db0a8189ddb1bbebf3f518ed9246ba5624930bbd2cce2321547a8bffeeff86f10e41339341b959854e77d9a804b8ca84363868c100aa9d700b8ce9ad6ca
 MISC metadata.xml 1203 BLAKE2B 434c8f014678fca0829df99c4af0a965721dd5023baee7e0684b66993db4895152c879a71bb7c73a434834d648392d96985260a61d98209c14238dc18884576a SHA512 785c3c4c45ce53caab03bfa43be4240b9e0514885c2e195729cba576b2f26c17744be9f5767342626e1052475a3f1f2a089a698b541730b8a94e04bfc5d9d837
diff --git a/app-admin/logrotate/logrotate-3.21.0.ebuild b/app-admin/logrotate/logrotate-3.21.0.ebuild
new file mode 100644
index 000000000000..fed4e129a527
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.21.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/kamildudka.asc
+inherit systemd tmpfiles verify-sig
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl +cron selinux"
+
+DEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-kamildudka )"
+
+STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
+OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.15.0-ignore-hidden.patch
+)
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+	econf \
+		$(use_with acl) \
+		$(use_with selinux) \
+		--with-state-file-path="${STATEFILE}"
+}
+
+src_install() {
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+
+	move_old_state_file
+
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}