gentoo resync : 09.07.2022

38 files changed, 307 insertions, 296 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 20874f9f5029..668a171d4a21 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 70a16b368e10..7575f54a8cb7 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,4 +1,4 @@
 AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
-EBUILD alien-8.95-r1.ebuild 774 BLAKE2B 0a1eec09287a4342f563a651221d05e36627c5c939fb0be7adc9c7e1200b9846bfe06fb48dc20b440ca567fdd6bdbc3263acbdbbd6393c055dd4b1f03d4c29aa SHA512 94c28767d2ab22a70eaca9a33c427fbaa2c37d21735b8b18159b0ef55ad9f661cde327456bca856de8647940e8663a2dccd335af946bb11c46c7d13cea5bcf73
+EBUILD alien-8.95-r2.ebuild 637 BLAKE2B b453d9c09e96bebf790197d839d3c10b5b34d14042e7156086137399710a2ea3ee86f62cb1520e489e3f805271bede70976eaba64e2619aed88cfd216b24234f SHA512 aa316887c5f44e4fb12de1cc46dfe1a174ecdebca122e7aa3c5aee381c98b4e9b0925df4c4f255c901dd411bf47c09d4a868d380f0a71b0437ba31b6a93a2557
 MISC metadata.xml 377 BLAKE2B f1fe8bdabc2983493e25a54b9d414e1452ea6b433cea8eba2663c86edd35f4c1c97b48d997a271e6291610e6e69c24d0ac873839c3e672dd2df274d2d4cf9506 SHA512 244e58580d59f2d089190d950de8c803c2b883a0b88eb8e70ec1ab3dd30647f1b8a3853f5d0f93f86ba18a2ce5b50ef97164da55a24ee9a8e8826299c26a5897
diff --git a/app-arch/alien/alien-8.95-r1.ebuild b/app-arch/alien/alien-8.95-r2.ebuild
index fac253c4e118..90fee2c5c587 100644
--- a/app-arch/alien/alien-8.95-r1.ebuild
+++ b/app-arch/alien/alien-8.95-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-module
 
@@ -19,16 +19,7 @@ RDEPEND="
 	app-arch/dpkg
 	dev-util/debhelper
 	>=app-arch/tar-1.14.91
-	bzip2? (
-		app-arch/bzip2
-	)"
-
+	bzip2? ( app-arch/bzip2 )"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-tar-extensions.patch" )
-
-src_prepare() {
-	default
-	sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
-		-i "${S}"/Makefile.PL || die "sed failed"
-}
diff --git a/app-arch/atool/Manifest b/app-arch/atool/Manifest
index fb3d0d04c3dd..2896164c4cd3 100644
--- a/app-arch/atool/Manifest
+++ b/app-arch/atool/Manifest
@@ -1,4 +1,4 @@
 AUX atool-0.39.0-configure-bashism.patch 365 BLAKE2B 677ab0da286c462adf41b8b58d007dee8e3fe874a7ff34a652e1c16160186c9e633d77901d943f18edaec23ec92356c4b09eca41f0e0d7eb9f92055e580d3400 SHA512 f99d333339f605a3c6f0373984b107925b764ff6843d2b8b9c96e50bb3b368812acaf9a56d1f3db2dcdfff0b3ba2d9a9301312d3e4dd0a2dc3ffec3086b1b9e0
 DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
-EBUILD atool-0.39.0-r1.ebuild 555 BLAKE2B f51081d65c029402338ffff8e8dece46d8a654e8ff359a1beaf92bbaf4fbebc6fb80668ea5f41d2c1ad037d3edd2fcc7cb1cdcb65adc8e6726b7e8c9212b62f0 SHA512 b41c2d8aa299f1ebb45890845a7241450d68e32bb752805abed69b59f33cb5ce13bd3864db49650fd1681dee54fcf6f968a0a504133851461b0de0d16cd9655b
+EBUILD atool-0.39.0-r1.ebuild 562 BLAKE2B f0b74c192049c117224667c1731b33842c1218d51cd32d9a28ca9f777c5738fe2ddff2b149837307c291e46caa5fa35f7170856f99145813105a6e4692c1d480 SHA512 654849d6ec65eb78bd9962123a8f67675009379f1593f2d79cab7e373c533727edc724a3352d5aa28deeadd8e5ba7dce6fc2bee22f73f8b3f26b4f877dd429a0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-arch/atool/atool-0.39.0-r1.ebuild b/app-arch/atool/atool-0.39.0-r1.ebuild
index b5a2d655b278..b92adcd95033 100644
--- a/app-arch/atool/atool-0.39.0-r1.ebuild
+++ b/app-arch/atool/atool-0.39.0-r1.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
diff --git a/app-arch/bsdsfv/Manifest b/app-arch/bsdsfv/Manifest
index 8cd8ac75f260..fcec3005d76b 100644
--- a/app-arch/bsdsfv/Manifest
+++ b/app-arch/bsdsfv/Manifest
@@ -1,4 +1,4 @@
 AUX bsdsfv-1.18-64bit.patch 2388 BLAKE2B 377975f51f211c90cb9f7571c4b6e437cb75a536238aa703321efcc6ddd13e19b9649468eb8c5aaa23f5ad982148fe92bdb65fb8ef40023d7a4375133810d6c8 SHA512 5831956791b03972b1fdd3199687b10e7a55d562e815f94b863fb75a549eec14b85488bb0a9c9e5d2fb3241a95846f710dd5b19547ce33c425da756c685c18a5
 DIST bsdsfv-1.18.tar.gz 13301 BLAKE2B 663ae589e67455dbea968aeedaed74ed8f267fdb9790417da3d61aec9b3f50a5d87857c5e0f39a359d8b20ebd0bf706c5b775bf61c617669c479460ae8e2ff60 SHA512 f2742cfc5c56c915aff7534eb07025394c57bebf74d6505dc1d7e814e5ca098b474a718ae1c2aeb993cf95dd55fc792c56f9ac80344d112738da2f20157647e6
