gentoo resync : 16.04.2022

39 files changed, 548 insertions, 328 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ccadc8307159..6cada6d93848 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 905a9b4cda54..56825eb13aa8 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -6,6 +6,7 @@ AUX bzip2-1.0.8-mingw.patch 330 BLAKE2B 27cfec9fb3fb16f624445d0f035d56a6a747eaa1
 AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a01908fcd2eb8f1b187c822991d818011e49165abaed679d899a2fa29adb6751faa82659e31c6e0f853b4548061f2913cb0cd18 SHA512 9008152aeb299825635eb9b6f4887951ba6ec190b7e545e12d82e2222ba4ed1ceb31e3eef1275b5f196b726e34a04da1e7c2c95a694c7c771a8852f20a1bf305
 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
-EBUILD bzip2-1.0.8-r1.ebuild 3349 BLAKE2B 6e2e37022f3a0cf14c3b3a48254ab65a5f2c7ca4a728c0ccbcf707ead49a808e8a608ae1c3c31f8d76955948473b481c5be9d6728151c03ef4d162669a9069d6 SHA512 becb679ee3e98e9e718888ad10a4a1b1b7642cf7fda14c1283af1f5d1b5566e8140a8e5f7d5fcbaa252172a346214be932487621425d4286c818ad12c63dc8fd
+DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
+EBUILD bzip2-1.0.8-r1.ebuild 3564 BLAKE2B f58b589fa780ad66688761d36c03b647db4c33d84198687e3edf73455b01c341657b8ce677e013fc21c7e7dc7cb559fd8ea29147acbfc760ab12cc3748002fc5 SHA512 b8e34a4e14c7daf4c8fdaeb40b5668a9d4d62aaab0760187e1e0c9e9d2a93aeefd4785ec30a99c409a4e10fc3af66bcaf129c96ed6fa952d3d0e5fcb9f44703f
 EBUILD bzip2-9999.ebuild 1623 BLAKE2B 792eb2334df87eaa765d1f6d86216b63cb47f96e4087425ba6b5320ba1cdd5a6a9fa8d16252c62e7b6087812e9c33905cfe40fff2354aeb41eabd52ba4e5d999 SHA512 8551d0bd27cb3c8bc2d5859ceefad97a132e32f01e41430377fb95228419f5f008d77ba4be2c4bbaa180da20a0fa4a6458831bc628cb287a65b4f812ea14918e
 MISC metadata.xml 333 BLAKE2B 88bbfff022309d663b728da241623e9a9dd2cd00d4638cc97c4809433a3645421239d2f51360f9d848617891e7600ad6b63b17acf8c6ecd65a4e355dc1372084 SHA512 15620686ec250b2547fc7ff369c9c0854a7217e731da556db1224896cfd4e63eba836469722b12115e359a9701acea0ac09d7ecc89fa1dbf8683106432f1f9bb
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 20e9e8edeb87..27ae77914b3c 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -6,7 +6,8 @@
 
 EAPI=7
 
-inherit toolchain-funcs multilib-minimal usr-ldscript
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
 
 if [[ ${PVR} != 1.0.8-r1 ]]; then
 	die "Please remove libbz2.so.1.0 logic from multilib_src_install"
@@ -15,12 +16,15 @@ fi
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/"
 SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static static-libs"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.0.8-saneso.patch
diff --git a/app-arch/clzip/Manifest b/app-arch/clzip/Manifest
index 4db2dbf5f8e1..2424c3d205eb 100644
--- a/app-arch/clzip/Manifest
+++ b/app-arch/clzip/Manifest
@@ -1,3 +1,4 @@
 DIST clzip-1.13.tar.gz 123369 BLAKE2B 3d6b205aa7c60e04baddcf826d3da709f58b5796c95ac348a77e9d997ab68dda750c65b78ba50656a6c986146bc87da8b3503c86a3e0d568c9e6b1550aad5997 SHA512 7b9943f3e971cb9cabadb3b0832c23984c9329cb48bbfa6fd0780146b6b3d612386b6ca8c6e688c05470e3e3474b688dfb3228ba6aff2093ea1d781eba5f2791
-EBUILD clzip-1.13.ebuild 593 BLAKE2B 259240066fe6f17a88e54e6f8e35cad9103fe3cffcde12f58651f82838b67fbd445c534e2403709158a18386c0e40113647aa448423d31fc81cc52393e05ab81 SHA512 63d1ad0aa0a61ff82132cad38a8a4d185d9ef2ccc24493b57b46efa2b4171e9922e08ac651342f7f00cd3ac893894d04232fab586c6ebd2502bf1e1bdf0b08cf
+DIST clzip-1.13.tar.gz.sig 72 BLAKE2B 5ad95fa29fa23679a304fb53d0a415640985d9fbc67bd47ab83991694be406a956da813329a37844c4581911fe253a027ecaf3621f5c31c28b0ac6423b89f969 SHA512 80d24b980ee78f6dc0d61412b4838f59c37f97aba65856b2622d2cbaf82650abc37c6dfc914326cfe3c534399a7023ff11a0f3865b3cdc8f7d9cfe278b5c2395
+EBUILD clzip-1.13.ebuild 853 BLAKE2B c37151e01589b735f6edf4251da903b9fcb912d3d21799bc8288ed46443c3e7650a192facb8f79a968f2f5734a7f5ced0d78625abd6d2781d3cd3995d00111b4 SHA512 40ff1bc7bb1d01c54187d5d4bcd40237f6c6c9ad3ed03fdb025f5eccf0c8b21b0d3413de6669c92a28ec6446365107039a3558dd7409f6e57b7989f823129469
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/clzip/clzip-1.13.ebuild b/app-arch/clzip/clzip-1.13.ebuild
index 571001a3d9fe..9be8959fa597 100644
--- a/app-arch/clzip/clzip-1.13.ebuild
+++ b/app-arch/clzip/clzip-1.13.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="C language version of lzip"
 HOMEPAGE="https://www.nongnu.org/lzip/clzip.html"
 SRC_URI="https://download.savannah.gnu.org/releases/lzip/clzip/${P/_/-}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
 S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
 src_configure() {
 	# not autotools-based
 	local myconf=(
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index dccb622e9103..2723f21eccd2 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,6 +1,10 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.11.tar.xz 804096 BLAKE2B c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 SHA512 af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3
+DIST gzip-1.11.tar.xz.sig 833 BLAKE2B 3fde8303efdb96c38272e7e6886590e324cb13ce66bc592449c38852f176faf85edc8b992be0ff6a97f97be5d3c7df108bca2821ecb94decb2455fb8c2e11429 SHA512 ec039bf980714cdf122b4f13ba479fe6e23f123f4a553ca4f72935f331485a4b69f451361fc955e9ba3461ca650e4eaf04c617cad1fb985dd07529263d69525e
+DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
+DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
 EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
-EBUILD gzip-1.11.ebuild 1081 BLAKE2B 0fb0ab9f3b02ebc07df50f792285beab43b47c14fc0c6c118bd6d5fc4047ed99937f202dac5d3a976c17c99c83f0486e13c240b88657d294b0b65cf933fc8b47 SHA512 021e50cd93e467112de13d6f8dfa7ba573e5d7a1d8b89d7e8526bc25473d5354f3a09e8076ee8e41faccffeec85b94536857a2aac1e2dffc2cad86884aabd7b8
+EBUILD gzip-1.11.ebuild 1302 BLAKE2B 7d9b93d5ad8801a6a58c6d64208444ca448e131d1fce9ab530933d429d284b3cc861cbf936c87785888195ac7e3f58e1a382496ee36e9ae5245356889ccf9c73 SHA512 549b67a6baf831eb8613163ea0083cbef83ce31e7cd77fab6db0f3fcca32058b5c71b3b4f112c26302ddc080c969ff9a17300b0ca73aa1d3df95afbbce95e46d
+EBUILD gzip-1.12.ebuild 1313 BLAKE2B 7c0261d68515c6cf17be118f8492961812e6fb25aaf3801b5f0b66953f15e22ad013a6c678c54f6f96a426a8c5ee2043d1ff42aaab4fe55a05deb37ea8457c26 SHA512 6ac077b0f3f7d27ca869f0a720f993e2cf0a27d4c176ed1f73a5ce2949727117db1da368ac5446e722a09adcda1137f46b5373228742f400ceb263b920c38038
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.11.ebuild b/app-arch/gzip/gzip-1.11.ebuild
index 0d00a0f7aad3..3043f6b85ccb 100644
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@@ -3,19 +3,25 @@
 
 EAPI=7
 
-inherit flag-o-matic
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc
+inherit flag-o-matic verify-sig
 
 DESCRIPTION="Standard GNU compressor"
 HOMEPAGE="https://www.gnu.org/software/gzip/"
 SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz"
+	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+		mirror://gnu/gzip/${P}.tar.xz.sig
+		https://alpha.gnu.org/gnu/gzip/${P}.tar.xz.sig
+	)"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
 )
