gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-arch
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
73 files changed, 611 insertions, 862 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index e5544f96f3b4..20874f9f5029 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 1ed160157513..51cafdff296c 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,6 +1,3 @@
-AUX advancecomp-2.2_pre20190301-gcc-11.patch 7012 BLAKE2B ba239903860dbebec89d102f7417bc1db83129a762dfa59ed81ea46ef0ca58720556f0e697a05a995d095f1f33540538dcebeff98bc228b870ff84e267a51fa1 SHA512 a122abb506667203d202da35796f4f59bf050aa25edeec644bbf9c6ccd2fb841c1b3e8df9b782af0d84dd6362d2722044cc54d53c5923da5a47fc6296322d16e
 DIST advancecomp-2.3.tar.gz 1292157 BLAKE2B 7fdbbc4c53c58a4988339189d5e2e2412e782a69081b6ba39f86f4c2b101b03d8400f8104091eb8b22d2d4969515c8126011e79e346787bddba77d67387a6efe SHA512 87dc6a25139708b975ff138f73555fb2053c0fb8310412823624de7786a2034657fc3b4ddb6eeda332788073bbe21ea955b7368707186ee3bb61d1fe59e672e3
-DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7
-EBUILD advancecomp-2.2_pre20190301.ebuild 1054 BLAKE2B a58fa4afccfd0f3dc6173956babef1de8010d147ceb7ca6c7f3f858da98a85ac80d797d84e7aaba4846c83eb15d8459125ed7bd25b39f9d08d993dd0fd015adc SHA512 4d9a5fb0a46f6b1179a7d11dc6e764adedc8a9eb2f971c59e1a3942ffb3635bc3bca49643942e0acd2c4daa67c2185d33eb606968051f41e73e6af8b87b08cfd
-EBUILD advancecomp-2.3.ebuild 886 BLAKE2B a98d39166042838f7b1b4e651d75b821fe4e1b25269f11b6988f7a4a08293f9d52c79661e470ca84ba9c6e23d82bd5f2e3b1b959da72efbe7c8362d6a8b46d4f SHA512 26d4e294ce6f8ddcc5a4dd9c6e87920a49ce093e2e06d444ebcfdebf6857e9e632a0d646c8453f917491d691fdc001cb46fba6d617cb89bb43f99a28c74b915a
+EBUILD advancecomp-2.3.ebuild 881 BLAKE2B 4f51e115905cb47422c6f267f92304bb3b011deaa933bcf26ce20eb9cd92a1ddc1e369c5514700a15c91fb18e07d8e3e88efc5f51fc7c91b8c3ab0d91c981d54 SHA512 40c86ca82a557b79d1f86605f8da74e58c28891ae2ebd450df50218f482f9bf92aa4084a2621da3da9cdec5ac79d3bcd7ac948f0e43e928c32656b6e4eb55ba0
 MISC metadata.xml 390 BLAKE2B ff0e188cad31daa60b4298b09a40fbbeb0d2b95ef7bf7a78df9c3acba7421ceea5511b1654c2c15acd59efd53dc6e2f222037201bf2f66c2d8abd9d888c4138f SHA512 5f2bdc25546d01a5a3b785fc5b659dc1d0f53a12f992cab12bc14790f82b6401bb8dd65f5bddb32f59ea458fa2cc913f7b1641cf36827207f7aa2875d9488ef8
diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
deleted file mode 100644
index b13f318de57e..000000000000
--- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-EGIT_COMMIT="fcf71a89265c78fc26243574dda3a872574a5c02"
-DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
-HOMEPAGE="https://www.advancemame.it/comp-readme.html"
-SRC_URI="https://github.com/amadvance/advancecomp/archive/${EGIT_COMMIT}.tar.gz
-	-> ${PN}-${EGIT_COMMIT}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2:=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-# Tests seem to rely on exact output:
-# https://sourceforge.net/p/advancemame/bugs/270/
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-11.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--enable-bzip2
-		# (--disable-* arguments are mishandled)
-		# --disable-debug
-		# --disable-valgrind
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc HISTORY
-}
diff --git a/app-arch/advancecomp/advancecomp-2.3.ebuild b/app-arch/advancecomp/advancecomp-2.3.ebuild
index 2d742f6a747a..6d75cd55c107 100644
--- a/app-arch/advancecomp/advancecomp-2.3.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch b/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch
deleted file mode 100644
index b72a6824a305..000000000000
--- a/app-arch/advancecomp/files/advancecomp-2.2_pre20190301-gcc-11.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 7b08f7a2af3f66ab95437e4490499cebb20e5e41 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 28 Apr 2021 22:11:42 +0200
-Subject: [PATCH] Remove dynamic exception specification to fix C++17
- compatibility
-
-The dynamic exception specifications have been deprecated in C++11
-and eventually removed in C++17 [1].  GCC-11 uses gnu++17 by default,
-causing advancecomp to fail to compile:
-
-    In file included from rezip.cc:24:
-    file.h:70:43: error: ISO C++17 does not allow dynamic exception specifications
-       70 | bool file_exists(const std::string& file) throw (error);
-          |                                           ^~~~~
-    file.h:71:75: error: ISO C++17 does not allow dynamic exception specifications
-       71 | e(const std::string& path, const char* data, unsigned size) throw (error);
-          |                                                             ^~~~~
-    ...
-
-Since there is really no gain from having these specifications anymore,
-just remove them to fix the build.
-
-[1] https://en.cppreference.com/w/cpp/language/except_spec
----
- file.cc | 26 +++++++++++++-------------
- file.h  | 24 ++++++++++++------------
- 2 files changed, 25 insertions(+), 25 deletions(-)
-
-diff --git a/file.cc b/file.cc
-index 1e90348..d676d25 100644
---- a/file.cc
-+++ b/file.cc
-@@ -98,7 +98,7 @@ void infopath::readonly_set(bool Areadonly)
- /**
-  * Check if a file exists.
-  */
--bool file_exists(const string& path) throw (error)
-+bool file_exists(const string& path)
- {
- 	struct stat s;
- 	if (stat(path.c_str(), &s) != 0) {
-@@ -114,7 +114,7 @@ bool file_exists(const string& path) throw (error)
- /**
-  * Write a whole file.
-  */
--void file_write(const string& path, const char* data, unsigned size) throw (error)
-+void file_write(const string& path, const char* data, unsigned size)
- {
- 	FILE* f = fopen(path.c_str(), "wb");
- 	if (!f)
-@@ -134,7 +134,7 @@ void file_write(const string& path, const char* data, unsigned size) throw (erro
- /**
-  * Read a whole file.
-  */
--void file_read(const string& path, char* data, unsigned size) throw (error)
-+void file_read(const string& path, char* data, unsigned size)
- {
- 	file_read(path, data, 0, size);
- }
-@@ -142,7 +142,7 @@ void file_read(const string& path, char* data, unsigned size) throw (error)
- /**
-  * Read a whole file.
-  */
--void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error)
-+void file_read(const string& path, char* data, unsigned offset, unsigned size)
- {
- 	FILE* f = fopen(path.c_str(), "rb");
- 	if (!f)
-@@ -166,7 +166,7 @@ void file_read(const string& path, char* data, unsigned offset, unsigned size) t
- /**
-  * Get the time of a file.
-  */
--time_t file_time(const string& path) throw (error)
-+time_t file_time(const string& path)
- {
- 	struct stat s;
- 	if (stat(path.c_str(), &s)!=0)
-@@ -178,7 +178,7 @@ time_t file_time(const string& path) throw (error)
- /**
-  * Set the time of a file.
-  */
--void file_utime(const string& path, time_t tod) throw (error)
-+void file_utime(const string& path, time_t tod)
- {
- 	struct utimbuf u;
- 
-@@ -192,7 +192,7 @@ void file_utime(const string& path, time_t tod) throw (error)
- /**
-  * Get the size of a file.
-  */
--unsigned file_size(const string& path) throw (error)
-+unsigned file_size(const string& path)
- {
- 	struct stat s;
- 	if (stat(path.c_str(), &s)!=0)
-@@ -204,7 +204,7 @@ unsigned file_size(const string& path) throw (error)
- /**
-  * Get the crc of a file.
-  */
--crc_t file_crc(const string& path) throw (error)
-+crc_t file_crc(const string& path)
- {
- 	unsigned size = file_size(path);
- 
-@@ -227,7 +227,7 @@ crc_t file_crc(const string& path) throw (error)
- /**
-  * Copy a file.
-  */
--void file_copy(const string& path1, const string& path2) throw (error)
-+void file_copy(const string& path1, const string& path2)
- {
- 	unsigned size;
- 
-@@ -249,7 +249,7 @@ void file_copy(const string& path1, const string& path2) throw (error)
- /**
-  * Move a file.
-  */
--void file_move(const string& path1, const string& path2) throw (error)
-+void file_move(const string& path1, const string& path2)
- {
- 	if (rename(path1.c_str(), path2.c_str())!=0
- 		&& errno==EXDEV) {
-@@ -271,7 +271,7 @@ void file_move(const string& path1, const string& path2) throw (error)
- /**
-  * Remove a file.
-  */
--void file_remove(const string& path1) throw (error)
-+void file_remove(const string& path1)
- {
- 	if (remove(path1.c_str())!=0) {
- 		throw error() << "Failed remove of " << path1;
-@@ -281,7 +281,7 @@ void file_remove(const string& path1) throw (error)
- /**
-  * Rename a file.
-  */
--void file_rename(const string& path1, const string& path2) throw (error)
-+void file_rename(const string& path1, const string& path2)
- {
- 	if (rename(path1.c_str(), path2.c_str())!=0) {
- 		throw error() << "Failed rename of " << path1 << " to " << path2;
-@@ -409,7 +409,7 @@ string file_adjust(const string& path) throw ()
- /**
-  * Make a drectory tree.
-  */
--void file_mktree(const std::string& path) throw (error)
-+void file_mktree(const std::string& path)
- {
- 	string dir = file_dir(path);
- 	string name = file_name(path);
-diff --git a/file.h b/file.h
-index 1b0cf85..49429b5 100644
---- a/file.h
-+++ b/file.h
-@@ -67,18 +67,18 @@ typedef unsigned crc_t;
- crc_t crc_compute(const char* data, unsigned len);
- crc_t crc_compute(crc_t pred, const char* data, unsigned len);
- 
--bool file_exists(const std::string& file) throw (error);
--void file_write(const std::string& path, const char* data, unsigned size) throw (error);
--void file_read(const std::string& path, char* data, unsigned size) throw (error);
--void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error);
--time_t file_time(const std::string& path) throw (error);
--void file_utime(const std::string& path, time_t tod) throw (error);
--unsigned file_size(const std::string& path) throw (error);
--crc_t file_crc(const std::string& path) throw (error);
--void file_copy(const std::string& path1, const std::string& path2) throw (error);
--void file_move(const std::string& path1, const std::string& path2) throw (error);
--void file_remove(const std::string& path1) throw (error);
--void file_mktree(const std::string& path1) throw (error);
-+bool file_exists(const std::string& file);
-+void file_write(const std::string& path, const char* data, unsigned size);
-+void file_read(const std::string& path, char* data, unsigned size);
-+void file_read(const std::string& path, char* data, unsigned offset, unsigned size);
-+time_t file_time(const std::string& path);
-+void file_utime(const std::string& path, time_t tod);
-+unsigned file_size(const std::string& path);
-+crc_t file_crc(const std::string& path);
-+void file_copy(const std::string& path1, const std::string& path2);
-+void file_move(const std::string& path1, const std::string& path2);
-+void file_remove(const std::string& path1);
-+void file_mktree(const std::string& path1);
- 
- std::string file_temp(const std::string& path) throw ();
- std::string file_randomize(const std::string& path, int n) throw ();
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index a856ce6555a0..da2a1722e380 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -2,4 +2,4 @@ AUX afio-2.5.1-control-file-warning-fix.patch 776 BLAKE2B 6502ffa8200ef12394fe68
 AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 EBUILD afio-2.5.1-r2.ebuild 742 BLAKE2B 2665b0e6e1dd7388932b2e37ad74e0b4591f7cb8a936e6c0f956308f92a36daac92117059e59db4079819f3383a292c9784c4bfa87c4db8c27cd835e7ebcda4a SHA512 8e48103ca84a1260d7488de7e024e0d280c4dff72df5ac168d5c3849c9a37b8e2efaacd1c099f2d3c4a60b96f2976fecc9bd076249606ee225ebe35471316636
-MISC metadata.xml 592 BLAKE2B e32a69571a58e56104e38bdd515f908e74cc4fc60b90eb4187d96f91aada8ae1529f54e9b0a70f740440a66fff617a63ae4ae09b18f7d02c9c4c79638ccaf4be SHA512 9560a45e2f5139155c1a0ad0e33abb2d0c6d08ca3a0e70b3462319ae93e538a4741ef43357cad920013fc2142b81a78f1f54d637d44a20f03546165537b6429a
+MISC metadata.xml 520 BLAKE2B 7533d41c720f35063cd8a6e2970a60412b8011d5464156033b3a83022c5b88b70f332b652df19aa7733ae17ec61ddb575212b73e935915d727157192a5ad9008 SHA512 0ea6bace9240349c591e7fc9b22ac9d3800dd2c483b02026ff8296d923d8d2df15e6347f25a5f9071732a8fb81613a93878d08b01476f113377d339fff513fdf
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
index e87efba35be1..b18457cad81f 100644
--- a/app-arch/afio/metadata.xml
+++ b/app-arch/afio/metadata.xml
@@ -9,7 +9,4 @@
 		tar or cpio archives. Afio is best used as an 'archive engine' in a backup
 		script.
 	</longdescription>
-	<upstream>
-		<remote-id type="freshmeat">afio</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index 761813559e52..10e7580ccfb6 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -4,5 +4,5 @@ AUX arj-3.10.22-implicit-declarations.patch 833 BLAKE2B 7162e7851dca555a1d904642
 AUX arj-3.10.22-interix.patch 1257 BLAKE2B 167249b08e73a1114f58781d732288397ba18030c00b3c0df99f5610946569de63fa5d5c2dcf6840cbc7785cc0f22948361ab5d21da6692fb0915a925f308804 SHA512 0ed64bd6d37dcca43651b32623881aaf94525c8dde82515f03ef748a642945366fe2da732aed7ac7c1f6165a6b03fd3b50f078afc135546704d06179d99227cd
 DIST arj_3.10.22-15.debian.tar.xz 16756 BLAKE2B f9bf45f103cf3f76867006bdbd61f6c5e04d75d9543e99e01304b285b8858034c60f38ea76bc8cdc502b44a8515fb7a04fd9d2f3d07f9ea19e1c5d3a4d448eff SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688
 DIST arj_3.10.22.orig.tar.gz 431467 BLAKE2B e40409b9f88a1a7e56de4200b464c3dc420659fa3991bf904ca86bbdb428fc8d17f095b9eabf3170712458ef2136e96545810201cc6755c15e45d4ae9a5e3a03 SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
-EBUILD arj-3.10.22-r7.ebuild 1270 BLAKE2B d5e967cfa0ca78e2ad3f96a2c5d5b2e663fc7d36fbaa66d300a5bbd197ef8116cda796143229e6073ea2cdd0f5c159eee9e7ec33009bedd9fbb222e731250948 SHA512 992bc9a9dba7d0fb994f1c1df08886bac444a3ab70065f06b4dcf6ed24b9a8865466f176c4b812159ca8291a54c1cd2b58f6866be7167aead2a3b0f40a026bf1
+EBUILD arj-3.10.22-r8.ebuild 1115 BLAKE2B 77d6fd8800816cbcbd56beac2620a033ca035ef3f794b0b791edcd623f112ea1a57b722f67950431c0314d3f076b56e38916463ba2a5bbfae7485c370ac37982 SHA512 02af17820211da638e23cdac44f9c536a4596b1df6c30b39dbb85679c1cf3c80e56f4e41729908f7cdd3fb3d1c8add2ba0e9f64901eee6b88710dc139e894508
 MISC metadata.xml 241 BLAKE2B 5c1b54358586f7e559555097bc0ed2152b557cd35dd5b28aeafb7992d810f57674e874a948a0345871cde19486fe6849ff5a5091e7ea67078f3295b935eb3e99 SHA512 5a82a671e4d5f34d32978ebd8acfc78e44d1d93df5e1c2eada2c3dc04d1e2db00c998346f1a71b6eeb0e0eaa964f70a33f7db6a73d551934d190f6e73baba28a
diff --git a/app-arch/arj/arj-3.10.22-r7.ebuild b/app-arch/arj/arj-3.10.22-r8.ebuild
index 25397e35a751..571c5777b086 100644
--- a/app-arch/arj/arj-3.10.22-r7.ebuild
+++ b/app-arch/arj/arj-3.10.22-r8.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 toolchain-funcs
 
@@ -10,13 +10,13 @@ MY_P="${PN}_${PV}"
 
 DESCRIPTION="Utility for opening arj archives"
 HOMEPAGE="http://arj.sourceforge.net/"
-SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/a/arj/${MY_P}-${PATCH_LEVEL}.debian.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-implicit-declarations.patch"
@@ -26,22 +26,13 @@ PATCHES=(
 	"${FILESDIR}/${P}-interix.patch"
 )
 
-DOCS=(
-	doc/compile.txt
-	doc/debug.txt
-	doc/glossary.txt
-	doc/rev_hist.txt
-	doc/xlation.txt
-)
+DOCS=( doc/compile.txt doc/debug.txt doc/glossary.txt doc/rev_hist.txt doc/xlation.txt )
 
 src_prepare() {
 	default
 	cd gnu || die 'failed to change to the "gnu" directory'
 	echo -n "" > stripgcc.lnk || die "failed to disable stripgcc.lnk"
 
-	# This gets rid of the QA warning, but should be fixed upstream...
-	mv configure.{in,ac} || die 'failed to move configure.in to configure.ac'
-
 	eautoreconf
 }
 
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index d8d9c902a1d3..6facc2a343fb 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,5 +1,7 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
+DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B 571c95c541b3def87351a232b69bd291dc0d50b9676a08a7a2a0a757d5fc993bad72efab1dc29c37302b2126370b5356d1571b232c9b520c43ea176247bbfc9b SHA512 e159729140a4e9046ec5a850dd7fb1d3f22c32adfc6b54748512abcf7aac0a266852a769814aea9a0219b2076c35cfa7b3b0dd33c6dfc1a0b05dbbb315f69ef9
-EBUILD brotli-9999.ebuild 1675 BLAKE2B b635a6584c6e65a0cb16cf1be81c1ee37ec4b2c8329472c70e647c0deb4fdae2118aec6d7d18a34f9d0bd3899dd9a1c316367787fd2f6f94506ad0bab3c08a4e SHA512 54198a4b847cbc1c71e6205201061dc3ab54dda00d9cd64d39cf36db8db31a56d520809a65813a791c210df8686213cce2f8207687a76028489990842ffee24c
-MISC metadata.xml 687 BLAKE2B 938125e16f4cd24075ce4c1bd57205def9244b21e1a07c90401af301bd00b4468190060acddccd02367dfb2e70f9ee9a1503794704172d6851554b550febb9c1 SHA512 930cacd9d5ea0665cfe93948a1b651a3974938c1513acb76fd0c4bd651c4aa26b1157ffae7257499235c4f4ef835ba5118f3986423b5c7905d3c32886ec31540
+EBUILD brotli-1.0.9-r4.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71
+EBUILD brotli-9999.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71
+MISC metadata.xml 770 BLAKE2B 6e73f34b47e5edbb8007e253191dbc0dd399d1d3f9f1817df851fa6f56bb6e71c90ffed925e5251041a479d0ff6e8084734c45a0d8c56a914a890992c121fedc SHA512 5b43dbaadb8a7c53ec111335ffc57682ade5f30beba4e98cb53a64244fb835baaf3394ffa210763ed36b0abe6c444263117499d4046c4138d644e924683d931a
diff --git a/app-arch/brotli/brotli-1.0.9-r4.ebuild b/app-arch/brotli/brotli-1.0.9-r4.ebuild
new file mode 100644
index 000000000000..c61d17cd14ae
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.9-r4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit cmake-multilib distutils-r1
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="
+		https://github.com/google/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		test? (
+			https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz
+		)
+	"
+fi
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli/"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+SLOT="0/$(ver_cut 1)"
+IUSE="python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+PATCHES=( "${FILESDIR}/${PV}-linker.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	cmake-multilib_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	eunittest -s python -p "*_test.py"
+}
+
+src_test() {
+	cmake-multilib_src_test
+	use python && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	use python && distutils-r1_src_install
+}
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 68bd7f1fb826..c61d17cd14ae 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -4,7 +4,9 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL="1"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit cmake-multilib distutils-r1
 
 if [[ ${PV} == *9999* ]] ; then
@@ -12,24 +14,35 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/google/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		test? (
+			https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz
+		)
+	"
 fi
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
+HOMEPAGE="https://github.com/google/brotli/"
 
 LICENSE="MIT python? ( Apache-2.0 )"
 SLOT="0/$(ver_cut 1)"
 IUSE="python static-libs test"
-
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 RESTRICT="!test? ( test )"
 
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
+
 DOCS=( README.md CONTRIBUTING.md )
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PV}-linker.patch" )
 
 src_prepare() {
 	cmake_src_prepare
@@ -42,26 +55,21 @@ multilib_src_configure() {
 	)
 	cmake_src_configure
 }
+
 src_configure() {
 	cmake-multilib_src_configure
 	use python && distutils-r1_src_configure
 }
 
-multilib_src_compile() {
-	cmake_src_compile
-}
 src_compile() {
 	cmake-multilib_src_compile
 	use python && distutils-r1_src_compile
 }
 
 python_test() {
-	esetup.py test || die
+	eunittest -s python -p "*_test.py"
 }
 
-multilib_src_test() {
-	cmake_src_test
-}
 src_test() {
 	cmake-multilib_src_test
 	use python && distutils-r1_src_test
@@ -69,8 +77,11 @@ src_test() {
 
 multilib_src_install() {
 	cmake_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
 }
+
 multilib_src_install_all() {
 	use python && distutils-r1_src_install
 }
diff --git a/app-arch/brotli/metadata.xml b/app-arch/brotli/metadata.xml
index 98d133815abb..f2f000701cc0 100644
--- a/app-arch/brotli/metadata.xml
+++ b/app-arch/brotli/metadata.xml
@@ -5,6 +5,9 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
   <longdescription>
     Brotli is a generic-purpose lossless compression algorithm that
     compresses data using a combination of a modern variant of the
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 68a9f4e9abe0..a4e09160e4fb 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -7,6 +7,6 @@ AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a0
 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
-EBUILD bzip2-1.0.8-r1.ebuild 3571 BLAKE2B 85b9c0d0cc7ea3b3b747595f00f42abe8db94b4f5ec48616f5c8b419dab1184afcc3b0e65fbb0fa768328b5d060c02c4d4e1c732ef2cbe8a484a2432ee53e11f SHA512 b99fcec0e6c9a04e3296d171c50e8ed114bf5adaf8dde009f6377ccf5580deb29c5e55ee62a97400c599b4beea79c486292c55657e99b2a7e73af0140a665aac
+EBUILD bzip2-1.0.8-r1.ebuild 3670 BLAKE2B bae4ee31bb17aff53375ada6fe1c7cf0e9bffc10cdf4175a4b9f9d70557c3ea58de50a8bd57ec54c2913e38ac824335a7a22224dcafe99e594a57dfc0475ad7b SHA512 35203cd9cfd48b6802476c3c14b91d05ba47ea9f813611b17c2a112dc31f08123712d97a51c974ccdcb693e49b496e36b20ea012c86ee17d6f3dd971f1a74c8a
 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 a3ee12f8c36c..62a13959bff9 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -67,6 +67,11 @@ multilib_src_compile() {
 	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
 }
 
+multilib_src_test() {
+	cp "${S}"/sample* "${BUILD_DIR}" || die
+	bemake -f "${S}"/Makefile check
+}
+
 multilib_src_install() {
 	into /usr
 
diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest
new file mode 100644
index 000000000000..348ab90bc3de
--- /dev/null
+++ b/app-arch/bzip3/Manifest
@@ -0,0 +1,7 @@
+DIST bzip3-1.1.2.tar.xz 256108 BLAKE2B a5f91fe2760fd4f7f79b908d735d613823dedac23e59950317c26f50d0a657dde042e5a08d401984c14d686d33726caa81e4b34cbca26e28c57a96f61e4f23ab SHA512 8b179bfe9b1b67c516580934cd12a640c86b3f9525c5e7902672051d80198cb91aa8880a4ca3ce14a879d26873405c713f1a0c6a33138d21f4d51c9e93d8fac5
+DIST bzip3-1.1.3.tar.xz 257212 BLAKE2B cc94b4c2caa3123b2c775d66143757bcaea7ead6d8a130391d6714583cfcb92fffca47ad80ffc8b5a01483f6cbfab7101c96521cd97e740116c9e10c64c358e8 SHA512 d48695d066ddc79e81c189f8c06e999f8eb8191982db8908f7bd4dfaa0f8fab1ba57e41664962cc6e8611f8398603918e4bd4d58efff2f04292ea54983a6f38d
+DIST bzip3-1.1.4.tar.xz 260404 BLAKE2B ddd087b631c9d5945dea0f4da280dfd74fd303eaed10f7553f770ca18b3b65f00718c073d87e565602a9ed02f4604a0d2dda0ff42cbd38f593bb012f5362cc5c SHA512 86f26b290001d255ad1d2378b5e2d59f9c85e1625ba5d7dca86acd544bb80af95b3379c215a03e0f81f77b7972a852d37746c1028464f404d28a6f9b707383b8
+EBUILD bzip3-1.1.2-r1.ebuild 768 BLAKE2B 7165efac61206050bdbf4974ffe0220b9814b65fb1979cd8631fb59f44967857751a04e225f2aadece56e43df97d94816a9822b6760aedb730618cfcdf6a7652 SHA512 56b2bd84a97d60624116096829927f65d35f463ba7e3a955916a6996adbf18d3dad4bc297e5bc466fdffc2a033c8a680a6eaaed2c8ff345a0dbbb23bfb3c3b3c
+EBUILD bzip3-1.1.3-r1.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+EBUILD bzip3-1.1.4.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50
diff --git a/app-arch/bzip3/bzip3-1.1.2-r1.ebuild b/app-arch/bzip3/bzip3-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..3854b7aad967
--- /dev/null
+++ b/app-arch/bzip3/bzip3-1.1.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A better and stronger spiritual successor to BZip2"
+HOMEPAGE="https://github.com/kspalaiologos/bzip3"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
+else
+	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0"
+
+src_configure() {
+	# ./configure script will default to Clang if it is found on the system,
+	# force the use of CC selected by the user with CC=$(tc-getCC)
+	econf CC=$(tc-getCC)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-arch/bzip3/bzip3-1.1.3-r1.ebuild b/app-arch/bzip3/bzip3-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..0d9329da48ca
--- /dev/null
+++ b/app-arch/bzip3/bzip3-1.1.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A better and stronger spiritual successor to BZip2"
+HOMEPAGE="https://github.com/kspalaiologos/bzip3"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
+else
+	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0"
+
+src_configure() {
+	# ./configure script will default to Clang if it is found on the system,
+	# force the use of CC selected by the user with CC=$(tc-getCC)
+	econf CC=$(tc-getCC)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-arch/bzip3/bzip3-1.1.4.ebuild b/app-arch/bzip3/bzip3-1.1.4.ebuild
new file mode 100644
index 000000000000..0d9329da48ca
--- /dev/null
+++ b/app-arch/bzip3/bzip3-1.1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A better and stronger spiritual successor to BZip2"
+HOMEPAGE="https://github.com/kspalaiologos/bzip3"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
+else
+	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0"
+
+src_configure() {
+	# ./configure script will default to Clang if it is found on the system,
+	# force the use of CC selected by the user with CC=$(tc-getCC)
+	econf CC=$(tc-getCC)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-arch/bzip3/metadata.xml b/app-arch/bzip3/metadata.xml
new file mode 100644
index 000000000000..5dee14e0081f
--- /dev/null
+++ b/app-arch/bzip3/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    A better, faster and stronger spiritual successor to BZip2. Features higher
+    compression ratios and better performance thanks to a order-0 context
+    mixing entropy coder, a fast Burrows-Wheeler transform code making use of
+    suffix arrays and a RLE with Lempel Ziv+Prediction pass based on LZ77-style
+    string matching and PPM-style context modeling.
+    Like its ancestor, BZip3 excels at compressing text or code.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/kspalaiologos/bzip3/issues/</bugs-to>
+    <remote-id type="github">kspalaiologos/bzip3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 04d23f59a725..5b2a64d9e3fe 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -5,6 +5,6 @@ DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622
 DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
 EBUILD cabextract-1.8.ebuild 1108 BLAKE2B ac14bcc3a82f56b70258739c6c7823c83d20d080c49f62efc32de8104516cbd8dc34c06c63dbbc628b44103f7f50f73da09c8521ba468745fa7487a9661d17d8 SHA512 075916d28ef1e018f3ca9aa453be855e22b22b1a09e98615368e10a2ef1329c070f0c9f25b09c03ead7222c98624196ca73727fc3eff0877b772fb790b78d0f2
 EBUILD cabextract-1.9-r2.ebuild 1648 BLAKE2B 5c56e7d754c52d341d5ba291898befa3f61ede8ece49ff867dbde85a0315d7928770095386d5b0f15ddaeb729ab2635f0cd140fb4286661263bcba58273538f6 SHA512 ddd7bc7ad0328f148005f5550eee24cacb943a17a0e7333fef3ee1cf8e83125fbab7958ee4e30c6ea9b8ecf79af202fb69c3d4b7b449a623354acb0b8092d2b2
-EBUILD cabextract-1.9.1.ebuild 1554 BLAKE2B a8fe49edb15d5667ca3bd4448cd281eeb6b4ca41dd1442217443754107ee11508c190ca0445b094f57842f491ecde11685eb2b8a08e739e07cb06b397768567a SHA512 6df79bac4ef3b86118820c51c25d4ef214e5bebb14feb62531aa8b331026390fb1265ff5da81c23544155b7af8e8fcdbd63321eaeb17a09d349f2665162364e7
+EBUILD cabextract-1.9.1.ebuild 1561 BLAKE2B 876a0ff86a4b9c3acde92aee219dfbdea9c4b839022f4078b87d3fd0e20722db5618a53721bfbb41cc48fa3a9f1417bb8c70733af3c1b30d20f3181b8d9dc262 SHA512 7859df366f5784b02d62f90fc3d7bf875ac6d0adaf9757c6a071a22d3f768ebf27baa2480a177be407af82e0d73ba80cb4868c3a13f69a30f28298cd8ddf2f81
 EBUILD cabextract-9999.ebuild 1542 BLAKE2B d90ce5df206272e2b8529409d494f606e70106e90de56ef3ec72e64cbad7f0b26a1b16c7b5195d3d146de41c5748b24c02ddb94d5734b9a8ed59a8d27914c450 SHA512 db05f7fbce13f706b5f24462e563d0d790f57d3f92e570705721b06df703ca62e1163078c3b5e5bd184c207a2e23fb45d37d1fc48eedb02ed43de406f2944cc7
 MISC metadata.xml 498 BLAKE2B fc12843653eb13c750e7615f65ac74aebbbe5c4096ec0a9e202e732ae6c11574f5a9d5039467d6a9a0298154f7742077172cd03400e01a2ff3e1c7affd658047 SHA512 e32632e4a68e80343953f5cdc77d3fcd542a5a5452495f16c869a6093cc16905d8179a5f5e5497e7f0a2c5fc47f41a1d82b91db4d7dc92b0fff8c08ba10dfbea
diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
index 05ef772888ec..47ed62fb64f9 100644
--- a/app-arch/cabextract/cabextract-1.9.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/csnappy/Manifest b/app-arch/csnappy/Manifest
new file mode 100644
index 000000000000..2b5983a45357
--- /dev/null
+++ b/app-arch/csnappy/Manifest
@@ -0,0 +1,4 @@
+AUX csnappy-0_pre20220804-fix-tests.patch 2008 BLAKE2B 4d6715a5f22018635cf9d4ab59b059b62c5be9643ac7613cb1de4bacb85039072f53a989b2c7e39ec6733bf9e30fedf59544b1ba5a27c9025ec18eb6251e3aa8 SHA512 e6bd51d21ca9a8feb9ea128289572c1ccc35dc32ef13c36248337ca031685874dd76aff180ea7a8bd01869a5235c6ce2ec744aa54e4dd8c6c6fd09df6b668861
+DIST csnappy-0_pre20220804.tar.gz 594988 BLAKE2B ce82ef7945ba3110d0d2878d4fcd3d48631f260dad94c1b40f7811de17e60568b2934d33e43966f559b0d840f5eed659bde84eab46954679754e9de5306508a1 SHA512 53f602c58a3a9932ac580412d90f3aa7f820cb9bbc9e2dec240dd28de55210fd17ac61a5f8e4a2cebffe2914837c7cabba1061536abd96e35da57c799e8ee7b7
+EBUILD csnappy-0_pre20220804.ebuild 1180 BLAKE2B dbc41a8d23053f4149d183e373046845e49746da562de45624c972ba5f52e9c39ccb3d754d1fdf7e4af4ae723988dba04de4325a69e33fae672aa67173ec3935 SHA512 3e41debf9a0f8689d172a7010a1112c18a020a5b0e74873ea540dba159ea82cad0291abcedfd7c24bf48cf6d95a764a298af0e5571f49f6133fa0d6e593ef7fc
+MISC metadata.xml 318 BLAKE2B ea1a70433187f4d4b5c9d7d66e7c7360bb4b509bbc2dc4dc0d619b7e84bf7ed68384093b8beb85b8ce5199a6193009d1c4b61a9e5c9141a1908c10ef616fe8ea SHA512 cb8eae4d09adf7837f423c8eb7fee010b2287bd3b4a798d1322f9f69ea538e662ab3bd3ca70603316410728ba3626a9e97ae5b73c61789d466aa2a0ebc9853bf
diff --git a/app-arch/csnappy/csnappy-0_pre20220804.ebuild b/app-arch/csnappy/csnappy-0_pre20220804.ebuild
new file mode 100644
index 000000000000..9c7545bb5cb6
--- /dev/null
+++ b/app-arch/csnappy/csnappy-0_pre20220804.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_COMMIT="6c10c305e8dde193546e6b33cf8a785d5dc123e2"
+
+DESCRIPTION="Google's snappy compression library for the Linux Kernel"
+HOMEPAGE="https://github.com/zeevt/csnappy"
+SRC_URI="https://github.com/zeevt/csnappy/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+# https://github.com/zeevt/csnappy/issues/21
+LICENSE="BSD"
+# 0/${PV} b/c of the SONAME situation (see below).
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# https://github.com/zeevt/csnappy/issues/33
+# No SONAME yet.
+QA_SONAME="usr/lib.*/libcsnappy.so"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_pre20220804-fix-tests.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		libcsnappy.so
+}
+
+src_test() {
+	# We don't want to run the Valgrind tests as it's fragile in sandbox
+	# and makes life harder for some arches.
+	emake CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		check_unaligned_uint64 \
+		cl_test
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+}
diff --git a/app-arch/csnappy/files/csnappy-0_pre20220804-fix-tests.patch b/app-arch/csnappy/files/csnappy-0_pre20220804-fix-tests.patch
new file mode 100644
index 000000000000..e4d11f7d9021
--- /dev/null
+++ b/app-arch/csnappy/files/csnappy-0_pre20220804-fix-tests.patch
@@ -0,0 +1,41 @@
+https://github.com/zeevt/csnappy/pull/40
+
+From 60ac30054eae4bbc50f90f8228ac53d014400619 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 16 Dec 2021 14:24:26 +0100
+Subject: [PATCH] Fix parallel tests by only testing the current optimization
+ level
+
+https://github.com/zeevt/csnappy/issues/39
+--- a/Makefile
++++ b/Makefile
+@@ -34,25 +34,14 @@ check_leaks: cl_tester
+ 	LD_LIBRARY_PATH=. valgrind --leak-check=full --show-reachable=yes ./cl_tester -c <testdata/urls.10K >/dev/null
+ 	LD_LIBRARY_PATH=. valgrind --leak-check=full --show-reachable=yes ./cl_tester -S d
+ 
+-check_unaligned_uint64:
++check_unaligned_uint64: cl_tester
+ 	gzip -dc <testdata/unaligned_uint64_test.snappy.gz >testdata/unaligned_uint64_test.snappy
+ 	gzip -dc <testdata/unaligned_uint64_test.bin.gz >testdata/unaligned_uint64_test.bin
+-	EXTRA_TEST_CFLAGS="-O0" make check_unaligned_uint64_extra_cflags
+-	EXTRA_TEST_CFLAGS="-O1" make check_unaligned_uint64_extra_cflags
+-	EXTRA_TEST_CFLAGS="-O2" make check_unaligned_uint64_extra_cflags
+-	EXTRA_TEST_CFLAGS="-O3" make check_unaligned_uint64_extra_cflags
+-	EXTRA_TEST_CFLAGS="-O2 -march=native" make check_unaligned_uint64_extra_cflags
+-	EXTRA_TEST_CFLAGS="-O3 -march=native" make check_unaligned_uint64_extra_cflags
+-	rm -f testdata/unaligned_uint64_test.snappy testdata/unaligned_uint64_test.bin
+-
+-check_unaligned_uint64_extra_cflags:
+-	make clean
+-	make cl_tester
+ 	rm -f tmp
+ 	LD_LIBRARY_PATH=. ./cl_tester -d testdata/unaligned_uint64_test.snappy tmp
+-	diff testdata/unaligned_uint64_test.bin tmp >/dev/null && echo "${EXTRA_TEST_CFLAGS} ok"
+-	make clean
++	diff testdata/unaligned_uint64_test.bin tmp >/dev/null && echo "Unaligned test is ok"
+ 	rm -f tmp
++	rm -f testdata/unaligned_uint64_test.snappy testdata/unaligned_uint64_test.bin
+ 
+ libcsnappy.so: csnappy_compress.c csnappy_decompress.c csnappy_internal.h csnappy_internal_userspace.h
+ 	$(CC) $(CFLAGS) $(EXTRA_TEST_CFLAGS) -fPIC -DPIC -c -o csnappy_compress.o csnappy_compress.c
+
diff --git a/app-arch/csnappy/metadata.xml b/app-arch/csnappy/metadata.xml
new file mode 100644
index 000000000000..d377f25e89c3
--- /dev/null
+++ b/app-arch/csnappy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zeevt/csnappy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index ea0f72baee43..7b088244873b 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 1699 BLAKE2B 79545465856fc52234172d35976b482e52b2d059506bfb86e0e35f1e2ca1dde115161d3cf84feefe916ed2c5bb71db895249aa5c29bee92237e30cc0e56af4bc SHA512 fad518471e6e1e6235915b0661dcdf4d07a94e78576caf8db3adcd830de7e741217e24ae6b061084bfb116182178625d681c6fe7a0b8bf48b758d3ab4ec461e7
+EBUILD engrampa-1.24.2.ebuild 1706 BLAKE2B 22666f6f6a2c1ccc1171723e8787e1078592f9a1576889608a54f64af215805ff9a0b69b5c2f0f3c12a3f6958d63dff8a3906614b5d4d56c6902b3b7410858cc SHA512 3ba6d1636cd457bcd545c19225d0a4074c835a61ad455e5de5e554ba73f2db9b11f68b0782517e06891093ad29a23fb566e2f7e9ab8c706e1c9b2e6adaee6284
 MISC metadata.xml 591 BLAKE2B 9a58776d887b3437f4edccb14ba8cd85139acfadece0e4c7a9c7ed7f5f02d5276fc86d30affeb1b605eba15a8ed34a7c40847564436c320e2a8cef5a313de12f SHA512 b0ae271bbdb0046308b9e06df3259bb5dc9d43e406830e000e4513d817fddccfee4b0af956f1c218ad6800e21d79682deddb4561789a42226ee1afa005cc7b3b
diff --git a/app-arch/engrampa/engrampa-1.24.2.ebuild b/app-arch/engrampa/engrampa-1.24.2.ebuild
index 5637db196c21..1e11f0dc6087 100644
--- a/app-arch/engrampa/engrampa-1.24.2.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.2.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=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate optfeature readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 11733d2e8fae..c5151016c8b7 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,4 @@
 AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
-DIST file-roller-3.40.0.tar.xz 876424 BLAKE2B fa2483677869d5a6b4ac91938eac6bf09965177ffa07bab76a77a0be58e331466f939e7e0728d5eeeb5703c6ff12f178f8080922f8ae9d726e77700bbbd518ed SHA512 224dbe4f4358aa62589d084d67244ad8d65d718f9b6adf708ba1425b38fca68e08b07a6163f66d95c6acfd164b6062939cfeb27873ea41353e0551e322b0eb26
 DIST file-roller-3.42.0.tar.xz 878968 BLAKE2B af3a8bb566a0549434f20911315358dbcfb98aab17ca47adaad166f620fc3b8cfc6b60301842a55a0d35ca29f6317b16d07497de759b55bc42b61100e7357066 SHA512 ad151e1dc6546ca45550ab4c7384fb89e91dc2fc17a29437922192fefd5cbcd115d1f064e090dac48ae3fca33709a54bac918cbe03cbfd0e6fc3554913dd8322
-EBUILD file-roller-3.40.0.ebuild 2199 BLAKE2B 5acf854c76e94908a8d5af013d298df9827ab447208549623c2aa026c95bc105f5d10911aeabba3e78dcd3f313e1768c69b9a064875107176e048af5481be3c4 SHA512 fb686a7aa3ef1c5a5bd382a1b8c3556b59d0be208539b043f7da38092aa4136a3a9e272abbca962cee9a08827e3a2be63f744ee7a416ea76e31de50e70e38f6e
-EBUILD file-roller-3.42.0.ebuild 2247 BLAKE2B 956e33e72aa27d2256aaf8d07ceb1b08c17bd4e5837fc5ecd34c6a526b7561b4f0a7397d3171afb000126f2e22507c716faa2e469956a4a3024658adc54ce71e SHA512 8773e9918958d972133b4333927f74a733ad4c05e32b1f7cae8b750205cf7baaa6e26019fa1414aba780931e123990276f3e83691b05ba97c8fbb3fe41ce9689
+EBUILD file-roller-3.42.0.ebuild 2244 BLAKE2B b36266be2187e3472bd06cd572982f9cb543c31192e847b91d1921b6b9c779a7d40727d8477735146ce0666fa9de68bc725d49b0d279233877c242a62bcf74d9 SHA512 e199dd0ad875976b75c249b51e86070a0fb5f0a4d9a4af93e5e78198246f609c8d65043fe0b5541823be6c7d37543f85e35664f568f67c7b22c026a7e13472a8
 MISC metadata.xml 523 BLAKE2B 44d1f4c6636070d561c1d0fdb6bfaaae0f92b81608f52de78f6b5168ca717a7ab0c54ca24a8bde59cd7a7e0be96f195bd8f7eb5e53e820917fec5cf692cea7ec SHA512 79b172bc5f64b91f389c6dee90da6dca10705f07fd469b04486eb90d11988a07002233c0718c3f223df9fd63050b3fb17dc3d5f56b8923e47dfbcc231834fdc9
diff --git a/app-arch/file-roller/file-roller-3.40.0.ebuild b/app-arch/file-roller/file-roller-3.40.0.ebuild
deleted file mode 100644
index fbdf9bdda3b0..000000000000
--- a/app-arch/file-roller/file-roller-3.40.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify nautilus"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3.2:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-brotli  - app-arch/brotli
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-lz4     - app-arch/lz4
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zstd    - app-arch/zstd
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_feature nautilus nautilus-actions)
-		$(meson_feature libnotify notification)
-		-Dpackagekit=false
-		-Dlibarchive=enabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-arch/file-roller/file-roller-3.42.0.ebuild b/app-arch/file-roller/file-roller-3.42.0.ebuild
index 4f1ac8f72ee6..1f4a5a97cd14 100644
--- a/app-arch/file-roller/file-roller-3.42.0.ebuild
+++ b/app-arch/file-roller/file-roller-3.42.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index 5bbd79520ac4..0e5c3ed02247 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,4 +1,4 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 DIST lha-114i_p20201004.tar.gz 220541 BLAKE2B 64268deb40de67d5f4888f7d4b4529fa1b6ca02c562bd041d9edd1ac9cc74ccfa43198c79310bd354806e3095f6aba8c97256b49686feb8c713e3d8110137103 SHA512 9a9337cbb6a3d71253597750301e37163c5b495e712f2374adf2ac0d19f731ed49482a3f8b639e4c48c7ef6fa7ed9f9081516d77548e9c88ed3b9ac037efeb06
 EBUILD lha-114i_p20201004.ebuild 871 BLAKE2B d5c50e46e9bbc274afe14f3447d2a58baee3a648457b2a184bc891d98befe376f73f38d1712e36af73c2388a46ac5a0f8781f05045da383e4489cdea5d3b81fb SHA512 e7e575c584b14e736e75c60ac5afc469b776c205393860f373aca52f41ae264d61484100922488bcac46eff4b5d75e303f9284bda357be7a2b49d7e445045c0f
-MISC metadata.xml 324 BLAKE2B 0f10ee4210662db7321ded238118c911b52ceb86d17ae8475687275bd57e0aae87b6bc9c5f6544716744ccaa40963baa873aefc539c8704317b0d9530735e1fa SHA512 4b6755865a6f7442a7eee52b2bd42434cd45545afad15dbddb27bc4cf57099b4dd86896f12b0c0a881548a4cb2cb188bc85092482938b2649654bd049becea15
+MISC metadata.xml 314 BLAKE2B 4057e0abcfcc28a423ab5bda2a379438bd618a8dd47e65dc56d078be325469ac27d2099c3ef5bec092aecc124930106ccb74f9647fef2efa79b6080c320162fd SHA512 d9410431e832f45dd85c9d2d476ab3e2b8a5b322e40ba04f79a1eebe629977593543c507474d2496a822d29453b9988721ac9b1bb33a32efa6832496d75bd584
diff --git a/app-arch/lha/metadata.xml b/app-arch/lha/metadata.xml
index 6a172fe1fcf7..8d147b3c70f3 100644
--- a/app-arch/lha/metadata.xml
+++ b/app-arch/lha/metadata.xml
@@ -6,6 +6,6 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge-jp">lha</remote-id>
+		<remote-id type="osdn">lha</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index 4575d7df806c..7d7e3eb8358d 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,5 +1,7 @@
 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
+DIST lxqt-archiver-0.6.0.tar.xz 180844 BLAKE2B 99de054cb3e002aa26637149611e6f054a8a406a3751b3b79584011616a8359fa003909f5059479979ff4b36ffa6a31807702b3b79465ad9ef75dbe008d51a32 SHA512 e714969ac285969b845cc3b293bf74fd3986be09ec0315aa11aca553e432397b8b68ec3830ae009f5fa950866b299e71aa89794de5af329f7012cb2524b310df
 EBUILD lxqt-archiver-0.4.0.ebuild 1180 BLAKE2B e683fb27236235e2dce15e1d957a435be42a953585cd16b881766808e510e390b42b7b7a199d0929d4f51ed8b1de360e78e8e45537f38b5378152da4b2658f95 SHA512 0cef2d37e234144395e7569790be0a2b84b1b67568559da56769cb68dd8af92aa6220d3d6f961904a08ae573a78810f9e09a6e840b08bfbcdd9fb3a72327e3cd
 EBUILD lxqt-archiver-0.5.0.ebuild 1279 BLAKE2B cd52c45bd4b4a403e731f6cb25c28d5edf702d6f7780dc4970c066a81d2ac6d0d218cf8666f216a3e99b6cdb63eeff3333a1ac417b37f6457171fd1a63c22241 SHA512 d0167cffcc744865c55109bdbe6c13ed96c4ab40e8dc4970220345727cefcd7885c2c2599f2baa6465f59d86fc1f7644affe32be5a9d1368b9812617de1c588e
+EBUILD lxqt-archiver-0.6.0.ebuild 1283 BLAKE2B 6d4e749973382930b8679abcb40bac80548d25f021b9397a0ff09878d232dd5735f8b28a265f0ab2fa4377bd416da22195f9f9c82e6d0cb79323fe07ac22d9af SHA512 c02e0b12afbfb9f8d143a00a9a22d4c594140c55382c9832d8755b1052a44217cfac8be4fa1f7a6e867a63e71b84f3128459bfb391346028dd25a6474cf34080
 MISC metadata.xml 330 BLAKE2B 1f25c787f9b43ef0ef62206ca9ab67dfab8b95b2786fc84248541159507290229b291b9f83541adc196b58a9dcad7c0f3abd18c5c899a98978dc72403386896d SHA512 12f4638550e157da50134bf6c7cb480bd49661b9655900efdbb12a023c4bd4cd13018d7caa672096329691cf8556f89c9d13d6710463048329c8e3bd5f04f6ee
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.6.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.6.0.ebuild
new file mode 100644
index 000000000000..67b7a86eedd1
--- /dev/null
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI File Archiver"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.15:5
+	>=dev-util/lxqt-build-tools-0.11.0
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtx11extras-5.15:5
+	>=x11-libs/libfm-qt-1.1:=
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	elog "Please note that this is only a graphical front-end, and additional"
+	elog "packages are needed to have support for specific file formats."
+	elog "For example, to be able to work with the 7-Zip format, the"
+	elog "'app-arch/p7zip' package may be used."
+	elog "For the full list of supported formats, see the 'README.md' file:"
+	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index 631d31b0a925..992cf8c80d95 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,4 +1,4 @@
 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.23.ebuild 1019 BLAKE2B b31188c8add9c25c21b1601c1838c1e17cc645880ff290a0ab953c67f46f8913937633646e1c84b9347e3cac975d1f94979266d0719742591db0ffabd53d9d6f SHA512 084bb4413845c2187567f15a1cfadc902a78f4389604bb128c3c39de2837f556dc433376b093ac80e001777746aacc9ac88aae2ea90712f47c05b8675355e9a8
+EBUILD lzip-1.23.ebuild 1026 BLAKE2B b64de75c9fa2e0aae1b2222b323ddf959d16931735f0f3ea9efcea0e3648955e40a3bbba66211e2b0b6e6c5049e990adf37a35b29d86080783ca6d32a1272e6a SHA512 68e9ae85f38bcd6915d9024d1d010f57e05777a0a0188221bf60c206e1c7dbaa676e756711a5fb7805e6496f3b3041c61adeb9a95057d052713aa0e7ba19e57e
 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 41e30ddf86d8..325d1c10f21c 100644
--- a/app-arch/lzip/lzip-1.23.ebuild
+++ b/app-arch/lzip/lzip-1.23.ebuild
@@ -14,7 +14,7 @@ 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 ~loong ~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 )"
 
diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index 20d36486bd0e..b4266fe7920e 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,4 +1,4 @@
 DIST lziprecover-1.23.tar.gz 156147 BLAKE2B 71a210c7143ff6f0f8b9cce7d5a1b6f681f8331fb971fa2836dfd04ad50e732ab595a415a9b8a3020c70c884c7e7fce5c605e63e0f28ea94f2de9d5447199a83 SHA512 9f2d40311f901c2c00fa6b106a2363dfcd7b6c73ae86282733d7c3451237ee30f6d5cce035ab5ba63300eea637eeb3ac5db7e7571bdef1bef259b801b10f1c7a
 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
+MISC metadata.xml 2563 BLAKE2B 9e7d4791c066228b6c36b9937b33308cbd9419aef42a54a5222eea816d20eb97f1038a27a26ba334a653f5eb634bb84f9f2f72cfd562e74ad1cf53f18d5fcd6f SHA512 6c491a092494104dd64867e748f20500187e24b70f590eab61deda9b07ceb9416f509cae08eb6cc11472b1ead47dc24dffd88daec8f0d8b81f86d22cbc24930a
diff --git a/app-arch/lziprecover/metadata.xml b/app-arch/lziprecover/metadata.xml
index ada194fea929..fc9a5eadba79 100644
--- a/app-arch/lziprecover/metadata.xml
+++ b/app-arch/lziprecover/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index d40e1d898c4b..3744a7595e71 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -1,4 +1,4 @@
 DIST lzlib-1.13.tar.gz 130005 BLAKE2B 88721890f111c2bb1901329e9cc39e7f581c220bb58bbc93098c34984b7557a80adff236f5755057099870ba20201f6b692925080b97965b4612d221d21cb33c SHA512 b9c4e5a9aca982984b497d1da2e1f0439b37b19acaf88a02f5af114b0a65a828c5ae235b3bd4f419ce001963de38a4d03445a6a1bd93f37e783e799abd75578d
 DIST lzlib-1.13.tar.gz.sig 72 BLAKE2B 66d7a9939a5e23874a6927545f265cf315d634a166d7f22cbe4f09ab88dbae778aa9c6f77e6d5e51fbaadc9a503f735fb2bc834475089a6046782f9af22b472f SHA512 1db7a91b3a84d70874c0ec92b2764ab6805e20a351438b975f4e72dd6a1dbe5a4448d47af2bb6d056bde9c6102df375454724d536efbdaa90cd7dbf08eb01c81
-EBUILD lzlib-1.13.ebuild 1007 BLAKE2B fd716501076953a716b1285c7dd96eea2fdc6e3c2f19b1ee78595069095238f2517be0ab89086e011c10c24374cec42d654c453050a7d4c93e2a63b3b5846385 SHA512 06219ae5860999b75baabfe0b6d4a43c568b07a1fca81d5613076c7b1f8fa74f8a6c3ff5b07ad2bb8619d6da34d2febea9115a6c5db2b47c31871ec8f9f046a8
+EBUILD lzlib-1.13.ebuild 1014 BLAKE2B bfd0141d5821ec41e823007a5d5abd77f634819fbff79a46534622f63f5a047ff8ce19ae45c8b10d2e4989a95fc3619434f0a7d3a88c5eb8250eb33032f2db25 SHA512 c9835fc3505ad9ee07697b9a51a58e7d945a0df3c41eee94edafa5cbcf0bb5e75006cb5b0e1ef622d4fe5da3f2b73917dcab8b81c638931d1689b9076b3c67a1
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/lzlib/lzlib-1.13.ebuild b/app-arch/lzlib/lzlib-1.13.ebuild
index 64318adf63a6..eea92a86be8c 100644
--- a/app-arch/lzlib/lzlib-1.13.ebuild
+++ b/app-arch/lzlib/lzlib-1.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$
 
 LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
 
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index e27d2f2b98d8..54f26c92b9d2 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,4 +1,4 @@
 AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
 EBUILD pbzip2-1.1.13.ebuild 1164 BLAKE2B fce0e3e829bedd2ce3848f8aaeae60496a52aea9f73a97b434628885960a5c33a091178d6fa4eca62e6629faaea189a4ceb05a10a79be1ab79a46cbb081dde76 SHA512 cdb613064e9bdf38c4f7fb4829eac18df46bb8dab4e049b63f50e9e7c6e7268b4627a4020636c050b312805072fe816e25e104284a06ec1346635c91a49e0d98
-MISC metadata.xml 444 BLAKE2B c7669a7f662f1d8d366f431918d8a3ed04562e4972243972e929500bdc385aba996eff7ca0d656e502ec8f4a99286163f0b109fa76cb4c5137c3519d68afe080 SHA512 bf938a7e5daca814f3002e87c471a5739ea7872b63182f54e5405bfdb84a992b1c058fa7581d4d19f7c52d90cc2e8a2c62e38798dc401a77a183616e95cfc4f6
+MISC metadata.xml 360 BLAKE2B 3ea190d2d83a6dedd3e3c1f1173a16ee848115ff8f4c31a4cffdebd2401b58dc45a783545cc22f789e19092c6c648a0e0fecb74162d62d62e9395888e25d005b SHA512 9879876411d1a908f214bd93b8732762a8f5c6bb723d6eac19cf328da1466e4c7d5b81b36b2eadfcffb2d7a61205a4f01d5aa5f4d1b761c78094925dbd645823
diff --git a/app-arch/pbzip2/metadata.xml b/app-arch/pbzip2/metadata.xml
index 7c03138eba00..9b7026440d3b 100644
--- a/app-arch/pbzip2/metadata.xml
+++ b/app-arch/pbzip2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="symlink">Install symlinks which override <pkg>app-arch/bzip2</pkg> implementation</flag>
 	</use>
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index aa75bd890c78..0d1b85572415 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,5 +1,5 @@
 DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
 DIST pigz-2.7.tar.gz 108102 BLAKE2B d391522fd6f8eb6918d671fb1c9517034941f3ae8e05ffcd7bece141e6dae110cde1560bad02bd2bcca2f868cdba2a8a16b5606ad6637d40d5ced5ec9bfffcc8 SHA512 9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5
 EBUILD pigz-2.6.ebuild 965 BLAKE2B f238267fd6360bb0041821f69a383b0157bde1428614b3f83506fb8f75aa021d64c79ae401805e2b287ed96ea836f519e636b090cb7e5b5503a72a68f0771800 SHA512 f96e775caf6a88c49f800a68df13a170608c0def6c3bf3d05d768441ea262a74b8097733ce33427b26542300683d85ac22271309245c730f56b782944028b9ea
-EBUILD pigz-2.7.ebuild 980 BLAKE2B f3f84790dc2da4fd8d4eebe0bba6ddfc300549328db71c97cfed36f2601965e9e7400e960f2911faeaba7bacdf7cea5cd828d861897c4e00545861f4effbee11 SHA512 3cc8753915fc156a04c0470efadf94b8e68ebe88d336fe601e4874566df15092b732a26acc9fd2d2cd9640c8e081afce652f543c57251305bb4cca3aab48b087
+EBUILD pigz-2.7.ebuild 972 BLAKE2B 97d86c747e44ce40cac3456774c9fa2e36b2189638bd69fec788641c8319582a11e8c1937e27e5509cfdbd308e31c17f96bca31ef3a999e40bf92176c93b66ae SHA512 0a4f5051960d86804c028574d97d293f8784f6a89f42b588d20164478c871afc9cf58566f7493c840f8f739d9cecebad630d259543792e8ee5e6bf5b663e7c61
 MISC metadata.xml 740 BLAKE2B f16110bdf40040ccabd1674c4eab628d44b019d6b17174b286e5bdeb0e2817ade6898202afccf02461ae6adfea61ffa41a8345d9b88234fbf3b0e5d41a396aa8 SHA512 7779fb38f750f9a3dee07e26cbd37d9cc5228422168a8cd59091c452969d7384d611b8153d87311ca922702e76a697f0a5c233c0e947ad4c2ac076453376d61f
diff --git a/app-arch/pigz/pigz-2.7.ebuild b/app-arch/pigz/pigz-2.7.ebuild
index 168cdd343210..7f3581f77e76 100644
--- a/app-arch/pigz/pigz-2.7.ebuild
+++ b/app-arch/pigz/pigz-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
index e2bf59db5f5f..b37887fa8d71 100644
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@@ -1,6 +1,6 @@
 DIST plzip-1.10.tar.gz 94541 BLAKE2B deb49345ba3d6b120086aa8646f5684a32e6b64453f2ffc6321011dfd0741ddacca919bb11cba9435a26ea6aa63f453e7c5ff9a7dc7dc38c8ed0c6841237aeef SHA512 7fd7ec288800950deaec9337b3112db72cde059721a0143a091650fc20ba2a3d9d7eebbd7a312e5bbb1a61ca6c902d2450e6c3c7172dccf9c0c8b86db7c2a944
 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 897 BLAKE2B 5e25097d778d9852f1ae1880c10d436f98a49fa7996b97ac52a73dab7384dff489fcb271800bf94488fe60d0fdf46227292065de5cf9a443522d398cda4a7adc SHA512 e9e4dadae2f0bf9202997865e279b90c907d958969751b0e5192391a5ff0eb41372622d06265825305156dfb39d3d34f6558887f36d19082899cb32e8603e01a
+EBUILD plzip-1.10.ebuild 904 BLAKE2B 2c602fa812d0e1fbb14d611f1c655f985e175e7d5c29085f3d00f66e561d17562d98cb55ee3a00049071c5dbad7fd79526d5ac3830b32e6ccd0b0fba2b8a810f SHA512 5cf580d09217255bcc4712a5e73798f5ab8ed1e43cf6d4db063d8dfe04ee726e79410e8e4d1927fc1d1bcfde111b901a0ac6d08824bef4c557fde45b497a525e
 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 a3ea67ff918e..2c02e7341fd1 100644
--- a/app-arch/plzip/plzip-1.10.ebuild
+++ b/app-arch/plzip/plzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="app-arch/lzlib:0="
 DEPEND="${RDEPEND}"
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
index 29338d0f231f..3a9ffc1fad60 100644
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@@ -1,4 +1,4 @@
 DIST pxz-5.0_pre20151029.tar.gz 12271 BLAKE2B 6ba2cb7629b0475761b59620375a2d0de7c6a3a61f7af20140e214383f737e046c45f0c602830c0331794fe1d38332d8d309ed0b8451e3a780ef1a2835de85e6 SHA512 d26bfdf9b70baf91c575e21824920cb42d0a9bd171254b99147a6e5e322ed3d1f7351a570358213431bdacdcbe6e7b22646a2dd2d7a127e167c8237bc4f3038a
-EBUILD pxz-5.0_pre20151029.ebuild 905 BLAKE2B e1d28f1ea2a900848f6610194fff146540ec6b1a6f763a18321a66ad83870b6f460ee810bf1151fa5276d411ffb56d949b05a2e19ed536141dffd5a68c1940a8 SHA512 c167018ea6ef7220a66ed10e2afabbf3a874a8ab4f3773bf4aff067c929c14f19529ee5dacc89217cfb9852b039681ef30214b3f680cb103bbcc381368a7c690
-EBUILD pxz-9999.ebuild 1076 BLAKE2B a02426987fa401932ecf01eb606c969a03a5e864590b60d50acfc561ff5370c5514294b049ab88b582846243601023f0df0e7ef7919cf3b02cd2e7a2fb3fa748 SHA512 ed800af1dbd5d3ebc9f86428d63c854575c2d636134a1cfeb139f396636b8f2648b947a17e172335cc77df4d7925a4ad2d8d6bdc2eb409e3312c3b54cc152fb4
+EBUILD pxz-5.0_pre20151029-r1.ebuild 954 BLAKE2B f830dab90a2ce0a18b3fc7b1af707b0d944505bd11da195b2f6114dc804c7687942647ad285f63484c223ebb89a2ea2e26646c3c7d7c8ed6ef68ea83b66773e5 SHA512 41b4fd0e84164bc59b654cbe090d2166ac38ec885cf0b8f8e07ede110d23520f907ece6bc98a1a9deba6b40d17815f66b2837210392b3a7c56c1734f3893d7a6
+EBUILD pxz-9999.ebuild 1121 BLAKE2B bcfbf07cee491d39415249a3bbc71a2f6b6916bdfd770f35e6f6b97ae5615f11972590322873a51d94990b7d7c4f7a3f1f2f20b0a77b92989189fc5a481e9800 SHA512 c56047b53c3ff5dfc60ed6145e7094feaedb9ec2b33922a034b3282216c9d9cb80b4ae4b5339a88324c87e76143f2dfbab7d8497bc3eb26f030d9e473bc74b7c
 MISC metadata.xml 590 BLAKE2B dc0e461eddfdb09a6837da49b6221437f09c7ca7bb13b57486c62466c8547a4a73c8ec6c3e28be149840318adf36aa893501326ed9fa6fa1b08dba95ef544a51 SHA512 2535178a8e8a4bc14d70366fef8295eca4fcdbdf6451b7a9c8806f114607edaea4bb60ce1c473fa9b9d9b78fb141a91c90923d32e6cf88da6157f7d8653eaebe
diff --git a/app-arch/pxz/pxz-5.0_pre20151029.ebuild b/app-arch/pxz/pxz-5.0_pre20151029-r1.ebuild
index 64175e6452fa..c9ad43cebe99 100644
--- a/app-arch/pxz/pxz-5.0_pre20151029.ebuild
+++ b/app-arch/pxz/pxz-5.0_pre20151029-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit toolchain-funcs vcs-snapshot
 
@@ -12,22 +12,29 @@ SRC_URI="https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
-IUSE=""
 
 # needs the library from xz-utils
-# needs the libgomp library from gcc at runtime
-RDEPEND="app-arch/xz-utils
-	sys-devel/gcc:*[openmp]"
+RDEPEND="app-arch/xz-utils"
 DEPEND="${RDEPEND}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
 src_prepare() {
-	tc-check-openmp
-	tc-export CC
-	export BINDIR="${EPREFIX}"/usr/bin
-	export MANDIR="${EPREFIX}"/usr/share/man
-	default_src_prepare
+	default
 
 	if use elibc_musl ; then
-	    sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c
+		sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
 	fi
 }
+
+src_configure() {
+	tc-export CC
+	export BINDIR="${EPREFIX}"/usr/bin
+	export MANDIR="${EPREFIX}"/usr/share/man
+}
diff --git a/app-arch/pxz/pxz-9999.ebuild b/app-arch/pxz/pxz-9999.ebuild
index 895c02be50d0..f67a5e51ae6a 100644
--- a/app-arch/pxz/pxz-9999.ebuild
+++ b/app-arch/pxz/pxz-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jnovy/pxz.git"
 	inherit git-r3
 else
@@ -27,19 +27,27 @@ SLOT="0"
 IUSE=""
 
 # needs the library from xz-utils
-# needs the libgomp library from gcc at runtime
-DEPEND="app-arch/xz-utils
-	sys-devel/gcc:*[openmp]"
+DEPEND="app-arch/xz-utils"
 RDEPEND="${DEPEND}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
 src_prepare() {
-	tc-check-openmp
-	tc-export CC
-	export BINDIR="${EPREFIX}"/usr/bin
-	export MANDIR="${EPREFIX}"/usr/share/man
-	default_src_prepare
+	default
 
 	if use elibc_musl ; then
-	    sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c
+		sed -i -e '/<error.h>/c\#define error(R,E,S,...) fprintf(stderr, S "\\n", ##__VA_ARGS__); exit(R)' pxz.c || die
 	fi
 }
+
+src_configure() {
+	tc-export CC
+	export BINDIR="${EPREFIX}"/usr/bin
+	export MANDIR="${EPREFIX}"/usr/share/man
+}
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 0512d99cf968..0efa20a1cfc9 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,5 @@
-DIST rarlinux-6.0.2_p20210611.tar.gz 610546 BLAKE2B 927a7f60af431e84e9ff19dc1abf52c4697068264d3c67a17ada324bfb00975824e26937a19dea023cda772066991de719ec68fb1fb380f6656130af67202131 SHA512 6b6ef629dd0e681702fb0835cf6fe9962dc2ce774291f800893308a93a0a498099775e7d897d69375f68107b0ce0862bb2a6a169b8fbda534091678e9be3f09c
-DIST rarlinux-x32-6.10_p20220124.tar.gz 616277 BLAKE2B 051a8c5689dd0924bc841fab05acd01cfaa7752a5ce54de71b727acedc6606d62605f3487af99d59af081acfbc1ded95ee427904caa6fee39734243248e73c13 SHA512 3593756eba8fd8e512ff1f0378e2768a264671dd25c139f00dc632b53d379ee6da4d63d6d94394f39ad4fde0310211d11d8c2d3167da5d576f16b299da969118
-DIST rarlinux-x64-6.0.2_p20210611.tar.gz 599150 BLAKE2B ff60f32ee5215403e622bc5c341b8212c3deee0020155043e4c7c3d5feff113da351412a91fd42f46e3293dc5975fd2beca558e3e45744cdc5356ace82af6c93 SHA512 909eb3b05c56327ccec101652d1d68ca5eb97ba3a7223954724fbccf4960b07ffa0ff5fe5405c53a248342a3ae171325e7bbf7fadeaf63c1c45bf00853e0a940
-DIST rarlinux-x64-6.10_p20220124.tar.gz 604344 BLAKE2B ab5a5b0c1e8aed44e6b55820e0d843adf526c0d48ab5128fff5e907fcc4969cd6645cef2a91abbe49b770de3104d9a8d09da34e0f9955fa9825da204ca1098c9 SHA512 56ea0f3eaf84ff41af6543056e71d9768285ceef00132fe9ea0c7ecb02e0681023b0f7940b02fe3918bf28de229d000e0209f66dd4af2e93c6d81c3bcbedc87b
-DIST winrar-x64-6.0.2_p20210611.exe 3348968 BLAKE2B 482e5c34cae9c452b539f6e9e89efc7db8e463cc58b4db43cd25caa7e3fc6ab7945a7a17e9605b9d6d505c31a9a343a29812531dc5ba319765bf80fcc775426e SHA512 4c2bd804465e6bd948de248a7a0893f4b38728665b8e67c65bfc14766475072960250057ad1afc457a0df1f128da96d69483b000a5da18826776ea0a4377230a
-DIST winrar-x64-6.10_p20220124.exe 3470848 BLAKE2B d54dc216dfcc251d9c3a06ebf49b0717954cab856231b9777597dc0d1b61b64bc5c5fbebe9546be42c44ba23a2d9dd8eaf3f5d5484678eda5d1ec3a8ebb159c1 SHA512 9968fe6b3c5df9f11690263246366da9544a5a05f535f61d9cbb6765fb81f2614a75b8b1b8c367d7b83c83a87b53b1b94f3ffaa95c38dbf368a880c16f136e63
-EBUILD rar-6.0.2_p20210611.ebuild 2232 BLAKE2B c038b494adcc5ead0eae6c03f39518221598195be4f1aa99601264d01fc22c86dfd985fb88ea6ad3697d1afc71c42404ffd06437f9b046ffb2710226a051b0eb SHA512 ed19c27d77c6b806f780f61670632e2f4f1d19e77fef3871e722a9c6c34b91a8851b9cfd30fe10c0b7b3906c01c80e635dcc82d416392182830a2765c6e39809
-EBUILD rar-6.10_p20220124.ebuild 2238 BLAKE2B 74a3e8e1b6cb69fe6532273a75583bfd52b458b6d764024b152f9d745537b4446e6378583b66f08ccf8f25ff7f2e9303182cf3163ce261b9100e77d85c1feb42 SHA512 d2ec8bfc393d647f63c6940dcc610c89d73138974c50b887cad6a94f555148ff5af2e30b17774daf3f8c7a824069971b2bbf8116f60fbf053355fd2e964db9de
-MISC metadata.xml 437 BLAKE2B 85b1f4f60295616aa991967cd5a064e5bace02ed70938c2465c95ebd386434b604af70054eae0a717b97cb6986f5b9b334e17734754c817f477506f05782f3b9 SHA512 4aa791dcf9ac69cbe18e80fda5d7cf9b885141d2011ae8658b1f645fe1e320e4e82053a7952b57146a85fee677599f56f96087070a3ad68254a952df4ec3ea3c
+DIST rarlinux-x32-612.tar.gz 616982 BLAKE2B 3ceaf625a77d6bb5543de8c2d118e6a5d679ffcdf295b4476725794277ba01c6b74179daefa2bbe1da7b3c0d29a2d368c1325b099d87955c355cc61461f893ff SHA512 8f67a365145d6fe7c9db1458a67f29a6b878f1969842f0cb43f639af1f8c304b0f4174f83b070f7d821316fdd9dcd2e1788bca2d6af5ef60fdb951924ebc71a4
+DIST rarlinux-x64-612.tar.gz 604520 BLAKE2B ad85a2a5d1b66677707491279166fa42c6f9b2b1e96f9dc8001da5e9199e50762a106991ecb27c0c4eaa72904490eebc43f21236a952da40acf866b1ce40ecd2 SHA512 bccb64b077fa044a920f02a826bafd4a07c446f2ff2ce88b7c8f27d49c6ac48108711880ad43aac89c034f582979cad8b332d675ea483eca9f76bcd892949423
+DIST winrar-x64-611.exe 3479544 BLAKE2B 84f2bf342a92b142731615d13280e36686dbd4f44d8a1c550fa6a03f2267e6ec0f8e963107b3baa5640072b399e58fe8865754b382def2183a391ca204a07333 SHA512 46c001b48be1503e1aa9f7b9540adfa210caa672ee766b3634697e23faa0b8ac140cc392adf13f1b5244ca61572c5dac2085b4a00a492774649602e4fdb6a46d
+EBUILD rar-6.12.ebuild 2313 BLAKE2B 9eb525b7a7d7b5ba90cc7c7e7f82a377bf6a903d2dd1a54327a3a974fb977cbdf5ef108f29b3b77b5b85edd3e147137b4c536e9dddd55b2dab689159543b126e SHA512 13dccab895945afbf0308962fd5671ca3a69f7eca64a25fdb512d742b2bc7f359884830d108919c65a753223594a77c3e4ec82fca54ed23b18f7a5d90afa01af
+MISC metadata.xml 436 BLAKE2B 89434fe285ad2b7be02c6e0014bb0a8fd54772e899345cb1c6de1da1e7cf5396d490af746bad1af6449183a4970c70415178765d918488f047174e64c289ceee SHA512 c9d65d30420f8febc660ad83169a8ae95c11ffcc673ca0cbc16530367e441ff72636fdbe3948065270547cb043ab0e1114dd573e4bd8716089bd01f056a63ff6
diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index b456900e42ab..950f254e370b 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<use>
-		<flag name="all_sfx">
+		<flag name="all-sfx">
 			Install all SFX (Self-Extracting) files rather than just the native
 			format (allows creation of Windows EXEs on Linux ELF systems)
 		</flag>
diff --git a/app-arch/rar/rar-6.0.2_p20210611.ebuild b/app-arch/rar/rar-6.0.2_p20210611.ebuild
deleted file mode 100644
index e94158b2ceaf..000000000000
--- a/app-arch/rar/rar-6.0.2_p20210611.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
-URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
-SRC_URI="x86? ( ${URI_x86} )
-	amd64? ( ${URI_amd64} )
-	all_sfx? (
-		${URI_x86}
-		${URI_amd64}
-		${URI_w64}
-	)"
-
-LICENSE="RAR BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
-
-DEPEND="all_sfx? ( app-arch/unrar )"
-RDEPEND="sys-libs/glibc"
-
-S="${WORKDIR}/${PN}"
-
-QA_FLAGS_IGNORED="opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-	opt/rar/unrar
-	opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	rm -f "${S}"/license.txt
-
-	if use all_sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	insinto /opt/rar
-	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-	doins rarfiles.lst
-	dodoc *.txt
-}
diff --git a/app-arch/rar/rar-6.10_p20220124.ebuild b/app-arch/rar/rar-6.12.ebuild
index a78f4de2de31..c25f9479a11e 100644
--- a/app-arch/rar/rar-6.10_p20220124.ebuild
+++ b/app-arch/rar/rar-6.12.ebuild
@@ -1,44 +1,53 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
+
+MY_PV="${PV/./}"
+MY_PV_WIN64="611"
+URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
+URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
+URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV_WIN64}.exe"
+
+inherit unpacker
 
 DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-x32-${PV}.tar.gz"
-URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
-SRC_URI="x86? ( ${URI_x86} )
-	amd64? ( ${URI_amd64} )
-	all_sfx? (
-		${URI_x86}
-		${URI_amd64}
-		${URI_w64}
-	)"
-
-LICENSE="RAR BSD BSD-2"
+HOMEPAGE="https://www.rarlab.com/"
+SRC_URI="
+	all-sfx? (
+		${URI_AMD64}
+		${URI_X86}
+		${URI_WIN64}
+	)
+	amd64? ( ${URI_AMD64} )
+	x86? ( ${URI_X86} )
+"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD BSD-2 RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
+KEYWORDS="-* amd64 x86"
+IUSE="all-sfx"
+RESTRICT="bindist mirror"
 
-DEPEND="all_sfx? ( app-arch/unrar )"
 RDEPEND="sys-libs/glibc"
+BDEPEND="all-sfx? ( app-arch/unrar )"
 
-S="${WORKDIR}/${PN}"
+DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
 
-QA_FLAGS_IGNORED="opt/rar/default.sfx
+QA_PREBUILT="
+	opt/rar/default.sfx
 	opt/rar/default-elf32.sfx
 	opt/rar/default-elf64.sfx
 	opt/rar/default-win32.sfx
 	opt/rar/default-win64.sfx
+	opt/rar/unrar
+	opt/rar/rar
 	opt/rar/WinCon.SFX
 	opt/rar/WinCon64.SFX
 	opt/rar/Zip.SFX
 	opt/rar/Zip64.SFX
-	opt/rar/unrar
-	opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+"
 
 src_unpack() {
 	local _file
@@ -63,9 +72,7 @@ src_unpack() {
 		fi
 	done
 
-	rm -f "${S}"/license.txt
-
-	if use all_sfx ; then
+	if use all-sfx ; then
 		mkdir sfx
 		cd sfx
 		for _file in ${A}; do
@@ -78,7 +85,7 @@ src_unpack() {
 				fi
 			elif [[ "${_file}" == winrar* ]]; then
 				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack ./w64.rar
+				unpack_rar ./w64.rar
 				mv Default.SFX default-win32.sfx || die
 				mv Default64.SFX default-win64.sfx || die
 			else
@@ -94,16 +101,21 @@ src_install() {
 	exeinto /opt/rar
 	doexe rar unrar
 
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
 	insinto /opt/rar
-	if use all_sfx ; then
+	doins rarfiles.lst
+
+	if use all-sfx; then
 		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
 	else
 		doins default.sfx
 	fi
-	doins rarfiles.lst
-	dodoc *.txt
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	docinto html
+	dodoc order.htm
+
+	einstalldocs
 }
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index ad3fff49c332..d5b91ddc071d 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,3 +1,3 @@
 DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
-EBUILD rpm2targz-2021.03.16.ebuild 735 BLAKE2B ea5f063c9c9d375f9ccff3598b75733440e1f0f689bfa9d8420ea5d98bd188221f0da9ff6fcc0a5d0dd73a7e54565fb872adaaaf0d6ba446dc684ac29826463f SHA512 408cafd75fce7f7186ac71ec47cb4664727e52b5665c3beef30934c51e89d710fddb4d1d1a02768d5c9b4218d6d934af562df7d96aca6ee102754a173025fe95
+EBUILD rpm2targz-2021.03.16.ebuild 742 BLAKE2B 6ef18544ab98d978ffdeeb99fcc1c917d965124c9ebc6a4dc60b46a6258cfc918ce6f2ad4732ecbf6e9d161088f112e3087ce1e1483577db2c82ce3b943c3f94 SHA512 6e15019b68f8b254c79c2860a42d7811818e518b5cae91e080057eda89cfb02c46536eaf76946fa8fa20c7a5a4a54a51ac09c173643813db7eb0fc01ec57c96b
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
index 492f3b4e4761..f6e5c4e88e83 100644
--- a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.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"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="BSD-1"
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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=""
 
 DEPEND=""
diff --git a/app-arch/tarlz/Manifest b/app-arch/tarlz/Manifest
index 489b9c7dad68..f2dbeec725b4 100644
--- a/app-arch/tarlz/Manifest
+++ b/app-arch/tarlz/Manifest
@@ -1,5 +1,3 @@
-DIST tarlz-0.21.tar.lz 104780 BLAKE2B c3aacda3e8ab25757758d811d9cdc153777835950436dbb4827cf75d801f6c3035475330512a2657a8c9733f6afdf452d9689d7d72d11ba8ef968fceab671ed4 SHA512 1ad671da7ee115762163af57aad69ec754753e68a99ef8c4f38e880ecbb75a5b021f38794390eabcdbef4963cbc0c0e2abe36011da4135baf2c21dc22f020f4a
 DIST tarlz-0.22.tar.lz 105724 BLAKE2B 7921f7085d63f553f745cf8b7fee43ece32346a0804e41227806efae0ab338c48ee1830a8b087f03000a27fcf44338b3dba6d52d37f4de790d8b7bc5f0234ade SHA512 4e241ea0571e421c93fbeeb54a20e73fd4a7e9c85dc3b24295caec1a52e156cdcf5e85f4ee41f5dfae712b851d17fe0e96955380bb86306d8002f4187d0c60ec
-EBUILD tarlz-0.21.ebuild 599 BLAKE2B 52422be755e30a4bc9742d0e814dbdc89afd65c9c86be2fd7bc784d5dc058e7719d3381ea5826177ef1b0d3331f6db335ad3b7f0fe3ef8a72971533b12008228 SHA512 4662e10e9aa602b95584e8f39035bd27e7196d854ee8a73d767560020c6e9d944cc7e7f67e05a908bf2b00a4f0f43c1f3e4ec773c8fac08847015902c262eec4
-EBUILD tarlz-0.22.ebuild 597 BLAKE2B d979a14acef2e2ed74faee6ff31ccb4e837a5a0ffa6257f7b25348dbc0008a4bc54f8fd20b5b585be9e8343808aeb3f89d8bc0576eb95f4a79d8b6a4f5960ee1 SHA512 cbed097b80261ec94de345eccc3ed60517aacb6fe2e4509cd64f0ea751a8624ce8527161b9c097c1db58f8092acc51c31d0a896a14c6b3b9f6be1dd5d695886f
+EBUILD tarlz-0.22.ebuild 596 BLAKE2B ce0e0f5cf2fabde971a2980f5ebc5cb152e130501d0ea254e19a86c10bb08078bc6efab9f702eb35df1ba3ddbe036c3b589f37ecf16a46631b68635b9eb2967c SHA512 ca3e78d6d30428f9108ea9af965314525816c83647bd2938d49d0f141cc24a978c00f252731a7821edd714a8772c08eb6686e5e2813b7eed4edb9e35ae244d5a
 MISC metadata.xml 247 BLAKE2B 3cfe29afe8370e5f5195d26e19732debac8a921204f9788b2f0c2b803a4ffdb479c89b0a53f1b592764c1980ad587b5982c288b33e6fe522ecdcf5be3ed81750 SHA512 a9c3ee4b936ac1f2e739f4a46249a25e3b980b3a63f7ebc573743a33bf745cb8af2513e6724da71f73dc61931f69f4ff351df94a2dad348d4910a9d6f71d2d4c
diff --git a/app-arch/tarlz/tarlz-0.21.ebuild b/app-arch/tarlz/tarlz-0.21.ebuild
deleted file mode 100644
index ffd6e03cafcf..000000000000
--- a/app-arch/tarlz/tarlz-0.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="A parallel archiver combining tar and lzip"
-HOMEPAGE="https://www.nongnu.org/lzip/tarlz.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.lz"
-LICENSE="GPL-2+"
-
-SLOT="0"
-
-KEYWORDS="amd64"
-
-RDEPEND=">=app-arch/lzlib-1.12:0="
-DEPEND="${RDEPEND}"
-BDEPEND="$(unpacker_src_uri_depends)"
-
-src_configure() {
-	econf \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
diff --git a/app-arch/tarlz/tarlz-0.22.ebuild b/app-arch/tarlz/tarlz-0.22.ebuild
index 88450fc9523f..8c9cc43c7abc 100644
--- a/app-arch/tarlz/tarlz-0.22.ebuild
+++ b/app-arch/tarlz/tarlz-0.22.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=app-arch/lzlib-1.12"
 DEPEND="${RDEPEND}"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 4f841023d7be..b356ca36f941 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,9 +1,5 @@
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0b0271d43d3df43849cbcfe60a4fd4546fb5e69dbe95d6729b344f705b97483a5bc0c1d11edc21ce8e08bca6b SHA512 b6d3e5c6bf0e3605c3390b97bdd1f0747fff32eb7780a7ec967421841203a6cacb42ce16041bec84f88fa1eb2fd15b9235da1f37d517c9e7d876034a5bd79466
-DIST unrar-6.0.7.tar.gz 232903 BLAKE2B eba5179f622726046fabedac03e8c05f7dd2f64782dc0be18010deb22c1036b895cbb9429f44239e63d9c04f3e031b4f9787462f4f643f8bca11b135de08f547 SHA512 2c50d1f58f5189e59dad36eb25aa50a34572f583242e624846c9791c5609e83d4ee76314d785771fe514ec3378749dcb86e4c97a8d2a3ab7b469df49a5c5f412
-DIST unrar-6.1.2.tar.gz 234257 BLAKE2B c04b40e4ed08e9bfaad6c7675b392cc52d62c04b9897707c8def726be34187eedee6870a2b055cb0eef1a9df0bcd7bd1130d547184826c2f8c1af226f4e00247 SHA512 7a34db3a5383046a2b2bd5c7abfeb6b80c81666609caf619a700bda09bca908731b03985ad9d2b5d889605807832109fae11b7091d86c1a67c2e46288a42b777
-DIST unrar-6.1.4.tar.gz 235483 BLAKE2B 4fb0dab62dc504bc4535add9cbc6a45e38c16def3206e54359b9dcffdb5626234cfcedd132da83e2300f0dc9a1f410420e0c467dd0f30f0da8a27da895d4b590 SHA512 2996436a3264374593fd97975f4ad53c19c39b57c83a6557c4f34095e5c952528b469ff6698c84b83b9bff5b2e33be47523fdc5b2a02ba2be049624af06d1a5e
-EBUILD unrar-6.0.7.ebuild 1819 BLAKE2B 09a83ed35afafe32d2558bf4a86a08f8158f869f56a8f7db2f8687e777edf24ff9a325c2a493ac34048ac590d8bf67fd9b675a0c07caed9e3284f6f8802194ba SHA512 47304020560aaad41a062245c4a181eaf48de5f21cb90927915b2d001f96586309b585d7a862dba6d7b497d813418a0277f4b5ee355a388ea518fda7779defc6
-EBUILD unrar-6.1.2.ebuild 1825 BLAKE2B aa7ad0f4cd70bec7a91b176526a445dc42350af6a9b046506be8fab9d80a5d2edfd84cb6c21927956bd07e94faa353a43f1b145c33d5ee567e6b2b079fb2c3ec SHA512 2d0d7974dd47d38b145533d37cd79fa6a43292bf2792f1a8fa9b47f8548034a1018beea3494cc47bcc0aaf8be7af631c8ac0e630cc9be5464ed33e13e819a864
-EBUILD unrar-6.1.4.ebuild 1825 BLAKE2B b5fcdd7414bac096f85c3d35e429d048dabdfaae04280643494bed7a656e2b58efc16e87445e373dd4a9ff4895ecafe87bd1a46a9470571b2b4e5d9141341ad0 SHA512 d9ad8ffe14222a83ea74dec68721ac0a4be600c2e63f1b65ab168c9e042b0efbb998d9ad8ae884d1dfbc25627dd6acef64f7ab008d2d1952e8fbb9c03a54d958
-MISC metadata.xml 521 BLAKE2B bf6d200d054dac732bfbb968ccb376a62230e0d2948a42c6c94ecb6823407877edbf3ec98f33ea21c22ea52b13b32dec508576dccfa34d4948de79741f863882 SHA512 2a4bac4e32c01b93d51cee66abd62f227f1f4b3c57a1d4e3e325724d349508107bf1a078282bcdc5fb5481058cf657040c697a3ff939fb8146f24fce7938eb4d
+DIST unrar-6.1.7.tar.gz 236798 BLAKE2B e33a7500b4a03a54f84b018ab90934366f52ef54c83257ed7fe4419ba993d2a8c21de26f445ae18d870aa5232cfbf1f5d8fbc0b3965803aeec6cac5e5a38e949 SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846
+EBUILD unrar-6.1.7.ebuild 1826 BLAKE2B 8d1bf4e45161d4d98462c23876551bdf9770bce19a8907a6151c293fc92ba5a19595efed02d0f1308517f774cb28496d0c0fd9b9819adaf3eb409da4162d1cc0 SHA512 b326b0c8cec1c02ce8deca83f111da38f059f238b0592a99ad572dc347e0f51b6ab19ae6443fe93f15dcf9699c1cdeb8582e412130595456e19688aec0473def
+MISC metadata.xml 409 BLAKE2B a84cfacf4a852caa6f6389b380eeb700e1c44c4af68cb2568a27db21c2b577838d9c57269dcdb5f08dfa989617eca978520082d36153ea503a5033c4cc9446af SHA512 fcdf5a345b3eb2b5093b60def127dd48fed068bf5caa92dc52524b4e398d49c39d8ee686b3f0695c781ab2d0d3ba486baec23f74f80e581b7a2f77e0c5709eaa
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index dab6b92a1d59..29bcd146892a 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/app-arch/unrar/unrar-6.0.7.ebuild b/app-arch/unrar/unrar-6.0.7.ebuild
deleted file mode 100644
index a91ac4b72b8c..000000000000
--- a/app-arch/unrar/unrar-6.0.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/unrar"
-
-LICENSE="unRAR"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin} || die
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-
-	find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-6.1.2.ebuild b/app-arch/unrar/unrar-6.1.2.ebuild
deleted file mode 100644
index 9da34c0bd45a..000000000000
--- a/app-arch/unrar/unrar-6.1.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/unrar"
-
-LICENSE="unRAR"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin} || die
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-
-	find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-6.1.4.ebuild b/app-arch/unrar/unrar-6.1.7.ebuild
index 07408db5ab4a..56d997e2693c 100644
--- a/app-arch/unrar/unrar-6.1.4.ebuild
+++ b/app-arch/unrar/unrar-6.1.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.9.3-build.patch
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 06d65885f8e5..b2d4a76d4cf4 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,5 @@
 DIST xarchiver-0.5.4.17.tar.gz 1077111 BLAKE2B f68f22258dbfaeb37333fab3d2ea1b06e23e143f90df6cd94f7601961636d1e5a929e1353ac956ac9a7341813593fcfb35d5197666dbb0920ddf63e4365f34e1 SHA512 5b19fd0fb90f99aee0ac2576bc4efce9ef4eef9119fc118815f6d925e3877c0895475fbdf7363d8adfb6371fb7fd73299ea3a7cb3b6d9fff19c89d1d287d3a84
+DIST xarchiver-0.5.4.18.tar.gz 1112838 BLAKE2B baeab65c9f81eecf070185fb3718b3e8a460e94393dfcdf38ad8bfb2a771c6f98a8638a28c43aa99d05a95772ca7e1546d9be1b602e22a715d5827350976f9d8 SHA512 a33236839d325a2d706fd0a9e2257ab5289895b030450b2060da856c047e5676ac5686312f8d00d3f38d329d0cf39fb22330a7c902b3ff5943856801435f6970
 EBUILD xarchiver-0.5.4.17.ebuild 1311 BLAKE2B de6be005c5d78c1c1c8fac4fbba763cba20b12fb2d548df3cdc6740ef6fefbcd7578bc775ad12846f801e49184c8453691718a6a1dd2cb37c824d33dfed647b3 SHA512 8f9febe38458f3caa4e27c67c3439f9b7a707a40f3f088a57c78ac7233814155ab136d4ce2c59102e51a571715e6575c953ab5f6c07edfc781ae65e14c14dd48
+EBUILD xarchiver-0.5.4.18.ebuild 1322 BLAKE2B c3a4e79171d3b19205d799c125d7204bd37c95797046c941bce2c5537fda9180f6c91eeed4a525064991712d94c13f69c3e33bfba4da98141d90945abb3d0845 SHA512 c22235ff9fe4cf6327cfc4b32369ceae5f40b73b54480fb5762fd17dd640c8856297ab23a3dbf286d9d7f4de17f1eb99bd3b6623fa469893a29e4f6c9dbbb7d8
 MISC metadata.xml 448 BLAKE2B 5eb8d55f09ade402a421e0a40bdcea04b72fb284c6a705c03be6454e7862253344d5c8e91adc37510759745eccfe68ccd4945192e7a24beae0ad881b04f68337 SHA512 240dc27cb546ec70d0b85db8d9b8c77a38ca4773389caaaba3bc52e9dc823803c330d5a83213c6ec6a6cf3a56ffb8eb09692c446df7af42f3ecf844cbd6b13a4
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.18.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.18.ebuild
new file mode 100644
index 000000000000..2a6e5c75e1c3
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.18.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver/"
+SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# older pigz versions have incompatible command-line processing
+# https://bugs.gentoo.org/661464
+DEPEND="
+	>=dev-libs/glib-2:=
+	x11-libs/gtk+:3=
+	!!<app-arch/pigz-2.4[symlink]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index 352dda61b7c8..02bbc65cd739 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,3 +1,3 @@
 DIST zpaq715.zip 1000646 BLAKE2B 3ecc69af7c14ca43643d54feac54647c82ac25e0212fc7f6e60821b76ba1976a2b2ccbf07e030ab6518c8643b452309d622cbea602fc4fe8798af7e4ecb2b027 SHA512 4cddcc04dff5e9dceb7138cf9e82b718b696048368ff494339f877d93e4423ed7959c0cfb2e30ba7dcbcdd6bbd59fa1021ceaca6d51e3180d8034b7a3997c265
-EBUILD zpaq-7.15.ebuild 1027 BLAKE2B a2f547c55086eb74ea44263eba9735519d7d096160b71e7dd5bc68533d571b957a19febc4d97db421cda9cb982265c69fc9fd04a7842a15190d146da1a591015 SHA512 6f8cf07a70e61b5c2faf5c15295a8d07467dbaa3542313290767783d41c151c7d2c2c9a129583e5461076e29aa50bd2a77804a9f46b42b0a66086ff30fef4893
+EBUILD zpaq-7.15.ebuild 1031 BLAKE2B 62d4893a1d53bda01e99877d8fe92442ecc0476f422d9bf799c05717c16bf8dc0f42e5635075a236e966014369dc6aa321e188292e4061725b1ced99652d555a SHA512 bc1e2f1e7da4e74bb91cbf700b4e81aadf4c9534f28c034176bd0c4904decf0489d62ba0969b5f1d964d1a8432632d1eb5c8989d5d44095f70a3919cc308dad3
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/zpaq/zpaq-7.15.ebuild b/app-arch/zpaq/zpaq-7.15.ebuild
index e4c812dd9a58..aabf4cdca479 100644
--- a/app-arch/zpaq/zpaq-7.15.ebuild
+++ b/app-arch/zpaq/zpaq-7.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +jit"
 
 # perl for pod2man
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index f51ed94e3f22..72e5bb758b46 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,10 +1,6 @@
-AUX zstd-1.5.1-respect-CFLAGS.patch 228 BLAKE2B df2d41007faeedd776a77d63201bd467d9473c5083b7b10ee717457c425d7e7538c0e1f923b99cb2088530a04020c22a39aeb45e5c832d7edec90f65d0409370 SHA512 f866ff12f0582f9205be791c454b824e03c62ac09b3fed9a30516251af5d9c59dd2b153744d84a080e928563c1332910dccdd8ca696f7d3233d2ef9719dd402d
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
-DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
-DIST zstd-1.5.1.tar.gz 1948539 BLAKE2B 2f82fb7872c49c41c8ccae17e343825dabceae3070266e49468c2019a1324758b825d7fc1bc3b62602b4d726538260258dc9134fa81d3c5e5085a8a1b531a8c5 SHA512 ed8ea0143b7bbd85afdcc8f95d44589a0903cff8375059836ebe577cc4b3ea49c0c756db6a3649655e478377f48b3120ef87dc768fd449bd4bfac786209bfd31
 DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
 EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
-EBUILD zstd-1.5.0.ebuild 1449 BLAKE2B 1985dcc6336b6cb5617bc48a3d80400f3d642d281e098576c597b5e807cdacd2e738f66de94c58cef35a54f78f34eb21c77f4e5bd10a9f430d633f77c62d696e SHA512 31e0ab933fe30b781a1c0923ff4a8ab7437d95ee957e0b44e3d1b41687308ee6652ab13e4f490c39ec2b954bdeded743ac3642ebde9563a57d74d6dfa27c6e5d
-EBUILD zstd-1.5.1-r2.ebuild 1803 BLAKE2B 1309e5ea2c9d98ea1c496be3cc14b1ebc076577532b8622e787470fbc804dd1f225694431477aef8846c3a4283ac5697faa6a2eced78daf36607086d7cd6bb74 SHA512 9c953dae97b02decaa82090909c74bc3ad3c07724ccac56c348238051d4a671dddc29266c0b76828eb29924996acdd58fbb88ac1516b150569fdc1552827e8e1
+EBUILD zstd-1.5.2-r1.ebuild 1504 BLAKE2B 51451abbae042647f5cb659aa268c6e893269e5518b17b8bbf746219f2e5bf8e30466b57c41b1a9050439a02c0d3acc0ec7e833a6b7b0d6f320958bb79eff090 SHA512 4779c04ea3147a895a8e30df7c70741bc133f628b113037aeb4b2572b45211fe93f638ddaee74c976766ca99a1f3be0c68b3dce430ccda27f6e67ba6a7f875ba
 EBUILD zstd-1.5.2.ebuild 1456 BLAKE2B b1f0a313494d5025c9568bc09a4cc5c4caefc8aad0009ff272745541a97977fc812a69cd0ac05c8caf3a487d9cb51578e46e9446f9e9402448fd9227db6145d5 SHA512 445ca54ab352ff64fd6acbbc7e0a2e76ace9e4f55719efe80b304efb4e3da0e369e743f7516c22fd1e4d1611bcd38ea97624f7a874156e595f231b4e958147fb
-MISC metadata.xml 410 BLAKE2B c8c6cf3dc2e96b8d70bc199c8691f57fe43c561c3bdbeb71e49fc13f205bdf673e96e58d530b2e18c8ad2b99cd047ba5934437fda7828fe6ba177f5badc72a93 SHA512 3973ebd433d598c05023af411bbbb26b0f097d66e34c22fdcd31479ccc68c5a7bb318c29067a94de07ead566c5eec397d12b70a15d99e53ba08e6e9c999b61cf
+MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch b/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
deleted file mode 100644
index 63f0f47459d9..000000000000
--- a/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/libzstd.mk
-+++ b/lib/libzstd.mk
-@@ -78,8 +78,6 @@ else
- endif
-   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
-             -DDYNAMIC_BMI2=0 -DNDEBUG
--else
--  CFLAGS += -O3
- endif
- 
- DEBUGLEVEL ?= 0
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
index 847490d73d0a..6eaf61eef210 100644
--- a/app-arch/zstd/metadata.xml
+++ b/app-arch/zstd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 	</maintainer>
diff --git a/app-arch/zstd/zstd-1.5.1-r2.ebuild b/app-arch/zstd/zstd-1.5.1-r2.ebuild
deleted file mode 100644
index 29168c5fe5d2..000000000000
--- a/app-arch/zstd/zstd-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="lz4 static-libs +threads"
-
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-respect-CFLAGS.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-mymake() {
-	# We need to turn off asm for certain arches (!amd64) for now.
-	# - bug #829849
-	# - https://bugzilla.redhat.com/show_bug.cgi?id=2035802
-	# - https://github.com/facebook/zstd/issues/2963
-	local asm="ZSTD_NO_ASM=1"
-
-	if use amd64 && [[ ${ABI} == amd64 ]] ; then
-		asm=
-	fi
-
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 \
-		${asm} \
-		"${@}"
-}
-
-multilib_src_compile() {
-	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
-
-	mymake -C lib ${libzstd_targets[@]} libzstd.pc
-
-	if multilib_is_native_abi ; then
-		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
-
-		mymake -C contrib/pzstd
-	fi
-}
-
-multilib_src_install() {
-	mymake -C lib DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		mymake -C programs DESTDIR="${D}" install
-
-		mymake -C contrib/pzstd DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.2-r1.ebuild
index 8e810dcf9fc1..808d99d8300b 100644
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multilib-minimal toolchain-funcs
+inherit multilib-minimal toolchain-funcs usr-ldscript
 
 DESCRIPTION="zstd fast compression library"
 HOMEPAGE="https://facebook.github.io/zstd/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils
@@ -51,6 +51,7 @@ multilib_src_install() {
 
 	if multilib_is_native_abi ; then
 		mymake -C programs DESTDIR="${D}" install
+		gen_usr_ldscript -a zstd
 
 		mymake -C contrib/pzstd DESTDIR="${D}" install
 	fi
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-arch
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)