-EBUILD bsdsfv-1.18-r2.ebuild 567 BLAKE2B 9dac3ee9c9b59d617be9cd2484fa920d60745dffcc3151b4aca2d31f45b3170214450c2719344b3fbbb59097c080da1b16a3468498b2d5d22837608ce049995f SHA512 3175c050ca61719fd458aba66ac543357b617dbbfa938799eb63c12d81f500c41a690708c0316d7ccee7eb7d0a83c5b2ce4f3a9b9e43672e1496f9d8ae64b6da
+EBUILD bsdsfv-1.18-r3.ebuild 559 BLAKE2B 8be3cbb9de6ece7aa49081e23629fb671fb503bccbefbe1e20add1f5947695e5809d6cf67cbbce5ed243634d5eda342d6e6f9808b86c990d0dda8eec59e5e352 SHA512 a2789e3f4e8e455cd9b6c035a7106e082785c92d75becef9af695355a8cb945ffe363b7b959c963cbf83daeb1ec2fe9d8a09ea7bed06573f32a1b75afefe2aff
 MISC metadata.xml 247 BLAKE2B a7a241b690942d603b49d2cc4fc20eb28f6264bc00934c8e4df132a03b5dd79cab62fde7a682a3c9889fea8dbe919ed36d405e3c6a6cccbe323dcc9a270a1d16 SHA512 df60aa4971a8148f505716f545fd2aa66a44b7375223250e3986b56fc4cdb146bf4c992c288b24919e30a8a572237c481a45898fa9de201e15ba75779cd8a48c
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild
index 1882a32eea98..46fc7b2cee7b 100644
--- a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r3.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="all-in-one SFV checksum utility"
 HOMEPAGE="http://bsdsfv.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S=${WORKDIR}/${PN}
 
 PATCHES=( "${FILESDIR}"/${P}-64bit.patch )
 
 src_compile() {
-	emake STRIP=true CC="$(tc-getCC)"
+	emake STRIP=":" CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 7b088244873b..b6a2aa2929a4 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,3 @@
 DIST engrampa-1.24.2.tar.xz 1687432 BLAKE2B b2ef407aef77f9ecd3f8b06d2e991615a39fa2d4487678292d035a7cab882551bc8c757c6a15037b828cb51aaba14c2ec25e85e891770f6f8c9b453753d87b42 SHA512 1e0acecfe42e3945fe43729283522dfd56dc4cee92a4d5998c995a496f42f41b284ec10f01eb142139c1cec65e3b5a037299b168b73a2e6e828ae3ab4b9c777d
-EBUILD engrampa-1.24.2.ebuild 1706 BLAKE2B 22666f6f6a2c1ccc1171723e8787e1078592f9a1576889608a54f64af215805ff9a0b69b5c2f0f3c12a3f6958d63dff8a3906614b5d4d56c6902b3b7410858cc SHA512 3ba6d1636cd457bcd545c19225d0a4074c835a61ad455e5de5e554ba73f2db9b11f68b0782517e06891093ad29a23fb566e2f7e9ab8c706e1c9b2e6adaee6284
+EBUILD engrampa-1.24.2-r1.ebuild 1562 BLAKE2B 58401e50358f410fc04be43e6491ce95369609374a84a93062370bad19e12979af9a0722ffd5f40bd46363edbfbfe9d91674d5682822511a55aefeb8ad77d65a SHA512 2dd25260a6cc08db597bb3add653c6eecb3986d662ce8f2db0253211b53fb88915a0a9bb4d6f71100768375e7f9778a7c82e94bafc596edbc280749f292754cc
 MISC metadata.xml 591 BLAKE2B 9a58776d887b3437f4edccb14ba8cd85139acfadece0e4c7a9c7ed7f5f02d5276fc86d30affeb1b605eba15a8ed34a7c40847564436c320e2a8cef5a313de12f SHA512 b0ae271bbdb0046308b9e06df3259bb5dc9d43e406830e000e4513d817fddccfee4b0af956f1c218ad6800e21d79682deddb4561789a42226ee1afa005cc7b3b
diff --git a/app-arch/engrampa/engrampa-1.24.2-r1.ebuild b/app-arch/engrampa/engrampa-1.24.2-r1.ebuild
new file mode 100644
index 000000000000..8073767c9909
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.24.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate optfeature
+
+DESCRIPTION="Engrampa archive manager for MATE"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+IUSE="caja magic packagekit"
+
+DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/libSM
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+"
+RDEPEND="
+	${DEPEND}
+	virtual/libintl
+"
+BDEPEND="
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	optfeature "Support for 7-zip" app-arch/p7zip
+	optfeature "Support for ace" app-arch/unace
+	optfeature "Support for arj" app-arch/arj
+	optfeature "Support for cpio" app-arch/cpio
+	optfeature "Support for deb" app-arch/dpkg
+	optfeature "Support for iso" app-cdr/cdrtools
+	optfeature "Support for jar,zip" app-arch/zip app-arch/unzip
+	optfeature "Support for lha" app-arch/lha
+	optfeature "Support for lzma" app-arch/xz-utils
+	optfeature "Support for lzop" app-arch/lzop
+	optfeature "Support for rar" app-arch/unrar
+	optfeature "Support for rpm" app-arch/rpm
+	optfeature "Support for unstuff" app-arch/stuffit
+	optfeature "Support for zoo" app-arch/zoo
+}
diff --git a/app-arch/engrampa/engrampa-1.24.2.ebuild b/app-arch/engrampa/engrampa-1.24.2.ebuild
deleted file mode 100644
index 1e11f0dc6087..000000000000
--- a/app-arch/engrampa/engrampa-1.24.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate optfeature readme.gentoo-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/json-glib-0.14
-	virtual/libintl
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[X]
-	x11-libs/libSM
-	x11-libs/pango
-	caja? ( >=mate-base/caja-1.17.1 )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	!!app-arch/mate-file-archiver
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	optfeature "Support for 7-zip"  app-arch/p7zip
-	optfeature "Support for ace"  app-arch/unace
-	optfeature "Support for arj"  app-arch/arj
-	optfeature "Support for cpio"  app-arch/cpio
-	optfeature "Support for deb"  app-arch/dpkg
-	optfeature "Support for iso"  app-cdr/cdrtools
-	optfeature "Support for jar,zip"  app-arch/zip app-arch/unzip
-	optfeature "Support for lha"  app-arch/lha
-	optfeature "Support for lzma"  app-arch/xz-utils
-	optfeature "Support for lzop"  app-arch/lzop
-	optfeature "Support for rar"  app-arch/unrar
-	optfeature "Support for rpm"  app-arch/rpm
-	optfeature "Support for unstuff"  app-arch/stuffit
-	optfeature "Support for zoo"  app-arch/zoo
-}
diff --git a/app-arch/funzix/Manifest b/app-arch/funzix/Manifest
index 784ceb43827a..faecfa97ee15 100644
--- a/app-arch/funzix/Manifest
+++ b/app-arch/funzix/Manifest
@@ -1,4 +1,4 @@
 AUX funzix-1.0-fix-build-system.patch 113 BLAKE2B eb18a424d7f3e029f42c5102bf63f0b6e54dad213540832bdc4e4fd99fa83d52af891792248218608bd4f9883d9e2c76b3722303d54424e17b019a069235f071 SHA512 21d2f71a792ef23a501e691f514dbc4dd2c549542f6c1426bb3fbfc86d41cb97916295384a24075a6b10304a8c913b0379ae46ed42c0f87b4838dfa0b6111ddf
 DIST funzix-1.0.tar.bz2 10792 BLAKE2B d7d6035e558cf6501ee84626f9720dab9d44eb87fb3cedc72721ff491c8535ecd913935b1c9618b85c471b3443a7386485b9bc01c7bd09e01752eda8261b9690 SHA512 30abf29571df7be4a1e92270cb3b4949244f5e50b088bc128c8ac63da88c244f0fe810b4d05b76c68220576b06a1c47e84a3f3339d82a4f0e35a841b29ec4c2c