diff --git a/app-arch/gzip/gzip-1.12.ebuild b/app-arch/gzip/gzip-1.12.ebuild
new file mode 100644
index 000000000000..dfe5be2eb912
--- /dev/null
+++ b/app-arch/gzip/gzip-1.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu/gzip/${P}.tar.xz
+	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+		mirror://gnu/gzip/${P}.tar.xz.sig
+		https://alpha.gnu.org/gnu/gzip/${P}.tar.xz.sig
+	)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pic static"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+)
+
+src_configure() {
+	use static && append-flags -static
+
+	# Avoid text relocation in gzip
+	use pic && export DEFS="NO_ASM"
+
+	# bug #663928
+	econf --disable-gcc-warnings
+}
+
+src_install() {
+	default
+
+	docinto txt
+	dodoc algorithm.doc gzip.doc
+
+	# keep most things in /usr, just the fun stuff in /
+	dodir /bin
+	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
+}
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index b3c1c0192a68..bf007b455f90 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -2,6 +2,9 @@ DIST libarchive-3.5.3.tar.gz 7038767 BLAKE2B a9f8b44c42efadb29cba2597c201bf9064d
 DIST libarchive-3.5.3.tar.gz.asc 833 BLAKE2B 2a2af61d25201feef727d05554b3b1553779afeb155d1d68a3e2b64e71eca6ca06cd6d9c77cc98c2d40c0d654c7de535d9901e55f527cb74dc8933a402207553 SHA512 1a6c930e62961ee97d2983ad7f7aded61dd65668737cc7fc42b3f2f32a699931fe74c1b7abe4686e061e7b39500a67adea929f390a8dcb2037d0d58f3b30441d
 DIST libarchive-3.6.0.tar.gz 8570393 BLAKE2B 57a8e1681485a489dc9d3823cc8c9b0d68e7d84510a3eff0b6adc268825bb9aa6179d8a810b249c3f72e3674e1df6e5ba2ed0043196458bedc3c1d880c5d4a0b SHA512 700579c5dd15b61333cc4dbf01ebfbd26d6e8c20d5cbe6525683634418fec5c87a5a1e28a81cc59ad7c94218682e406aa3b55d81036bd9fa31d83d989c6d764c
 DIST libarchive-3.6.0.tar.gz.asc 833 BLAKE2B 0b3600e998ccf3e3862523116db071f5c43165a422f292053d7be14a67a294b4b9ed76a939156ad0f494443d9a6a6dde46e73c1107d50c7e150030c7627d8851 SHA512 2450a3463ec1b4b2c590139ea2b6f0db0afbd8ff7939da5d90c5adfb3d27618ca36b03596b707211de82341ca157acaf510fc51ee26d6901d46e15341406acd2
+DIST libarchive-3.6.1.tar.gz 7431598 BLAKE2B 1f060edb3d7579e406db1e757af8193d6b23c56a07dd7392cacfc37d6634de1a732a4845a38e4c7a539a634475e54f202689c4a46f1c27655e91211783a6364f SHA512 58f7ac0c52116f73326a07dec10ff232be33b318862078785dc39f1fb2f8773b5194eabfa14764bb51ce6a5a1aa8820526e7f4c76087a6f4fcbe7789a22275b4
+DIST libarchive-3.6.1.tar.gz.asc 833 BLAKE2B 6b8ebcfbffdc51b693ba51d1c24bc89b9f8da81257535427ccae7791f7849197685e450b62fdb0972c4313244bf89b659662f678c68e73467bd256873b1ca83c SHA512 4120b21113a21c0afce16be72ac3bd41e744e99c713a2cf005d128c4b2382e9dcac638d4615771b9deceee0e1c99806499aaea35227fd4e435d15e672b4d6624
 EBUILD libarchive-3.5.3.ebuild 3436 BLAKE2B e8965394e4927acb6493034c5dedbe8c10a261a7101c2478a13d8db12c51fdf1410a784c6c1a020afcf69cb6889d030771beda34220f78ecfc873f8834eeb24a SHA512 0d1b1370fe2b18db7d4aec04984bab012317804cc5dd7d4b9c64963308909d662c2568036c0aab5f2e428050c20168e5f0a944442f107201d871ad4f44b214ac
 EBUILD libarchive-3.6.0.ebuild 3437 BLAKE2B d9710b7367b7ae7fc381377c03448d4b841519311ed9890d542b602efeb3a886710a7ecfa2780032b32f8a1ba87a70a9a8467a8e7d6617a3572f19ad4522f5f5 SHA512 4f2ede9aa6dc5a0c466318c46599b743cfc19e36a58bcc6cfd8ee9a31cdc6f42945d14a89a6d023df6175e4cca5c8c6ad8b0754bb121465fd94f78b45283e2ce
+EBUILD libarchive-3.6.1.ebuild 3434 BLAKE2B bfbdf59623b393721405e0acbc667fb3fc1c62239bfa212b916e842ad6f5b3c04298ddf73ea95cd95e532952965f0663568fa9cab50bdb0216ce1d3052381b9d SHA512 9ad9a260a1277abb39aff60aa1f898bf7f51ebbdb4dc6e4aa3f5e50bec58b82258ea86b5fb4ebd09bc28b09858ca2c9ddf8cc27357d0316de94edfba6feaea9d
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/libarchive-3.6.1.ebuild b/app-arch/libarchive/libarchive-3.6.1.ebuild
new file mode 100644
index 000000000000..c6f209835a1c
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.6.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="
+	https://www.libarchive.de/downloads/${P}.tar.gz
+	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.gz.asc )
+"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
+
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)
+"
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-libarchive )
+"
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		--with-zlib
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 90ff851378ad..68bafb42be79 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -5,5 +5,5 @@ DIST lrzip-0.650.tar.gz 238952 BLAKE2B 5013de6f8948aebf1bb7545c392b623a1628f7429
 DIST lrzip-0.651.tar.gz 238854 BLAKE2B 2680867ccbee6ff669581017c9bb22db4d7eba0fda80b935bd088191809cb8baa833a03e7732cd1fe5a0487edfe577b34f34dcdcda121c114145bff9fc17ba79 SHA512 97671c4705bc06dfd037e38f4384a5ffaf2e3508da217406ac43642b88eae16576818a378bce519812204fecefbd6552a75fc3e74af729ab7b11724b7a6d1998
 EBUILD lrzip-0.641-r1.ebuild 1295 BLAKE2B 094ea991f24be2d7dad3c7c49ecb772fe6151350896174c5d73bdd02753ef3867c556c5ad8a3888fcfac86fc203c468450806917d70b7b0367b1c9e35059b24b SHA512 5b71095e1acb73057efb04b14819bde577242b36246a17b67d3124d8a13db5ed14a9873cfcb02d357f6cdd5b3f5722f07eff4235d90273877d6f8223a54a9cd4
 EBUILD lrzip-0.650.ebuild 1199 BLAKE2B 3ea96d2eedfd04abf96829cfb29797472d9baed3d05b6b9f8a58d0644f51e9f84a6ef6550bb2fa1b844d8ae7936bb180c1465d110a2df4e34478d7cc33df2aa3 SHA512 24f86bc6e6c1db491f2fd8d6f81af3f78639fa6fa579245a8138c4c93802424ece852740bf30ea79cb019623de28cc976af39cfe513da61fb09273e720039024