-EBUILD funzix-1.0.ebuild 487 BLAKE2B 9ab5c04537139bd95d7cc27c3c7f02d276e1d476a2b36a0b4530012146c420b3e9ba9591ce952ab3aaa575715c7a7b17d3e39f7620bf70c37008ea272610ada5 SHA512 e8b5cd0a598d16026cf87b80e95c97556f09f6f5df3ca068d60d8fb029680a8efaf1807accff4f9d5b669c4fc3fd77319d91b26822e119abd3084747685bdaa4
+EBUILD funzix-1.0-r1.ebuild 521 BLAKE2B 0454f169708ddc4266e8cc13eb559e1430e22774a40ca3e2baf887ca57503cd12a9eea1f0cf168ad195a03bf0fc84897e15c119762be31d31bab7f23e1041142 SHA512 706b1f3cb3309eb6d19a9524538aff177d018d414316568e15782b7e006d5165f66b932e4159f420a49a61a04cc77ff56d2574e38c63e3de72a710cfb5668a74
 MISC metadata.xml 244 BLAKE2B 103751e060e5683ae0609e26c17ef5c7249bcce611ca3e60acee2a4e0f093f085bb7f45f9d4337f73ba27dc89fe85a182d724e8881e47481c1532974be0574d4 SHA512 f6e74985c30cb6792b1f1f63db2c747c423c7a8ef80b1fcc0d1d6e576caa4df2b26c644fd7b274aeadfaf721361c352472b11ea5e1202e00d6e55f4816cd766c
diff --git a/app-arch/funzix/funzix-1.0.ebuild b/app-arch/funzix/funzix-1.0-r1.ebuild
index 8f62fd7801f6..eae0ebd84376 100644
--- a/app-arch/funzix/funzix-1.0.ebuild
+++ b/app-arch/funzix/funzix-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,7 +12,9 @@ SRC_URI="mirror://sourceforge/funzix/${P}.tar.bz2"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0-fix-build-system.patch )
 
diff --git a/app-arch/lz5/Manifest b/app-arch/lz5/Manifest
index 74712f5b5d3f..e5f56b0ca862 100644
--- a/app-arch/lz5/Manifest
+++ b/app-arch/lz5/Manifest
@@ -1,3 +1,3 @@
 DIST lz5-2.0.tar.gz 207478 BLAKE2B a283650b9d44b75c169e054574b6e4a76b9735ceead51c6dc80fab16666813cc19a5cba1d7e153a9eecd7f95dcda0c36ae02d4c1ea40e1224a803e563fc7824b SHA512 be304d4fe95ff237420cdc054ce7751c5b51e9b438f6cfcb3189e138909331175201cf77615d289d4ea016d66118592794b961ea07c318f477a27263eff2b82e
-EBUILD lz5-2.0.ebuild 830 BLAKE2B 4cc865b67e8d44494c1c34e80d409a91f99ea69712780fcf0ed7ea478f7c6ba007cbf79761701d90b7c828af29b955aff10b4f2ebee11e5ddf2606f5d79c7158 SHA512 fe4d1f1e2c81eaa1ce35aefbacac06d1e577f3cb0bd54a2f278eed34807fc85998a0b7d2792efc92e885ab02b22c50752e47fcd1369ccbcdf9b01a366175105b
+EBUILD lz5-2.0-r1.ebuild 797 BLAKE2B 4e9d11ecae59daa4eb07b52f5ae73101d49cd325bdad196c636073f54f1d487cfbedf5a075c2db78635bb2b5864e4862b6f91f3feeaaeafa31da58083013ab18 SHA512 90b39832f432d5c873e4175e59f23082fdbcb13425e1d2bda250b11516e26a4f4cc78977c416b371c48fc2871f7e4cbe3cb5cdcd3ee1e9f1163a356e656e3d56
 MISC metadata.xml 243 BLAKE2B 0f6d359a1ee861b50f3199dff1b4c093b1d7463c58b9353f5e65c4045dac8ba2228235e752ab294973f73fd20350c43e60b1f3ae788986b040014a702426a253 SHA512 194d8253f0fa5b85c1db847ae9fb928fd936d8afa6455b591cf1a63476b96d7e7f130c2c1e7b5fb3d55d786f84e37b279e7aac07955760a08d259b1520fae3d2
diff --git a/app-arch/lz5/lz5-2.0.ebuild b/app-arch/lz5/lz5-2.0-r1.ebuild
index 9a430c70373f..fa598cb0f31f 100644
--- a/app-arch/lz5/lz5-2.0.ebuild
+++ b/app-arch/lz5/lz5-2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/inikep/lz5/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 BSD-2"
 SLOT="0/2"
 KEYWORDS="~amd64"
-IUSE="static-libs"
 
 src_prepare() {
 	default
@@ -21,13 +20,13 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -Clib CC="$(tc-getCC)" lib liblz5.pc
-	emake -Cprograms CC="$(tc-getCC)" lz5
+	emake -C lib CC="$(tc-getCC)" lib liblz5.pc
+	emake -C programs CC="$(tc-getCC)" lz5
 }
 
 src_install() {
-	emake install DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)"
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/liblz5.a || die
-	fi
+	emake install DESTDIR="${ED}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)"
+	rm "${ED}"/usr/$(get_libdir)/liblz5.a || die
+
+	einstalldocs
 }
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index 0fe79a957041..6fc8ebd8b78a 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,5 +1,3 @@
 DIST lzma-19.00.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
-DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
 EBUILD lzma-19.00.ebuild 1011 BLAKE2B 5010610a9f2fdbef324426b97e25881cab9f4b3e281ef89a04a0cb633af8826d8644a7804231a1543bf8672e66c8f25ea04be6589b3bba59721011640313efe5 SHA512 32a1be293e4b438e73ec9faf5a33d04c7da25c82f9784839ce12adfe7b4d9206da7bbef277a44e420d8aedf1de559ffac14e02d22d3468fb3701894478a41b81
-EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 768a2f1db8ffa970a91e108e9666a1ce3fb2d7061bd8f79c678333ee2c7f864391e0d605d4255bf73934288f3b2afbd84bb0ae4385a49b3cb763851602a6fb08 SHA512 c472806e0b31156679c40ef8ae60e6a6b4b079e49c721a8879683b5991dfae9630550663c983289bf3533dc5eda47eb6eae92c0b5830dd84c545ba0d073afdac
 MISC metadata.xml 475 BLAKE2B 329d792316e87180dd0569c1babeaf12013cca9edf02759a07fa3a36150ca6b828fb24220eb5268e35189e36f170bbc7dc02a24fff5d750192c6d15b0b8e05cd SHA512 8e2ff70ea5e191e853607c6337cc54994b355335a30012df995b632e03e1f8261bd32faf2ad3009ef57003631729807bb52f49881a48ab7296ca955261e843fd
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
deleted file mode 100644
index 32cff7d3dea7..000000000000
--- a/app-arch/lzma/lzma-9.20-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="LZMA Stream Compressor from the SDK"
-HOMEPAGE="https://www.7-zip.org/sdk.html"
-SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc"
-
-S=${WORKDIR}
-
-src_compile() {
-	cd CPP/7zip/Bundles/LzmaCon || die
-	emake -f makefile.gcc \
-		CXX="$(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS}" \
-		CXX_C="$(tc-getCC) ${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon
-	dodoc lzma.txt history.txt
-	use doc && dodoc 7zC.txt 7zFormat.txt Methods.txt
-}
-
-pkg_postinst() {
-	einfo "The lzma binary is now 'lzmacon' to avoid xz-utils conflicts #218459"
-}
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 75920ad032fe..6e484f5d47d3 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -1,3 +1,3 @@
 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
-EBUILD lzop-1.04.ebuild 960 BLAKE2B 6cd33156a80227e0b6854a344dbd0fcd0267af8aed26f1b8ce60d235126b9a3baf11b53444157db054d3380373ca288a740b648b4bdfe74b508cef64201f47bd SHA512 634a4f0a1a20513688b391f51dfb6be72164a4dbc1983471100083be1e49e96b37783f75a1a2fd97865407d5e7a73ac5241b04c4585fc2470290b1e5ea9578a5
+EBUILD lzop-1.04-r1.ebuild 951 BLAKE2B f17050a8eeec35f8697ef999a49bf89d8dbd5d39638cb388e686604a130b7eb43ad954f1ad3d76ffdc602af2145d4656f33c7e3ad2e913692d0e2eac9129f20e SHA512 656e765eae121a148876ac9bdec857b0ae5591fec149362d3324af0979b5c710a15fbfcb050fda42459102d3cfbee1e4faa5cadaad274f7640727f56a041cd0c
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/lzop/lzop-1.04.ebuild b/app-arch/lzop/lzop-1.04-r1.ebuild
index 61d2ad39defc..faf1bd92c906 100644
--- a/app-arch/lzop/lzop-1.04.ebuild
+++ b/app-arch/lzop/lzop-1.04-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 DESCRIPTION="Utility for fast (even real-time) compression/decompression"
 HOMEPAGE="https://www.lzop.org/"