-EBUILD lrzip-0.651.ebuild 1199 BLAKE2B 3ea96d2eedfd04abf96829cfb29797472d9baed3d05b6b9f8a58d0644f51e9f84a6ef6550bb2fa1b844d8ae7936bb180c1465d110a2df4e34478d7cc33df2aa3 SHA512 24f86bc6e6c1db491f2fd8d6f81af3f78639fa6fa579245a8138c4c93802424ece852740bf30ea79cb019623de28cc976af39cfe513da61fb09273e720039024
+EBUILD lrzip-0.651.ebuild 1192 BLAKE2B bd258ff4fe72e5b4a44f687131a38e738d10bfcb7e0b2d498324a65f059a01dcc74af7693972146c6d12d0eb8d0ed06c6aab090a92b189b9b1eac92b1a5340e7 SHA512 eed3e976ebaa7a92958ec037302d73d1c71c21eac90d7f18c2cbea0525d036266c7fb8f9175096f7b41c82cc62b11e7b108fae0a7caf8df58dacf7722d82d76b
 MISC metadata.xml 608 BLAKE2B 30dea4aadd66ede896608352c35f848994c266849269253644e6cc72f737988d389459f38dc3b3cb45d9dd4bd3d36c194c2972b13da89e9349a2822dbe816f73 SHA512 8e239a83dd093400158111390385bc46280962a4162858bafc5a3ef3389ed4f136976d39bce1b07f5a49b95351cadc4c3b4803ea6fb2f3b83562484d7e8e7c49
diff --git a/app-arch/lrzip/lrzip-0.651.ebuild b/app-arch/lrzip/lrzip-0.651.ebuild
index 9cb8ed8b2d4e..413ea32e4781 100644
--- a/app-arch/lrzip/lrzip-0.651.ebuild
+++ b/app-arch/lrzip/lrzip-0.651.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="app-arch/bzip2
diff --git a/app-arch/lunzip/Manifest b/app-arch/lunzip/Manifest
index c4736b40eee7..2bdda214727a 100644
--- a/app-arch/lunzip/Manifest
+++ b/app-arch/lunzip/Manifest
@@ -1,3 +1,4 @@
 DIST lunzip-1.13.tar.gz 66541 BLAKE2B 45b6a4ffaac6d9b8ddeeebe5e33609bf4e671ad7370570035bacf41ee8ad35f49e14f495dfba650de284fedca1a63ebafe7f67c18083b4add94caaf7709d8e2b SHA512 67f950883b7062d37601bc16d7d64c07f6c580afbf3c0f61394dd6fb5d41c27214484b1dea7aabd41db06d18162b95b5734674646c4fcc833268cabe8cba91bb