@@ -10,13 +10,13 @@ SRC_URI="https://www.lzop.org/download/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND=">=dev-libs/lzo-2"
 DEPEND="${RDEPEND}"
 
 src_test() {
 	einfo "compressing config.status to test"
+
 	src/lzop config.status || die 'compression failed'
 	ls -la config.status{,.lzo}
 	src/lzop -t config.status.lzo || die 'lzo test failed'
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index d3bdce5e2c38..3168ed3ed1a5 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -1,5 +1,5 @@
 DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276ccdff8bc23d7cc8f7c8aab03f9dc992777fd0d67e39b877ed94b77cca679f5c9d2824c778f6481e71c7120a90b45cc0 SHA512 af91024dc80a4af0935c2fc0b867e57a8d3879d93146f52ab62d8bb105f2c637abe46c762302515417691d12144818446932c970d1018d2f10c0d4e1fa455020
 DIST par2cmdline-0.8.1.tar.bz2 3213343 BLAKE2B 4778fd32012c61739e04a4e564eaedf48527c04b0d83c5467c34808913e81cd5459a6a5bfabe79ca74f520761ebd3592e80b714f3ef45cc98866da919757a176 SHA512 b33ee654bd14269afb02d48175abf183281270c3e0dad9ffcaa0aa69c4271715a85e550d6d56fe5460ebfe9a37dc53b7d2210cd79a6f55d3921dc5dd5972c846
 EBUILD par2cmdline-0.8.0.ebuild 768 BLAKE2B 884c01c68cf08b345dee94c4db74f15648f01d5b14c6e211937dc6d79b5c64ca28feda23179bf148c73fd65eed1a4ac3fa7215b155ccac202afe1db86ae6b1a9 SHA512 e98ad86ee881a190855fdaf263cda584e7de277960d31b3b7bf0d80c8944adf5ba6c6a7d916168e7a158c9daf344136d0ea34b0d2395c1932f8bfb07401bf918
-EBUILD par2cmdline-0.8.1.ebuild 771 BLAKE2B c965175e9ede9c6049449ca8d13c58b566cedd344f751ae804d7d12c9408103ffb6bb06a3d1107e33d550543e85193d21bfc662fe1707653bfa249e076e8101a SHA512 e46c456b7e44f3891a9dc343d8365cd15114ddc4cad03c781927650253954dcbedf08d75717208d96cee8c305574fda9ccc07b4001d1c69614a8f41d7f728a22
+EBUILD par2cmdline-0.8.1.ebuild 769 BLAKE2B 0d722cb256b03cd112124caed0cbefcdd6e2d6b23c8293f76bc40141146315324509fa0a0f3c2d73ff4aa6f2d69c0408c804c4bc55853cf3d6c6989d11b7ca07 SHA512 14e8681dc4ba4bda303da238e215065be0932e9c9924776a17071b528444bf2989ceeb697a2bc13e247522725fd1370aafdde0ffd72ecd37d4e7db97f9539447
 MISC metadata.xml 313 BLAKE2B 13e31cd90dad938be801aba6086fa8234878f9b691decd84e1fb56108a10e368c6442098b8574874f5c405f33d85c6236eb30e21e8f57e7e7c09deefe541a1d8 SHA512 88cd31f008359d686c66f9813f498c5c4c3f7662a5acfe5c7eac7c244bc0688fc544b36dd711c1949624c186e143f0d46e9c636b7ff54f401f67d95f3d33d69d
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild
index 02437534f1d5..e12295b12951 100644
--- a/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.1.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="openmp"
 
 DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest
index 345edf918cc7..9d0c39c22cd0 100644
--- a/app-arch/pdv/Manifest
+++ b/app-arch/pdv/Manifest
@@ -4,5 +4,5 @@ AUX pdv-1.5.1-no-strip.patch 419 BLAKE2B 94d963ecc43585f6d2d359a8cf23f6ecaf12d19
 AUX pdv-1.5.1-opt.patch 696 BLAKE2B 83503bcba43c43f06e2e60791a0b4166c994206d767d35c7bd541204f00ae4777e1cfe31acef0d28fbd7c5d8c23d70fff13553a0e2bee0b1379860b8a68fa18e SHA512 bbe6cece336f649970227a577d17835b401262e9d6021a61d97dee69972826466b720e5f9b60d552d84e1223003fcf047314390afdf48e07f4b2c55868caf599
 AUX pdv-1.5.1-x-config.patch 529 BLAKE2B cbdec2a9d9a512534ea5be14a2557d7cb0d89da8732adfd77b48de0a6881473ea95a9e5472f8efc8dce18aa55a28337921b06ef8bb8ad14dffc734ef0d822212 SHA512 7be234893169656537c15a124d5a50de138e85d2d23ab5884d600399f3aba86724ebac397846d03992a4556e7ca8a8ba42f5cf8c3e4348080e4c9e0522e05cb6
 DIST pdv-1.5.1.tar.gz 87858 BLAKE2B b0397e177803ed57a69fd69a331b61743379be5ff4272fa5b03012856e9bf5a671e67701215964aabf8d57836da350bf66db20c81985e5f6949bbc9cafbda11c SHA512 c8db9aa4c29016474d33111e8343174a1fb25f152517bceb29428def5e02590b1de523ffcf2c0f6ffbaec5b357e3893f48188775c2e66d343a21e04343b1d0e9
-EBUILD pdv-1.5.1-r3.ebuild 1420 BLAKE2B a2185d1edcc325de5b26f1dfc33c0d6d6dfc91c2d6c59da038ec07c8655e6ad0ad69ce5abfa820c0c5e686bb5b289c22e89b8d5c88ff916690bcb03582edac55 SHA512 f52996ffa01d64ec5e883250187a4ea351f7d411fc5ad6cd0208707554a807a93b01b4304fcf787dcba26020c01fb7fe26326cad3aef037c5a0fb1e877ae11fa
+EBUILD pdv-1.5.1-r4.ebuild 1333 BLAKE2B 70893c6d8c7e5b13133f169edf60e278b2b38f371c7bad2c6d6c9821eb95ae08b030f5bf648617b2f23a1e485504c12535ba5e17177bf03946c07e70451be036 SHA512 e7d221d9425b79f8419d861523da8f3d78d34d8cd80f252f8939def9d314fa33488e8ae24d0ba68b85c8e1f8695136776a6fdb259e3b83ec1040a42767a7c323
 MISC metadata.xml 241 BLAKE2B 1e13023492f2426db80ee90a5464ecf1f693d957ef0542b2056dd1192034ac221274fd567c7670b855aee6f8627a4bbb48f2dd742d1e20b694d64fd49668c01f SHA512 d0c4ed2f7603606fa507fe29346d101d3dd07d59029067cdf65c63dc2859c99f72a56e56cd5f04e5e1bb9246ce68d6432fc38e991517ba484508e352f8637e01
diff --git a/app-arch/pdv/pdv-1.5.1-r3.ebuild b/app-arch/pdv/pdv-1.5.1-r4.ebuild
index 8b712196c4de..b50f939fa91a 100644
--- a/app-arch/pdv/pdv-1.5.1-r3.ebuild
+++ b/app-arch/pdv/pdv-1.5.1-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools toolchain-funcs
 
 DESCRIPTION="build a self-extracting and self-installing binary package"
@@ -11,48 +12,48 @@ SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos"
-IUSE="X"
+IUSE="gui"
 
-DEPEND="
-	X? (
+RDEPEND="
+	gui? (
 		>=x11-libs/motif-2.3:0
 		>=x11-libs/libX11-1.0.0
 		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXext-1.0.0 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
+		>=x11-libs/libXext-1.0.0
+	)"
+DEPEND="${RDEPEND}"
 
+PATCHES=(
 	# fix a size-of-variable bug
-	eapply "${FILESDIR}"/${P}-opt.patch
+	"${FILESDIR}"/${P}-opt.patch
 	# fix a free-before-use bug
-	eapply "${FILESDIR}"/${P}-early-free.patch
+	"${FILESDIR}"/${P}-early-free.patch
 	# fix a configure script bug
-	eapply "${FILESDIR}"/${P}-x-config.patch
+	"${FILESDIR}"/${P}-x-config.patch
 	# fix default args bug from assuming 'char' is signed
-	eapply "${FILESDIR}"/${P}-default-args.patch
+	"${FILESDIR}"/${P}-default-args.patch
 	# prevent pre-stripped binaries
-	eapply "${FILESDIR}"/${P}-no-strip.patch
+	"${FILESDIR}"/${P}-no-strip.patch
+)
+
+src_prepare() {
+	default
 
 	# re-build configure script since patch was applied to configure.in
-	cd "${S}"/X11
-	mv configure.in configure.ac || die
+	cd X11 || die
 	eautoreconf
-	tc-export CC
 }
 
 src_configure() {
-	local myconf=""
-	use X || myconf="--without-x" # configure script is broken, cant use use_with
-	econf ${myconf}
+	tc-export CC
+
+	econf $(usev !gui --without-x) # configure script is broken, cant use use_with
 }
 
 src_install() {
 	dobin pdv pdvmkpkg
 	doman pdv.1 pdvmkpkg.1
-	if use X ; then
+	if use gui ; then
 		dobin X11/xmpdvmkpkg
 		doman xmpdvmkpkg.1
 	fi
diff --git a/app-arch/pure-sfv/Manifest b/app-arch/pure-sfv/Manifest
index aeea6fd8ab0c..2e825ff87306 100644
--- a/app-arch/pure-sfv/Manifest
+++ b/app-arch/pure-sfv/Manifest
@@ -1,4 +1,4 @@
-AUX pure-sfv-0.3-fix-build-system.patch 517 BLAKE2B 87fddfd692c2d21ba5369ed57280d7b56568bae03396d9702e963285d6346a95693b049ef046c68a5116c7dd98e50444b1a50419c18fde99be0e67a142b775fa SHA512 317527bbf283ec603d06cf4705adf04915d57d7251301403dc43c359359f644728f61ba0997b04753f5c1c820341d5e0986ad0e3fb8c93a932d2000c9fc2c207
+AUX pure-sfv-0.3-fix-build-system.patch 546 BLAKE2B 4d407df5e15042cafdd8f338e9198d6b46f31fb2c7dcb6f2926c14b0fcbcf0e54cc83cf80f777463d2ab1df9a0e5dd6e2d54336ad9fceca54af34d604de64e05 SHA512 403751852100d2aded0790d999f56847bfec1804b5c7b199388445e4543d926db4ac204c742ed86e57b73ff2cd56f8a6621322eeaba3fef38b9566f4d953de24
 DIST pure-sfv_0.3_src.tar.gz 79069 BLAKE2B 77bfa8ccad35a9f3bde4a5710deceb9e0786e905cd0ff44903b08154043012849c7f5f797806429b9005aa6977e23c451cd1cfeee2870c35298248d0783a078c SHA512 defacdaa0b78f708c83198e911ad93a5c5456bf15e2b33df61c984241df8a82ff4d962b8c7994c6413b36a61df2cc6d91c467bf8994fa43e0ac01db2585a78a6
-EBUILD pure-sfv-0.3-r1.ebuild 618 BLAKE2B 2eb5441f25c272303a5135009948eba2123fa7c65db8f512ceca160a0163dbd538dea456aa1b3a59e61797ba20d069dfdfbbef3971924df2a57b981fec4dceb3 SHA512 085a72af3f963aa2a5e9a6eb53ab191e4fb055e851bbc758209a285ca48a5450b6979d4ff081e774e4649c69977b385f198b944da2d5ec098118145c1d05622c
+EBUILD pure-sfv-0.3-r2.ebuild 563 BLAKE2B 1f1c02fb74b2ca69c74d375bfa5e08458d94bb393d22d3ceb0549aaa26daffa6811776c09b76046789dd4e2cd4d7facfdc864250fcc371a03bf0e22ab8aa2419 SHA512 fe1151950065bac110621a8ca906760076a70b324e3376cb35b642aed2fa73035922d826dcac72ee70b2849351c15ffd1bfb70c42362a55be5d196703152e1ca
 MISC metadata.xml 246 BLAKE2B 3b1f9f5d37f0a99a61643bc46b59432d653f233d6a95a6f308df393c2a3cb76bc6771d4d6c6743660dbe1899803e4fda06de616fc95718542160159fec46dc68 SHA512 a85623528271426787bee6525d52d411d510ed2e22f6681495dd32d8395de35fdcf44476820513286044b1619a54e07cb49098ebfff6674ce9eb0d88226429b7
diff --git a/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch b/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch
index ca2143f1f956..b7f6771b5ed9 100644
--- a/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch
+++ b/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch
@@ -1,10 +1,11 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -54,18 +54,16 @@
+@@ -54,18 +54,17 @@
  
  VC_CRAP = pure-sfv.ncb pure-sfv.plg
  
 -CFLAGS +=	-Wall -Werror -O2 -g -Wno-unused
++CFLAGS +=	-Wall -Wno-unused
  INSTALL_PREFIX = /usr/local
  INSTALL_PROGRAM = /usr/bin/install -c
  
diff --git a/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild b/app-arch/pure-sfv/pure-sfv-0.3-r2.ebuild
index f28c6df42ec4..fec0272766c1 100644
--- a/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
+++ b/app-arch/pure-sfv/pure-sfv-0.3-r2.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="utility to test and create .sfv files and create .par files"
 HOMEPAGE="http://pure-sfv.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pure-sfv/${PN}_${PV}_src.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
 RESTRICT="test"
 
-S=${WORKDIR}
 PATCHES=( "${FILESDIR}"/${PN}-0.3-fix-build-system.patch )
 
 src_configure() {
-	append-cflags -Wall -Wno-unused
 	tc-export CC
 }
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index d3005794afb1..15c21f9294f5 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,5 +1,7 @@
 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.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
+DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85
 EBUILD rpm-4.17.0-r2.ebuild 3993 BLAKE2B 5679659f233757cfe4a346402dd5c0b5cb691ca3bdd2898f937ba50396d1980ba08cb8347bd866d579f2ae220fb0351aff0972830b6f15c16e3bfc3f8b92cf23 SHA512 3b6620c0cc78145ba2433571339bf997a9ed9ead43879e697d40979f670b72ccbdd09921130f67c080353979f1d5b50de29ed2668d16463ca5b14ef383a8376e
+EBUILD rpm-4.17.1.ebuild 4001 BLAKE2B 98d6d5a59213536a24e05d91862d0e6521641464c2754fdcf63c92ad595902236b0c6fbf17a296696ff199fc1c1b30c9e4b9f8b0174c6183328bdba5a086e33b SHA512 00a28d57559f27f4ce2b2790c3127075d8d61d5db706311b3a6d7b3b2f111c7fbfd7c98ce1d88f515ac239a85adaf2771ca6d0727a4dc0430e70fe87668163dd
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild
new file mode 100644
index 000000000000..ac7a9dc24a1f
--- /dev/null
+++ b/app-arch/rpm/rpm-4.17.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools 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="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
+	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 audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="!app-arch/rpm5
+	app-arch/libarchive:=
+	>=app-arch/bzip2-1.0.1
+	app-arch/xz-utils
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	dev-libs/libgcrypt:=
+	>=dev-libs/popt-1.7
+	sys-apps/file
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/libintl
+	${LUA_DEPS}
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	caps? ( >=sys-libs/libcap-2.0 )
+	dbus? ( sys-apps/dbus )
+	sqlite? ( dev-db/sqlite:3 )
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	zstd? ( app-arch/zstd:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	"${FILESDIR}"/${PN}-4.17.0-libdir.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	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() {
+	default
+
+	# bug #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# bug #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	# Prevent automake maintainer mode from kicking in (bug #450448).
+	#touch -r Makefile.am preinstall.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# rpm no longer supports berkdb, but has readonly support.
+	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+	econf \
+		--without-selinux \
+		--disable-inhibit-plugin \
+		--with-crypto=libgcrypt \
+		$(use_enable berkdb bdb-ro) \
+		$(use_enable python) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable dbus inhibit-plugin) \
+		$(use_enable sqlite) \
+		$(use_with caps cap) \
+		$(use_with acl) \
+		$(use_with audit) \
+		$(use_enable zstd zstd $(usex zstd yes no))
+}
+
+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
+}
+
+src_install() {
+	default
+
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Fix symlinks to /bin/rpm (bug #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
+		local docname
+		for docname in librpm; do
+			docinto "html/${docname}"
+			dodoc -r "docs/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+
+	use python && python_optimize
+}
+
+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/rzip/Manifest b/app-arch/rzip/Manifest
index abc14cd3f5ce..c044f16e2c4b 100644
--- a/app-arch/rzip/Manifest
+++ b/app-arch/rzip/Manifest
@@ -1,5 +1,5 @@
 AUX rzip-2.1-CVE-2017-8364.patch 1006 BLAKE2B dc84fc222e5fcf1c0e5a37eda05bfb136b9603eb3c510edabd91bfc639b2c4a9f9956ce8cf152c94fb255c1b749a5eb8dfd0d13f65a2a4682a008f6fc236ab4d SHA512 18f594eca2f805770dad7569ad8cffbb934e74b85b04cc91cbcbb04fbc936529f68121504c50b037cfb848e9ba90131a5b35a1d236f0c1453d55fd8b415a7ed6
 AUX rzip-2.1-darwin.patch 4829 BLAKE2B 7e6cd7273573517aa29e73f0556e6b33d4386d71872d643d448859a48308b8fcd59b1a2c6749117e39c8184ac4239053a97757b2e4e821b7b9e7232e99af2120 SHA512 a3cd2c98a486626767eacd5a949ecf1f328f11bd663a1f4b9f758314dde709e9fd73fb1239dec8737d4511f61225f47682b610b9a2609646613a774d6f6ad5f8
 DIST rzip-2.1.tar.gz 46785 BLAKE2B da38d7ae74149824dd33f3ecb1a7f6f63d63a8ee54c57565e4edc5915b503882d4de20b19c22228e8d3fc698477b6c8f095c2a399d442101a83ee66f4bfbcc63 SHA512 06ed760ba2b7f09781a2e9312b645d41c145f96e3ee55ddf573714493e92466366ec6394267e5e06b0d8c42dcb67e1ae99dafa417a84737ce2b4a650a9059a6f
-EBUILD rzip-2.1-r3.ebuild 1097 BLAKE2B e2b62d401e8d5c187f960472cb4fb6b3d6a26b4c2919fabafb6eb2c627be345ab45d0eec8e93a9527a58b28465ee2332a259368852c9be0a514781bb7ca5644e SHA512 d1dd5198be16e27fd482ec221cdafb64dbcf7cc4a5eb9ee2133b5e01054601c27a1bcd16f14bcb08a07b39e90d0be0a1642e0bdf8bd663041c12c999db6c3a04
+EBUILD rzip-2.1-r4.ebuild 1043 BLAKE2B 42a5f9580d16c6ce0827ffd838a688b2bb8fa9b762db67f36a89f2c99900b7309f938dfebb3304b5fd44e26b678effd44394e581926b277c6fc675bdc4184d50 SHA512 47cc6efe33d00752fd04b85e43a57de2afe7961beb0ee6adb39ec79529f0abfc0a250f6c04ac3cc0b1c62702649b3b23eb15a349a5e1b785e7f6159406da566d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-arch/rzip/rzip-2.1-r3.ebuild b/app-arch/rzip/rzip-2.1-r4.ebuild
index f771c83cd97b..02cf14d9e94b 100644
--- a/app-arch/rzip/rzip-2.1-r3.ebuild
+++ b/app-arch/rzip/rzip-2.1-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,7 +12,6 @@ SRC_URI="https://rzip.samba.org/ftp/rzip/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="app-arch/bzip2:="
 DEPEND="${RDEPEND}"
@@ -24,7 +23,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -33,7 +31,7 @@ pkg_postinst() {
 	ewarn "compression of large files it didn't set the right file size, so"
 	ewarn "if you have any reason to believe that your archive was compressed "
 	ewarn "with an old Gentoo rzip, please refer to "
-	ewarn "     https://bugs.gentoo.org/show_bug.cgi?id=217552 "
+	ewarn "     https://bugs.gentoo.org/217552"
 	ewarn "for the rzip-handle-broken-archive.patch patch to rescue your"
 	ewarn "data."
 	ewarn
diff --git a/app-arch/stenc/Manifest b/app-arch/stenc/Manifest
index f2e2e00267f1..f4ef29de1866 100644
--- a/app-arch/stenc/Manifest
+++ b/app-arch/stenc/Manifest
@@ -1,9 +1,3 @@
-DIST stenc-1.0.7.tar.gz 107096 BLAKE2B 678be2fea4eb3db5cf84a70243fd61dcb574627bacb59b2f9af682e2e0851d41187565b4706313c98bb5b297f865b1424bc47c52f15efa2a2e8b2c7413b09009 SHA512 84cb0114c969e1a5122a8621d2c136663ee2a2d9aae1d455631c1d4555e947f4841004b74a1f63b800be713cfae637c19ea34adf40f0bc81f1c56a555a27ba31
-DIST stenc-1.0.8.tar.gz 29297 BLAKE2B 269310fb7a9063eb3b367dfec534096201003e6178a31aeb73aa7a73ed0473d4a606634ac9cf7377d17240dee074345efa49fc907d9487f573a75ec44c3454f6 SHA512 4fd882861d248cf59cde1782833bd3e4f7e01e8b6c00424c55f26454a620510b22de0d42f2d7f6c4e67c2b277776a174fe687756a75f410026fda55554f9dc87
-DIST stenc-1.1.0.tar.gz 31822 BLAKE2B f132c74ac84f38b312a8fa74f0a0fbfd253748bbc0516e5f5a860dbeb4ad4683ad965858c73f2fba58075074e9fae6c6fadf66c9da2bd85bf88de877439f66ad SHA512 d73eb349ad06979803caaa89af1068ef3732830b99557b7ca62d5cb357d7a105d1c884fea3c227b18e906a80f17581c08fe276f92ad698cd0dfca4919fe73fa9
 DIST stenc-1.1.1.tar.gz 161761 BLAKE2B 865d36befd53e1db00245688e2aac429546b29f7b039cbd04aaafb47fcc55f02ba01e7f13c7814ae4daf102372eded1f069c1b9ecfb2b2e7aaf009bfa2855ae4 SHA512 89eb1da2391be207e23d4e3cc6563405272eeb456b59360e92fbeca063badcfcf4c37fc814af59803707006e5c04e43e18755e1d30b0f3b3020a7645396db1a6
-EBUILD stenc-1.0.7.ebuild 388 BLAKE2B a9b3ddab46d41596f553b270bd0fd0b246015831abf5cb96929092090894983611342e41c2936cf4b73c78634a94e6b1ce99b046a29bea0dd2b1c78f779e7bc0 SHA512 edd127263cd278ea1884c979940cd0c79827f75992a83f7d8329b601117df9a60bc47832606faeb25d45c5bb7aafd0cd33537a518db65cfd505002b778f5b62b
-EBUILD stenc-1.0.8.ebuild 603 BLAKE2B cf85af4c7dcf7e4bb16bc6d0490cde321fafb353488847952f318018b4b411c6c1e8a2f04d20f52d544fd736d5c4e06711e3806c0425e7cea5fbe0413bb8a494 SHA512 2741bce011657def0e9de1b7b9eb14669655488892bff0783ce23da2ce8e5dfdefd8288ea90419407d3bb5bae02d4e999c451f42a45177bccf7cd50c18092e96
-EBUILD stenc-1.1.0.ebuild 603 BLAKE2B 4956d26c6a87c849491f994a02488a3ef71cd3379c86da88ff7233a2a6b70720bee345075b92fb6bd78434581ec8b60909cacfdae5f3ba5399665dbb6d92aafe SHA512 ee4ea3ad9e32e9d10992ba424b8d1d6924c8ee22e3b55d26ea21eb45387f6f0425532c4a7c17788cb4efa07000156a07f20fea7c1fc6d85fc7b4a15d24efa3fe
-EBUILD stenc-1.1.1.ebuild 603 BLAKE2B 4956d26c6a87c849491f994a02488a3ef71cd3379c86da88ff7233a2a6b70720bee345075b92fb6bd78434581ec8b60909cacfdae5f3ba5399665dbb6d92aafe SHA512 ee4ea3ad9e32e9d10992ba424b8d1d6924c8ee22e3b55d26ea21eb45387f6f0425532c4a7c17788cb4efa07000156a07f20fea7c1fc6d85fc7b4a15d24efa3fe
+EBUILD stenc-1.1.1.ebuild 563 BLAKE2B f3873315738c232b12733ccb851e2dfd40b7d7e5674e983751165b2decd7064d943dce6b1e058abede1e8180809b8879a6cf85c4662922b635e899fdfb65ada1 SHA512 40deae722da2c0b06ee57126153a4f8841ef069eb4cab7224fd01ad946691b674051d275202633119c4bbc5f578c829a8bfec0a132f72570dd28c566edef5c8e
 MISC metadata.xml 671 BLAKE2B 0b3c581b011dff8e93244f1630e44237ad342dc5b3658da56831c598e6419e6e91b6e9efdcba51b7809593cdaef8be721768ae7ff25ae513d3c56a14c84d669c SHA512 af54957f3e928fbbfabe4bd22f1f106cd6ecf1af38a763e3f490afdfbff3e1297187d20913d52c330b53bba253a56080402b6155c501db033a230a89e237c7e9
diff --git a/app-arch/stenc/stenc-1.0.7.ebuild b/app-arch/stenc/stenc-1.0.7.ebuild
deleted file mode 100644
index 54552541a979..000000000000
--- a/app-arch/stenc/stenc-1.0.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives"
-HOMEPAGE="https://sourceforge.net/projects/stenc/"
-SRC_URI="mirror://sourceforge/${PN}/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/app-arch/stenc/stenc-1.0.8.ebuild b/app-arch/stenc/stenc-1.0.8.ebuild
deleted file mode 100644
index 2ac8822df2ec..000000000000
--- a/app-arch/stenc/stenc-1.0.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scsitape/stenc.git"
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/scsitape/stenc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives"
-HOMEPAGE="https://github.com/scsitape/stenc/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-arch/stenc/stenc-1.1.0.ebuild b/app-arch/stenc/stenc-1.1.0.ebuild
deleted file mode 100644
index ab03524d5efc..000000000000
--- a/app-arch/stenc/stenc-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scsitape/stenc.git"
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/scsitape/stenc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives"
-HOMEPAGE="https://github.com/scsitape/stenc/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-arch/stenc/stenc-1.1.1.ebuild b/app-arch/stenc/stenc-1.1.1.ebuild
index ab03524d5efc..7a5055a0913b 100644
--- a/app-arch/stenc/stenc-1.1.1.ebuild
+++ b/app-arch/stenc/stenc-1.1.1.ebuild
@@ -20,11 +20,6 @@ HOMEPAGE="https://github.com/scsitape/stenc/"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-arch/stuffit/Manifest b/app-arch/stuffit/Manifest
index 5588c079b17d..ce7d9b4fcd60 100644
--- a/app-arch/stuffit/Manifest
+++ b/app-arch/stuffit/Manifest
@@ -1,3 +1,3 @@
 DIST stuffit520.611linux-i386.tar.gz 1955619 BLAKE2B fb80abef29d266c93747b3359c62840afa15a32786a82ee01cab22cf0eddad750817c87b767632df5bb2ef681c1c9dd6dfe136dae388f8390bcab0b137a2c0bc SHA512 a1d4631c2d238b49c710816cd5ed8a01dcf52c29b870297b8dfd76fb0cb6e725c5b0f9d4a6c155c7b6980005df52fc4597632f72e90f00bf93ad80a28972270a
-EBUILD stuffit-5.2.0.611.ebuild 1483 BLAKE2B 78acbc361330b828415fe6334a62b0bd1048ad927fbf7927df23a01423d78256027e8982869216874517b6faeb93396c1028ff65b87aea527342316c6de19c7e SHA512 013048fca9cbf5ae86fb680c6bfa1de0afcbd1cc45f6143c35be7fb64d1dedc298ed1fa5f564ffcd6502dc8b803a50d6899f1592a49a3a117542a96ffc9f29d5
+EBUILD stuffit-5.2.0.611-r1.ebuild 1423 BLAKE2B c27884d984e25cbd6bffe0d52769c5947234849692053c9001dbe2e87667fef4f02efe44704a9a273caa46200b605772fa60c66712badf4533368ebc029b5b2c SHA512 246d992e7ae780eaad5bb84548c93706920aff74e079a519a4bba8de2a684ed23006884062ebfcb05c4ae7c2700a8f5051bb7c51cd592cd170e26b938b6a7d52
 MISC metadata.xml 303 BLAKE2B a964fe090b0cd32923c661a9d1db37d83a5f22c367719b7889e0bf1cd3568ebb48312a44548c366152ae8e91ef9b7d10c494b499bc86cdeb4cea58f19056f6ee SHA512 bcb5015899ec63a37f8e9768d08b97a4b4d37d5794b41914fdaee231602217e78479e7c32110d9bedad037ea4ebddce71c678c667469a7ee0c99c5ba4fb7bc19
diff --git a/app-arch/stuffit/stuffit-5.2.0.611.ebuild b/app-arch/stuffit/stuffit-5.2.0.611-r1.ebuild
index f951829d1fe4..4edbd3e01728 100644
--- a/app-arch/stuffit/stuffit-5.2.0.611.ebuild
+++ b/app-arch/stuffit/stuffit-5.2.0.611-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_P="stuffit520.611linux-i386"
 
 DESCRIPTION="Aladdin Software's StuffIt and StuffIt Expander"
 HOMEPAGE="http://www.stuffit.com/"
 SRC_URI="http://my.smithmicro.com/downloads/files/${MY_P}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="Stuffit"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE=""
 RESTRICT="fetch strip"
 
-S="${WORKDIR}"
-
-INSTALLDIR=/opt/stuffit
+INSTALLDIR="/opt/stuffit"
 
 pkg_nofetch() {
 	einfo "Please download stuffit from"
@@ -49,12 +47,10 @@ src_install() {
 	doman man/man1/*
 
 	# Also add the executables to the path
-	dodir /etc/env.d
-	cat > "${T}"/10stuffit <<- EOF || die
+	newenvd - 10stuffit <<- EOF
 		PATH="${EPREFIX}${INSTALLDIR}/bin"
 		ROOTPATH="${EPREFIX}${INSTALLDIR}/bin"
 	EOF
-	doenvd "${T}"/10stuffit
 }
 
 pkg_postinst() {
diff --git a/app-arch/tapeutils/Manifest b/app-arch/tapeutils/Manifest
index 15e1e553b659..9b0a6a6a86c4 100644
--- a/app-arch/tapeutils/Manifest
+++ b/app-arch/tapeutils/Manifest
@@ -1,5 +1,5 @@
 AUX tapeutils-0.4-fix-C-decl.patch 700 BLAKE2B c3786edd42d711a528b7fc81c6c9569e2cd265aae7c4205fc642d8ee088d756f2b810197af3fd4aa2c0303e310ced41a9013d76ceb84cb9d5adf5a91ad4227c6 SHA512 bb38dd764d94279894f2ed76b8e882622a30db6b68bfb48ef882422fc326274842961fc0d27b2d812444382dd19aaee64788f8a4a604c2506961c405d4f20621
 AUX tapeutils-0.4-fix-build-system.patch 201 BLAKE2B b0c4d271b1a52ce613d57c7006f485f63e93dba380fb2a8e6db0da50cbc752b2cbe115f05e9b0c475a690ec2dfda87bc9d0beab33a8292cb2af2779c69f271a0 SHA512 c286c5592874a147341182fa98f13181937fd5ef0f581b8ebdd790f156dcc1c358e1b69240cf8fbccd2d3d34c319e29b2a9e8a3674fede6b712c4f12538710ff
 DIST tapeutils-0.4.tar.gz 14116 BLAKE2B 1eb633ef1593b6f50142ae0128438a4346fafdaa4a847ff9e21caf278f1123844af16dc2c04d3d0cc2c015d0ec7fc15eaab48e6be9ae7c18d3cd2972434f2617 SHA512 b87b725c3f1610f5a116263120ffea84a7e81146cc9e46be69391388bb0b3bf4814d16428bfabd285557a0f72a3607f138e454b61989f2606697875e30c948bd
-EBUILD tapeutils-0.4.ebuild 655 BLAKE2B 3f59c8b660b90afd9f51c510069a4c85e298eb88ffb71588119335e18701b8fb33fd619288e0eb96c938fd2fbe2b866554df20eda27d0f037d5ee18703b57255 SHA512 43386adefd194fe12d0430de17b57a3992b694c1c1520daa89a94e2eaadbdabcaac843a6b759bbaca706523a5c9d2d5e641513bdadcbb3ee2fe67eef3c2c6f3d
+EBUILD tapeutils-0.4-r1.ebuild 634 BLAKE2B 5a5fef921d82379cffe04f13513fa0ea1a397416479bd17d24169e29eed913e8a07371861b066e32241e289db1126372fd34e9beebb9d5ffca23276f00eb88cf SHA512 431de0ba08578bd99d61457166b202b2742078dac427749be791b639395be9c0ef6e4b3de1d33dae90d2394538a5d1a72628dded5be7bf8b3f9bda0ed9fd0789
 MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/app-arch/tapeutils/tapeutils-0.4.ebuild b/app-arch/tapeutils/tapeutils-0.4-r1.ebuild
index 50e3aac72747..3910ba59b41b 100644
--- a/app-arch/tapeutils/tapeutils-0.4.ebuild
+++ b/app-arch/tapeutils/tapeutils-0.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,9 +12,7 @@ SRC_URI="http://www.brouhaha.com/~eric/software/tapeutils/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND="!app-emulation/hercules"
 
 PATCHES=(