-EBUILD lunzip-1.13.ebuild 587 BLAKE2B 387fba02120c1525ddc385016d859140f8c3e3083c08538d3691333646778be2d1bf9ab730e5dc84c6f518b581d967ee835b0d0d8be17fe0ef12a8d4454a44c4 SHA512 33116edb78231f04b3a07e5865f230093d8cf0f6248f3968d09f9eff8e12665d066e08021921420ea41ac943ab853592d7ed9a5d6887beb7dfcabb0bfa2cefea
+DIST lunzip-1.13.tar.gz.sig 72 BLAKE2B a0d852dbb5394c5fb3e287cf4111290e0c603414de5a00a2d6173821df2410e4d826554ba4e04b5e9b7df0fa247cd95335a1a227b7cf38d4c5a7f3cc436be6ef SHA512 b71a73e7ad3a25140343db92c0ccf6311d0a30c71675e01a36da4735d0e0523d12d32b6472409359345ad6c9e550dccd399442d98fde44593af42f516119b3fb
+EBUILD lunzip-1.13.ebuild 847 BLAKE2B 264f28aaf30202a95fb31c8d04d8fb6c901af92306a25ac5edc0889b5f1d50dd087f616bc7810da545713e8d33dc1fc8c084ee05c24f9892c51102b15ffd19fa SHA512 57be3498581a16550cba5c854694831fa09946cd749c37758616855eebdcee98822402b87535b5e30e23196ad96b86175724fe0ef9c2f4c0dd71807cf0a68752
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/lunzip/lunzip-1.13.ebuild b/app-arch/lunzip/lunzip-1.13.ebuild
index 4f7d48dab0be..3106eed819d3 100644
--- a/app-arch/lunzip/lunzip-1.13.ebuild
+++ b/app-arch/lunzip/lunzip-1.13.ebuild
@@ -3,16 +3,20 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="Decompressor for the lzip format, written in C"
 HOMEPAGE="https://www.nongnu.org/lzip/lunzip.html"
 SRC_URI="https://download.savannah.gnu.org/releases/lzip/lunzip/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
 src_configure() {
 	# not autotools-based
 	local myconf=(
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index d7135b4fc0f5..4575d7df806c 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-archiver-0.4.0.tar.xz 167124 BLAKE2B 2d9295200c284e2dc0c2b538a92952dd0a11882211e5d1d5838141583b4a595b65c26a057e5c9733190182a5f78958e15d0e086356d75dd4e0c72d3510a34cfc SHA512 e1b323cd118af3726009e153c4f9766ec53b29fa0280530da16e2101d36ec45b55de0fe3d87c1386a4e5b3d88712fd209659b4ebb9344af689812600ae136ed6
 DIST lxqt-archiver-0.5.0.tar.xz 176312 BLAKE2B c7e843ba59e3c313fbd1b32f848fb3c988fe144886f64b284f49716a200866a8c22d68b00ece8f61b103d8ab55f4de6a2a86371637b56a842fb516520af29964 SHA512 01747499fece79010f359bfe5987dd0ef96daa92269659dc64543a78a4540ed7e5ff2e0b2ae6ab620c6be7244f4e350a18aa08657e7d84429fa20d0a264977c6
 EBUILD lxqt-archiver-0.4.0.ebuild 1180 BLAKE2B e683fb27236235e2dce15e1d957a435be42a953585cd16b881766808e510e390b42b7b7a199d0929d4f51ed8b1de360e78e8e45537f38b5378152da4b2658f95 SHA512 0cef2d37e234144395e7569790be0a2b84b1b67568559da56769cb68dd8af92aa6220d3d6f961904a08ae573a78810f9e09a6e840b08bfbcdd9fb3a72327e3cd
-EBUILD lxqt-archiver-0.5.0.ebuild 1281 BLAKE2B e232c8fa691010f83b7c9e42ec0c5261ecca37eea7ee979eae0884707c1c65a141438b8e6adfc525b81fc404b16116259229ad434a5d57e63428587ace8282a6 SHA512 874b29dc79cca620d1933893bb5fb5f21e1d1f3696d22812d732c9a52987017b2ba6b9187de20ad097b680b864b4fa019ef3ddd5295fe430613907953bd18465
+EBUILD lxqt-archiver-0.5.0.ebuild 1279 BLAKE2B cd52c45bd4b4a403e731f6cb25c28d5edf702d6f7780dc4970c066a81d2ac6d0d218cf8666f216a3e99b6cdb63eeff3333a1ac417b37f6457171fd1a63c22241 SHA512 d0167cffcc744865c55109bdbe6c13ed96c4ab40e8dc4970220345727cefcd7885c2c2599f2baa6465f59d86fc1f7644affe32be5a9d1368b9812617de1c588e
 MISC metadata.xml 330 BLAKE2B 1f25c787f9b43ef0ef62206ca9ab67dfab8b95b2786fc84248541159507290229b291b9f83541adc196b58a9dcad7c0f3abd18c5c899a98978dc72403386896d SHA512 12f4638550e157da50134bf6c7cb480bd49661b9655900efdbb12a023c4bd4cd13018d7caa672096329691cf8556f89c9d13d6710463048329c8e3bd5f04f6ee
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild
index 06092b0c39a0..06acae2df4d6 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index 972b77ae249b..79eda2188904 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,5 +1,6 @@
 DIST lzip-1.22.tar.gz 120769 BLAKE2B d6d4faaff981d64219e27364c7072f9e1309507220e80d4195d866c3429db537a9fa9b7a4ac67ef5c267cad0f6e43ce997a98f1e47a88b228bd1aa437c991140 SHA512 318de74effdbdfa79070d28919459a85bf1efe662b818b8af2a3daa964b6c24e3386c37de360c6d5b8b624d549b5c9ed777c6234561129c477e03d92ac2db206
 DIST lzip-1.23.tar.gz 121817 BLAKE2B 934a35e31b0db76c4dcbe2fe903f04b60471485118aa5d4001599a3c23a7db74f05f703cf430bb299795be7025f71efb225afddff85c8245e962bdadcf82aef7 SHA512 482804205b6e92fdf9cb17fb9482df7987227c7b1bef9e42d78787acfabe73995f5b1a66f847d2176423f22dce56f1122c5b1c9670f0b778c0bdad2852369c85
+DIST lzip-1.23.tar.gz.sig 72 BLAKE2B 2441968deb279c25724d854cf13c2601c8a62619e9350dc063051b8c7d86a978ef39e91d7ba680152080ab537976677d3ea2fbb2071ce8a95b8f12dc65777cf3 SHA512 e49542558c8424036b5aaab348b3baa133b9b2d0ec5f8fc19557b83acb2cdbab3909d8eb51a9dd111750ae1dd81bafc2a1a4c4be4a46e8f149386c42f4ec79ce
 EBUILD lzip-1.22.ebuild 764 BLAKE2B 4f27d76030045b7e78f3a85a7ac04d7b261680c9356c236b6c07db1e8b38c92d094259891435967f823729a152be78d34f330444515b4808d1e355ae6b8a817e SHA512 2ac60aae9a0642bfe51ec653749e20d348f44ed28f87ec67dffddd90312f4c685d0738e28c9e4f92b3610b1ea4ada86d18cafa5e4d99cee5c53666a6c322b700
-EBUILD lzip-1.23.ebuild 765 BLAKE2B d9e25ba83f9888937bcf0ee9bf4fc0f0e30a5a02a1a8e84a119288e642be33a88c0169e53cc25329fda92937a7620b4678f81c77f12218221bb5591ea16fa05c SHA512 3a823edf87314a3917ec56436ce3a7a569b6d5784b2e9115f3629776699559e77bb58767c269fccf6105d48bd17fd1329fc27e9e87a67c8eb9b3cba49203d813
+EBUILD lzip-1.23.ebuild 1019 BLAKE2B b31188c8add9c25c21b1601c1838c1e17cc645880ff290a0ab953c67f46f8913937633646e1c84b9347e3cac975d1f94979266d0719742591db0ffabd53d9d6f SHA512 084bb4413845c2187567f15a1cfadc902a78f4389604bb128c3c39de2837f556dc433376b093ac80e001777746aacc9ac88aae2ea90712f47c05b8675355e9a8
 MISC metadata.xml 358 BLAKE2B c0e0c2c610a33aa6f8bff1325deb8c583fbde09ceaef09f4ddc1f343feaf3cc81a0e59ff2e4f3cd81bf6e3294e18026fa4ae6870eef8d213ff44c73edbb7df0a SHA512 faa29e9bc8f49b51279e643a7d9f0dc4b5463b434f9874901625af9f13c4460c19888913ee9d4105ee9eda4257526af50383fbe936d5834b2713eb027e75773f
diff --git a/app-arch/lzip/lzip-1.23.ebuild b/app-arch/lzip/lzip-1.23.ebuild
index a22b3f93eba6..41e30ddf86d8 100644
--- a/app-arch/lzip/lzip-1.23.ebuild
+++ b/app-arch/lzip/lzip-1.23.ebuild
@@ -1,18 +1,22 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit toolchain-funcs verify-sig
 
-DESCRIPTION="lossless data compressor based on the LZMA algorithm"
+DESCRIPTION="Lossless data compressor based on the LZMA algorithm"
 HOMEPAGE="https://www.nongnu.org/lzip/lzip.html"
 SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz.sig )"
 S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
 
 src_configure() {
 	# not autotools-based
diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index b536da3004d0..20d36486bd0e 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,3 +1,4 @@
 DIST lziprecover-1.23.tar.gz 156147 BLAKE2B 71a210c7143ff6f0f8b9cce7d5a1b6f681f8331fb971fa2836dfd04ad50e732ab595a415a9b8a3020c70c884c7e7fce5c605e63e0f28ea94f2de9d5447199a83 SHA512 9f2d40311f901c2c00fa6b106a2363dfcd7b6c73ae86282733d7c3451237ee30f6d5cce035ab5ba63300eea637eeb3ac5db7e7571bdef1bef259b801b10f1c7a
-EBUILD lziprecover-1.23.ebuild 635 BLAKE2B 7d23df5f1b6dfb4ca4b4ea10c18b9775ab448d507c552414db4ab41b616f13a0e452228f775d78b75e7a9884d9909c869dc10798bcd432e9e79023b66f1b32cc SHA512 17b3228a79cf1fdab558d80b90d4cdb917f8970b66d5fce0f36cfaf7de519e1f6f4e3e6fbbf60ce3d12ad532c1bbb528f88513e8b2242fec30659d16d6d72375
+DIST lziprecover-1.23.tar.gz.sig 72 BLAKE2B fcddac3243d69a77847393d69b7447faac36850e74cfa97336e30e581b840badcce66d1e7900a2d2c6bf9f5c3fcd1e04470087e1c5aaf885f198021c8b64323d SHA512 2a54258cad2b043375f1fad6f2a7bb736276ffc7e4ec3b7ac73b33f3a5ec74a419e2ed7493d3266c4a17437d7d6591d21ac319ed5c5c5565e8bc149d8d424a44
+EBUILD lziprecover-1.23.ebuild 895 BLAKE2B 7401a8ae06ebce711c8159f39242c85cafb081c1865f04de37faa9c099726cd11a0ce01e45de64f6c007e504f6f37450df4d3b9e6d5caa8fa48c94dcd055269a SHA512 7d942339df193cd813f54aca1a80c60d211351b08b0dea1291cbd276f0e0a354c1db7446c5b87aaf8e632400305c506bc03f2cbb8afa2b6a196586b74704747c
 MISC metadata.xml 2675 BLAKE2B 020978406d49afb6ed8c215bee2ec7c999996451c2f44934f2cf6473647b65acc1f27e80121254538e14aa5f3857f0f6f2a1bc4c8f9eefde6497a55de2634130 SHA512 be5882a57215b566929f2536cf88eaa854e8c7a7ca6e043acb7043d10c607235244183e493da0243d89981f5c4b01b23d619daec5e468a6b0b1c8091a92bfaba
diff --git a/app-arch/lziprecover/lziprecover-1.23.ebuild b/app-arch/lziprecover/lziprecover-1.23.ebuild
index 00ca46b8b0ec..c5a00e27d82e 100644
--- a/app-arch/lziprecover/lziprecover-1.23.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.23.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files"
 HOMEPAGE="https://www.nongnu.org/lzip/lziprecover.html"
 SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
 S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
 src_configure() {
 	# not autotools-based
 	./configure \
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index bb3caa16c0a8..cf9c46200fd2 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -1,7 +1,6 @@
-DIST lzlib-1.11.tar.gz 105873 BLAKE2B 6caadc4c3b78db835bcf4f11e5290342f0f952943006589345898a85211b0a0ae5d775d0a8e7747c549eae00dd0abd2e2afb5c07eb75b4fda712a9361a71bd59 SHA512 5aa3ff084177efe906518724a98a78c32d1c0e02b967800a44388fc6af441de48fcc5899457913fca11fae3beb8bebc260ac447f0a336b1c14f3f13726114567
 DIST lzlib-1.12.tar.gz 128996 BLAKE2B 3a86005eaf660a45888ec5af97bc6100368da2a3003c119c2379e881cd77ef318707342b7c930efa9473b671b8c2aff5c5e00dd5b312f647b7cafc39f29a2eea SHA512 b5379422eed4016b0ee124e39902dd22c314ca5cc5f72c1af5ec2ef6a68e1e85c523ab18e30048d453689f73f780d0144dcabaf881337e1c8101e2fe17ee21f8
 DIST lzlib-1.13.tar.gz 130005 BLAKE2B 88721890f111c2bb1901329e9cc39e7f581c220bb58bbc93098c34984b7557a80adff236f5755057099870ba20201f6b692925080b97965b4612d221d21cb33c SHA512 b9c4e5a9aca982984b497d1da2e1f0439b37b19acaf88a02f5af114b0a65a828c5ae235b3bd4f419ce001963de38a4d03445a6a1bd93f37e783e799abd75578d
-EBUILD lzlib-1.11.ebuild 738 BLAKE2B b4e6ac28601ad5482bf1f3aaca8c0a5e630fe58c60a87e5d42cc0f4184ee087a0a6a9e7d1770149f269a386bff30eb1a9e0551e6bcb115a8e13440a62623bcd1 SHA512 526c7731295813f44c96a9388cb57a59201a39743085b8090cfb07b705b3d255ed8e2de4f95d38cddcd7a34e10777fe547b276143679a4ae99176c04918ea040
+DIST lzlib-1.13.tar.gz.sig 72 BLAKE2B 66d7a9939a5e23874a6927545f265cf315d634a166d7f22cbe4f09ab88dbae778aa9c6f77e6d5e51fbaadc9a503f735fb2bc834475089a6046782f9af22b472f SHA512 1db7a91b3a84d70874c0ec92b2764ab6805e20a351438b975f4e72dd6a1dbe5a4448d47af2bb6d056bde9c6102df375454724d536efbdaa90cd7dbf08eb01c81
 EBUILD lzlib-1.12.ebuild 754 BLAKE2B b389d9898fd1f795228c0204607c8c7693e0a320fa1955201e9b5fa288ebaeb977770ffd7e76341df75f656f261ce1a2c57fbbbe58060e2de204e78707ee6186 SHA512 ec8f0a8fa0944d99dc3f38191ae95f841b1d97891b1040c00ddcf89ea2e4dec235fae7d8f39604b9630b4f5c62acef79d5730b0975064830a954f893090a4725
-EBUILD lzlib-1.13.ebuild 754 BLAKE2B 19becf8d7ab821a0370eb81309f7dd9217cf3acc6d03d44b3af00bd1d3011c38722074f0c1641490682bd529a8d2557ca4f23a1d03b46b3ca95dc8ff749ffe8a SHA512 e9287501129f31f729eb6354c852ef84328e0a243062fbb1d502d56f813fd31b7fc40dd7f0de643550e6b0803c15fe5c026a896021d53634b3f2bfe1bb66df73
+EBUILD lzlib-1.13.ebuild 1006 BLAKE2B 474b19430406d67d67893d4aedf6120f40582be406587d2dc3bbed0ccdde0e748af02441638a87448a1742cb8ab618dde3d42714c068db8b4fcf1bd8fce1ef0d SHA512 d894cf035085c01ca8ebf746dc92be6704c82e0f8f1b2f0b2cba865f29f566ed6f805f973260b0a77e517810f84c82cc2f601153aed926dd3d275ffc93ef0d73
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/lzlib/lzlib-1.11.ebuild b/app-arch/lzlib/lzlib-1.11.ebuild
deleted file mode 100644
index 1b4da858973b..000000000000
--- a/app-arch/lzlib/lzlib-1.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Library for lzip compression"
-HOMEPAGE="https://www.nongnu.org/lzip/lzlib.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
-
-LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-		--disable-ldconfig
-		--prefix="${EPREFIX}"/usr
-		--libdir='$(prefix)'/$(get_libdir)
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		CPPFLAGS="${CPPFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-	)
-
-	# not autotools-based
-	./configure "${myconf[@]}" || die
-}
diff --git a/app-arch/lzlib/lzlib-1.13.ebuild b/app-arch/lzlib/lzlib-1.13.ebuild
index 070ed59f4850..361f4e8a03b5 100644
--- a/app-arch/lzlib/lzlib-1.13.ebuild
+++ b/app-arch/lzlib/lzlib-1.13.ebuild
@@ -3,16 +3,19 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="Library for lzip compression"
 HOMEPAGE="https://www.nongnu.org/lzip/lzlib.html"
 SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
 
 LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
 
 src_configure() {
 	local myconf=(
diff --git a/app-arch/pdlzip/Manifest b/app-arch/pdlzip/Manifest
index 4419201087bf..68a9790e8c25 100644
--- a/app-arch/pdlzip/Manifest
+++ b/app-arch/pdlzip/Manifest
@@ -1,5 +1,6 @@
 DIST pdlzip-1.11.tar.gz 73641 BLAKE2B 32b59f7ce1eb70916cba96444234fa95c4c798b00f32f54c0ec51e6c6558c7b01ee118f82c011a6d642a58b11b5f270bffe21df8d9b62478b809a84abe51164a SHA512 8fc3639ab1367026d9b5185d2f9db321b1eccfb2f2f3eebc22a41b10b2a824e598dd81d9d701923a7f55943501189b11f4ec00b0187dbadd56b06e329b750075
 DIST pdlzip-1.12.tar.gz 74125 BLAKE2B 41ae5878d75c0bcfad5b71194b58950d91281a5a20e67b9081b9ef6f852bf9467bd512c72a1af873b15bf84360273091d05ab6283ba0f3a725bd5fc17746f821 SHA512 0472c725db187c984f8874d039c53bd961a8d510ee03ea0b6b9e19ee2d8e7addadd06fc7715a58adfe8335c90ea697640c751cdfaf0007e40c94408a0bf8ed72
+DIST pdlzip-1.12.tar.gz.sig 72 BLAKE2B c7f95cc45493402e862068e78921729c39436729599fe41dabcedabbf7ebade0ac140b73e208cc3d4f776622668c339f23b06b8b55547c0b9c55ccaff154842d SHA512 45ebc9438705a242fb1948e74b5e27f1ef336b67549a8e279c015c1e01107fd565e68c11426467f60a17e0ee65362a59e765ec118a80b875865fd429bbd80b80
 EBUILD pdlzip-1.11.ebuild 607 BLAKE2B 108c3dd3a4264cfa587d38dcf1164027028fc45208d5661497fe471c6b8a525558bee42b3bad55f28fc2678f4f697a967a581572a99e05a007e526b88b86b2ba SHA512 734c164ef31a9fd9d311da5383e3f88f53fa169dc6c1a557be02f927841b91439016a9b8656b6c421a7e14f6529a7d28ef40dcf01b10a221e2964a64572c0ec0
-EBUILD pdlzip-1.12.ebuild 599 BLAKE2B 0d7441ab2fe0675ddff2cf864657fc8c7a8a96f276ea9d13cc6f884490378f3acdf735e92bbd8126bcca4218a9ff4b957d6d1f885dd375952c8142ca5a289432 SHA512 a0720a39f90dd8b88da93edd81e8f52f9a9d23155ec166e7d99d6b31c32e890a1e7e208217a22869bafb6c8146a6f581bb0278d994f6a73fd69b2f9c455cb950
+EBUILD pdlzip-1.12.ebuild 859 BLAKE2B a28b8bf5c913dc0efdbfe9b8179aad2ae89f469f35286d6dfca2b6850b7ca35f87d6b04e0d7369e552cfa0333216a8020a0382cb96134fcb353d5cf252c28f9e SHA512 753c4a67b2f0dd0bfbf671d78383ec9e98e434f703e2f9f22d8634a371312c791aa626111cba0df34e62e5f25068052fc71ad1ac671fc1de4cbfc8f38bb1cdf8
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/pdlzip/pdlzip-1.12.ebuild b/app-arch/pdlzip/pdlzip-1.12.ebuild
index 0084a4a55283..764dcede6f8a 100644
--- a/app-arch/pdlzip/pdlzip-1.12.ebuild
+++ b/app-arch/pdlzip/pdlzip-1.12.ebuild
@@ -3,16 +3,20 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="Public-domain version of lzip compressor"
 HOMEPAGE="https://www.nongnu.org/lzip/pdlzip.html"
 SRC_URI="https://download.savannah.gnu.org/releases/lzip/pdlzip/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
+
 src_configure() {
 	local myconf=(
 		--prefix="${EPREFIX}"/usr
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
index b499b4397127..d58fe7dc116e 100644
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@@ -1,7 +1,6 @@
 DIST plzip-1.10.tar.gz 94541 BLAKE2B deb49345ba3d6b120086aa8646f5684a32e6b64453f2ffc6321011dfd0741ddacca919bb11cba9435a26ea6aa63f453e7c5ff9a7dc7dc38c8ed0c6841237aeef SHA512 7fd7ec288800950deaec9337b3112db72cde059721a0143a091650fc20ba2a3d9d7eebbd7a312e5bbb1a61ca6c902d2450e6c3c7172dccf9c0c8b86db7c2a944
-DIST plzip-1.8.tar.gz 72365 BLAKE2B 66b8881b6c70932c66e40edab22235103d671a870c980c0b0b08754e94fbc1b2d0f2eeb26deac4f27fbc89d69c3b588bd51cb973b7b59cbb2d0f6ab4cc9a115d SHA512 e8e822f8ae77e06178538b62075fa1c5d9cbc76c78bee7ad595a4637cd4077f53fd9e3fe61ca3fbddaa8b950e739d97527dc8fbecae04de1ac3ef83d0d5f13b4
+DIST plzip-1.10.tar.gz.sig 72 BLAKE2B d3d40c1f3618750b375f862ece19badbbe762ea3b704ed346b8779d86b0fd1a881f48910222664a121360c2e7da42b31ab950ecfb01724ab91a60bac2694d705 SHA512 c4be15ee893cce47150f4da5bdb84d6e20ed9c84367508911de2673614e0df182a9e82d1e0be8967ec1e180f1e9be38be976b099fb5428c4df1567cb9bf54ecc
 DIST plzip-1.9.tar.gz 93312 BLAKE2B a5b9a81cfffa17eca9a4cf4d6b037ad943235022142bd053ec8bcfc4dd99b2b730d69332fa54187ba7704266666efde52d23e13f91c290b9cddb96a87023173e SHA512 3bca603ba6337462bde3967e7c7a7e66287f3a71adf8db987429fcdcb06ebbb90b52e666a7f98ac699bc158cbda21a9cce02490131d33fc44171b84ebb3a4a19
-EBUILD plzip-1.10.ebuild 642 BLAKE2B d3fbdbf49e6359902ff0361e739ab2c31378b1308e5cf58357c45b7dd365d12d733e5ebe73c0b9b20cc442bcbaf5f1f7ff78192cd60bc6530ffc12ee8c0cf241 SHA512 0c04dc8ea3ce456d443fe260ddfbcfb0da3f3e78e80525587b32e314d959d75c4367d21679c55a5730a9bc2e8e0cea88fb4c0d48835a86752b21be85731648f2
-EBUILD plzip-1.8.ebuild 642 BLAKE2B fc0d1ed84f7f24e47b375a351e2ded97c84ea0e8937cca87571916e9a4ae38f3bff266e1504c61a203f7f87dc19aab00ef336d52d41c118b3a768125a0d95c8b SHA512 9445cfcd39d0a71e00aefb5d84fc1695609150011edf335f78568b90f152ddd8982e5b449132f5c3cb5527d29d60566b9387dbaa635e8a6f26524159d28cca04
+EBUILD plzip-1.10.ebuild 891 BLAKE2B 2814cd7809a1e5bebe898c4a6fe166536f0ef424a04e5335dc37dce2c07995ae49fc21c36665dab96e1e07413ddf2093f18f71652a87689ac0b1ed3d3f58e388 SHA512 415a36af49a098dd6e01e08163e037fd064d2a45d08c9c68c35181b863311643d511874c786d45b17af365e1e67b03e1d62b77e2bab0ed7f45b5b9700b62289a
 EBUILD plzip-1.9.ebuild 642 BLAKE2B 6027697197ff5732ff2be7fa61187d1f7261f878ea94df0438d1a09f2e16c7e970a1e6a66d520246132289b73245807706cd57cf38bd1c191be19e8c788ae9eb SHA512 ca0bbf2fe5ea6ddaa3a5cf1a9c8f53e950076b42efe743db016a5435cd11b5c9dace5308e8ed181c527c43ac24378bb972574de982c478d519a2fc0295ba354d
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/plzip/plzip-1.10.ebuild b/app-arch/plzip/plzip-1.10.ebuild
index e28408c9f42f..de5e91174f43 100644
--- a/app-arch/plzip/plzip-1.10.ebuild
+++ b/app-arch/plzip/plzip-1.10.ebuild
@@ -3,19 +3,21 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="Parallel lzip compressor"
 HOMEPAGE="https://www.nongnu.org/lzip/plzip.html"
 SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND="app-arch/lzlib:0="
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
 
 src_configure() {
 	local myconf=(
diff --git a/app-arch/plzip/plzip-1.8.ebuild b/app-arch/plzip/plzip-1.8.ebuild
deleted file mode 100644
index 87f3445f1964..000000000000
--- a/app-arch/plzip/plzip-1.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Parallel lzip compressor"
-HOMEPAGE="https://www.nongnu.org/lzip/plzip.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/lzlib:0="
-DEPEND=${RDEPEND}
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}"/usr
-		CXX="$(tc-getCXX)"
-		CPPFLAGS="${CPPFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-	)
-
-	# not autotools-based
-	./configure "${myconf[@]}" || die
-}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 1cd757885c6d..d3005794afb1 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,9 +1,5 @@
-AUX rpm-4.16.0-autotools.patch 439 BLAKE2B 173435c31b0e06f47948711da00452d08dd644fcd8ed05e61f7ed31db56a670bacdb4ca1504dd64818752e30868541e3c50f8ab84833101607cf8c487cc93bba SHA512 fce8b036dfc55e5602721206788a1a755e2df8ef6b1cc94f047f7180f97efa750957ffa063cc18c274fff8b20f41181aa1c46c11ad2feed9689d50f4f696afea
-AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7edae47f8b9597a57f1b7e3b4848129dc50f1b001f5e8ae92f5f1c07cbe51330ccd8c15867e7624ea07756317eaca6 SHA512 8fd4c0ee785fb583172df7b7543ba790927a9d4953a0368bc4a641fe6e34b35011e3d3cbecaf80c58e79239e68bdab6797c8592f0c5185197df726a51e06d224
 AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
-DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
-EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
 EBUILD rpm-4.17.0-r2.ebuild 3993 BLAKE2B 5679659f233757cfe4a346402dd5c0b5cb691ca3bdd2898f937ba50396d1980ba08cb8347bd866d579f2ae220fb0351aff0972830b6f15c16e3bfc3f8b92cf23 SHA512 3b6620c0cc78145ba2433571339bf997a9ed9ead43879e697d40979f670b72ccbdd09921130f67c080353979f1d5b50de29ed2668d16463ca5b14ef383a8376e
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/files/rpm-4.16.0-autotools.patch b/app-arch/rpm/files/rpm-4.16.0-autotools.patch
deleted file mode 100644
index 9b1f71ad86e5..000000000000
--- a/app-arch/rpm/files/rpm-4.16.0-autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
---- rpm-4.16.0.ORIG/configure.ac	2020-10-01 11:02:21.605485875 +0100
-+++ rpm-4.16.0/configure.ac	2020-10-01 11:05:34.077157904 +0100
-@@ -552,9 +552,6 @@
- 
- AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"])
- AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"])
--if test "x$have_bdb" = "xinternal"; then
--    AC_CONFIG_SUBDIRS(db3)
--fi
- 
- 
- #=================
diff --git a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
deleted file mode 100644
index a2c95ff064e2..000000000000
--- a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac
---- rpm-4.16.1.3.ORIG/configure.ac	2021-04-13 19:32:35.630955569 +0100
-+++ rpm-4.16.1.3/configure.ac	2021-04-13 19:32:54.939623251 +0100
-@@ -957,13 +957,7 @@
- AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
- AC_SUBST(RUNDIR)
- 
--if test X"$prefix" = XNONE ; then
--    usrprefix="$ac_default_prefix"
--else
--    usrprefix=$prefix
--fi
--
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
- AC_SUBST(RPMCONFIGDIR)
- 
- AC_SUBST(OBJDUMP)
-diff -uNr rpm-4.16.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am
---- rpm-4.16.1.3.ORIG/rpm.am	2021-04-13 19:32:35.584956361 +0100
-+++ rpm-4.16.1.3/rpm.am	2021-04-13 19:32:54.940623234 +0100
-@@ -1,10 +1,8 @@
- # Internal binaries
--## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
--rpmlibexecdir = $(prefix)/lib/rpm
-+rpmlibexecdir = $(pkglibexecdir)
- 
- # Host independent config files
--## HACK: it probably should be $(datadir)/rpm
--rpmconfigdir = $(prefix)/lib/rpm
-+rpmconfigdir = $(pkglibexecdir)
- 
- # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 10:3:1
diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
deleted file mode 100644
index 2603c2191f03..000000000000
--- a/app-arch/rpm/rpm-4.16.1.3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{2..4} )
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dbus? ( sys-apps/dbus )
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/libgcrypt
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( ${LUA_DEPS} )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	# Added USE=openmp and this check for bug #779769
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-4.16.0-autotools.patch
-	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	eapply "${FILESDIR}"/${P}-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	eapply_user
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	econf \
-		--without-selinux \
-		--with-crypto=libgcrypt \
-		$(use_enable python) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable dbus inhibit-plugin) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		for docname in librpm; do
-			docinto "html/${docname}"
-			dodoc -r "doc/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-
-	use python && python_optimize
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500):
-	if has usersandbox $FEATURES ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
-	fi
-}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 28b75ed2fd82..b41013b2473a 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,4 +1,5 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
-EBUILD tar-1.34.ebuild 1708 BLAKE2B f5a5ae241ba9ea23652e1195160ffde4e0284c40f92fb81e4c1e2404636d18a27f0eccdfee5f6133c989ed73acda0bfeeb303dad9e370d1cb4c8d7e4511b8382 SHA512 bc959e3d244c54b013a6a09e94c79dc00e477dd5deaaf275554810039ddbae80a6b069e4fab276281224b7a695c9a602a5de03a6f551ca83c2171c6947057293
+DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
+EBUILD tar-1.34.ebuild 1963 BLAKE2B a541b7e500bdd50000ba786cec1232a865bf6d4673d7680c8823ea605782eaf13013445f9f41509eeb3dd0fde27b324f086d0bb09a370cd304425f4e0af8af6b SHA512 b2a9abff0d40492eb87cb819cac312234905a5d073b902c1771db15b05bb00e3b7408200db839fa9912f3a9d7e19b9bb9c3f6d662dd71c5e04afb0d179d42dac
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
index b92c607064a9..40fdc747ffb7 100644
--- a/app-arch/tar/tar-1.34.ebuild
+++ b/app-arch/tar/tar-1.34.ebuild
@@ -3,15 +3,23 @@
 
 EAPI=7
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
+inherit verify-sig
+
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="https://www.gnu.org/software/tar/"
 SRC_URI="mirror://gnu/tar/${P}.tar.xz
 	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
+SRC_URI+=" verify-sig? (
+		mirror://gnu/tar/${P}.tar.xz.sig
+		https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
+	)"
 
 LICENSE="GPL-3+"
 SLOT="0"
-[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
 IUSE="acl minimal nls selinux xattr"
 
 RDEPEND="
@@ -23,6 +31,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-tar )
 "
 
 src_configure() {
@@ -35,6 +44,7 @@ src_configure() {
 		$(use_with selinux)
 		$(use_with xattr xattrs)
 	)
+
 	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
 }
 
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index f158fe61146e..e53e8c5ea3cf 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,7 @@
+AUX xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch 3383 BLAKE2B c244f412f6d2bea84c5ef41b9f08d0f7be73cb9af1097e58169c9d9061b8eeff274903fbbc4b4639d06344bf9691f0d289671c4d07a4c5073efe9bc536e31a5a SHA512 97ba1bbe9fec7602d77e53961b94691d6551813ed9de5b6fde71f3724205848d2865c6085ace75b7df963d43b99c55c539547f028dd8d86da911aaa2b6a433cd
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-EBUILD xz-utils-5.2.5-r1.ebuild 2660 BLAKE2B 5fc3dd2d38beccbc29717e9c1d3b142e5182088863ad72518ecf721b0313b5b6a7344c32351c5042fd0d1a3a8699521f6baff98be277c0bb8c5fd748ead28090 SHA512 9411d78194f2964bf7d299645a1e0d43a377bb5dcb5e61d316fb45e71234ddfbb835a3bd351f50e19b34b303a84411cd94eb3e8d5bf9526e1be019c337fbf03d
-EBUILD xz-utils-9999.ebuild 2668 BLAKE2B f9ede09dc4650c384799272ea7666e67ad4585c72695f75ab6006dcb4976e10517539f07c5fac12bded5da360dc52154515eb3c647a93a52daedee686245066e SHA512 7d004c0c34b3d9ea7b1ec7f68c367a55015ff6f7de9cc4b10a3cec7b79f835962928b1a137a8e74e0fd52d14f79e088df66288603c52c4ba3f8d88a5e3c128be
+DIST xz-5.2.5.tar.gz.sig 566 BLAKE2B 8b40d8d7913eaebe2595ea41a735d972d1969d8b58f42b2bee6591b51e2e626473fc85d64f1bbbff3cba6b0e1b4423556d6ddaf16f646ccc18ba1bad5cf45d83 SHA512 3aa21484bef0282ed0b83e3fcd5cf3d87bf51fa68e24d55bb11f91bc96f0ac29f468949bc4c8cc20fbd6ad12f5735686fe09ee42efe2b8d728010da9668aa5a9
+EBUILD xz-utils-5.2.5-r1.ebuild 2913 BLAKE2B 077e7ad7023d3aa9e10dcea19501ee8b98fab6a0546bf4d0f36f70fb619d966ae5a5c4c434b5fe7f423d85830d0304a28886315ff6c2281a4a20ff70a8e6b104 SHA512 b38722baf5c93b5a0969b6c7a8aded1593569a435aaf424670328dace1b63116a78c5377a5286e3e17123f5aff55b02eb6d38150ae77f1faf5c1985ee3797890
+EBUILD xz-utils-5.2.5-r2.ebuild 2973 BLAKE2B ec6a2e8aae9b9ae9f5d3575f7b84e1916eb87a2853fb1f72155408cc2645bd1ff16cf9c8548eba588f9a87afd7b4c57fe72cbce6a4f00827540c32610359bd68 SHA512 d1b11fda1b657996c2b770c6fb733f3ba4b64bc75227155e4171f9505d72652e6fb814d78b1718629a3d0c37bdd596007befa5dce5f62f82f397806def79fcab
+EBUILD xz-utils-9999.ebuild 2956 BLAKE2B 4f4253e58bde435729d911dfd7b1460f33eaf638e33562852bd69f5dc5db3c6aa04e7ffa5c3890010917300be6f95f3cd0c2f212a1d4031b1daf9776233da83c SHA512 de44465c0cfca619887dc2f4284fc235d22ef82a7034f7fc116b2e050e595314ce3f47bea32f3ba013752e6605891d3c782fcf01a31a02f35c315b46b5c46a2b
 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
diff --git a/app-arch/xz-utils/files/xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch b/app-arch/xz-utils/files/xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch
new file mode 100644
index 000000000000..7293a982c269
--- /dev/null
+++ b/app-arch/xz-utils/files/xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch
@@ -0,0 +1,88 @@
+https://bugs.gentoo.org/837155
+https://git.tukaani.org/?p=xz.git;a=commitdiff;h=69d1b3fc29677af8ade8dc15dba83f0589cb63d6;hp=bd93b776c1bd15e90661033c918cdeb354dbcc38
+
+From: Lasse Collin <lasse.collin@tukaani.org>
+Date: Tue, 29 Mar 2022 19:19:12 +0300
+Subject: [PATCH 1/1] xzgrep: Fix escaping of malicious filenames
+ (ZDI-CAN-16587).
+
+Malicious filenames can make xzgrep to write to arbitrary files
+or (with a GNU sed extension) lead to arbitrary code execution.
+
+xzgrep from XZ Utils versions up to and including 5.2.5 are
+affected. 5.3.1alpha and 5.3.2alpha are affected as well.
+This patch works for all of them.
+
+This bug was inherited from gzip's zgrep. gzip 1.12 includes
+a fix for zgrep.
+
+The issue with the old sed script is that with multiple newlines,
+the N-command will read the second line of input, then the
+s-commands will be skipped because it's not the end of the
+file yet, then a new sed cycle starts and the pattern space
+is printed and emptied. So only the last line or two get escaped.
+
+One way to fix this would be to read all lines into the pattern
+space first. However, the included fix is even simpler: All lines
+except the last line get a backslash appended at the end. To ensure
+that shell command substitution doesn't eat a possible trailing
+newline, a colon is appended to the filename before escaping.
+The colon is later used to separate the filename from the grep
+output so it is fine to add it here instead of a few lines later.
+
+The old code also wasn't POSIX compliant as it used \n in the
+replacement section of the s-command. Using \<newline> is the
+POSIX compatible method.
+
+LC_ALL=C was added to the two critical sed commands. POSIX sed
+manual recommends it when using sed to manipulate pathnames
+because in other locales invalid multibyte sequences might
+cause issues with some sed implementations. In case of GNU sed,
+these particular sed scripts wouldn't have such problems but some
+other scripts could have, see:
+
+    info '(sed)Locale Considerations'
+
+This vulnerability was discovered by:
+cleemy desu wayo working with Trend Micro Zero Day Initiative
+
+Thanks to Jim Meyering and Paul Eggert discussing the different
+ways to fix this and for coordinating the patch release schedule
+with gzip.
+--- a/src/scripts/xzgrep.in
++++ b/src/scripts/xzgrep.in
+@@ -180,22 +180,26 @@ for i; do
+          { test $# -eq 1 || test $no_filename -eq 1; }; then
+       eval "$grep"
+     else
++      # Append a colon so that the last character will never be a newline
++      # which would otherwise get lost in shell command substitution.
++      i="$i:"
++
++      # Escape & \ | and newlines only if such characters are present
++      # (speed optimization).
+       case $i in
+       (*'
+ '* | *'&'* | *'\'* | *'|'*)
+-        i=$(printf '%s\n' "$i" |
+-            sed '
+-              $!N
+-              $s/[&\|]/\\&/g
+-              $s/\n/\\n/g
+-            ');;
++        i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');;
+       esac
+-      sed_script="s|^|$i:|"
++
++      # $i already ends with a colon so don't add it here.
++      sed_script="s|^|$i|"
+ 
+       # Fail if grep or sed fails.
+       r=$(
+         exec 4>&1
+-        (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
++        (eval "$grep" 4>&-; echo $? >&4) 3>&- |
++            LC_ALL=C sed "$sed_script" >&3 4>&-
+       ) || r=2
+       exit $r
+     fi >&3 5>&-
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
index 7a24ca8fbd0d..bfc58200630a 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
@@ -8,20 +8,27 @@ EAPI=7
 
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-r3 autotools
-	SRC_URI=""
-	BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="utils for managing LZMA compressed files"
+DESCRIPTION="Utils for managing LZMA compressed files"
 HOMEPAGE="https://tukaani.org/xz/"
 
 # See top-level COPYING file as it outlines the various pieces and their licenses.
@@ -33,17 +40,20 @@ RDEPEND="!<app-arch/lzma-4.63
 	!<app-arch/p7zip-4.57
 	!<app-i18n/man-pages-de-2.16"
 DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
 
 # Tests currently do not account for smaller feature set
 RESTRICT="!extra-filters? ( test )"
 
 src_prepare() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
+
+	if [[ ${PV} == 9999 ]] ; then
 		eautopoint
 		eautoreconf
 	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
 	fi
 }
 
@@ -53,24 +63,32 @@ multilib_src_configure() {
 		$(use_enable nls)
 		$(use_enable static-libs static)
 	)
-	multilib_is_native_abi ||
-		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
-	if ! use extra-filters; then
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
 		myconf+=(
 			# LZMA1 + LZMA2 for standard .lzma & .xz files
 			--enable-encoders=lzma1,lzma2
 			--enable-decoders=lzma1,lzma2
+
 			# those are used by default, depending on preset
 			--enable-match-finders=hc3,hc4,bt4
+
 			# CRC64 is used by default, though some (old?) files use CRC32
 			--enable-checks=crc32,crc64
 		)
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		# undo Solaris-based defaults pointing to /usr/xpg5/bin
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
 		myconf+=( --disable-path-for-script )
-		export gl_cv_posix_shell=${EPREFIX}/bin/sh
 	fi
 
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
@@ -78,6 +96,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	default
+
 	gen_usr_ldscript -a lzma
 }
 
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
new file mode 100644
index 000000000000..b4c00cf4b51d
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="+extra-filters nls static-libs"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!<app-arch/p7zip-4.57
+	!<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-xzgrep-ZDI-CAN-16587.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 0b2c2d879fb8..0397c369c1bb 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -8,20 +8,27 @@ EAPI=7
 
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-r3 autotools
-	SRC_URI=""
-	BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="utils for managing LZMA compressed files"
+DESCRIPTION="Utils for managing LZMA compressed files"
 HOMEPAGE="https://tukaani.org/xz/"
 
 # See top-level COPYING file as it outlines the various pieces and their licenses.
@@ -34,16 +41,22 @@ RDEPEND="!<app-arch/lzma-4.63
 	!<app-i18n/man-pages-de-2.16"
 DEPEND="${RDEPEND}"
 
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+fi
+
 # Tests currently do not account for smaller feature set
 RESTRICT="!extra-filters? ( test )"
 
 src_prepare() {
 	default
-	if [[ ${PV} == "9999" ]] ; then
+
+	if [[ ${PV} == 9999 ]] ; then
 		eautopoint
 		eautoreconf
 	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
 	fi
 }
 
@@ -53,24 +66,32 @@ multilib_src_configure() {
 		$(use_enable nls)
 		$(use_enable static-libs static)
 	)
-	multilib_is_native_abi ||
-		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
-	if ! use extra-filters; then
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
 		myconf+=(
 			# LZMA1 + LZMA2 for standard .lzma & .xz files
 			--enable-encoders=lzma1,lzma2
 			--enable-decoders=lzma1,lzma2
+
 			# those are used by default, depending on preset
 			--enable-match-finders=hc3,hc4,bt4
+
 			# CRC64 is used by default, though some (old?) files use CRC32
 			--enable-checks=crc32,crc64
 		)
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		# undo Solaris-based defaults pointing to /usr/xpg5/bin
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
 		myconf+=( --disable-path-for-script )
-		export gl_cv_posix_shell=${EPREFIX}/bin/sh
 	fi
 
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
@@ -78,6 +99,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	default
+
 	gen_usr_ldscript -a lzma
 }