gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-arch
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
126 files changed, 1077 insertions, 1564 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7379b9a4d6a3..d53de5fc71d9 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 8603acac1d77..6423992774c4 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -17,8 +17,8 @@ AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
-EBUILD bzip2-1.0.6-r11.ebuild 3149 BLAKE2B 28c1c0f00331adefab03b4b09678253e2193519f5100bdd1aae3f853e9ff4b7b10182c4f30d5e75bfff3ed6ac053312b04900b6f8e99225240a3e9aa6d96c24a SHA512 cf104189d6affa11b90ca3f34ed69507174360af9d97acdaaf2eda58fb59a9b5eae0e390976e7889e5bb2d39d643ac75a60e5bec8a107d2644a371f4c0c0b4cc
+EBUILD bzip2-1.0.6-r11.ebuild 3150 BLAKE2B da2e8941f3208aff465b1850b244e523a4ac34eccb53c022ebc41d4dc8c035e88bdb452aeff1a2124e98a8ba8d705c42d7c930979fb2d97102a99f49124d366c SHA512 c083fb1551974b95e285e5c8795dd5474451048407aea61aeb441c5d5fb67e9dadeccbc151dfa746df6dc51464b5f3ef4901da7d08fe32c499333790775d81ee
 EBUILD bzip2-1.0.7-r1.ebuild 3013 BLAKE2B 8bc2d3f4c5622462b632002b44b039266d555f0d820d9f21fb4786426ee3704a5a14b7ba6d025e24329800c8f8c5fcc2f01d5e80a65799e679b2015fa1221808 SHA512 6d51134ac7304905e2c2a1b6fb75cb57256f751776026a0319cd75b8dec3a4c5b4ef7799655ace1e4a9de4284f05435cae24d44c9de783749457654d7d02081f
-EBUILD bzip2-1.0.8-r1.ebuild 3243 BLAKE2B 9d6da63821a3123130b7c470063da3f419153b292398e77e3018c27bbef2a114aad15e4322f2385c780a7cb74775ea951303d3e54d7eb51a96c5b09e6d579849 SHA512 32902e86874650ddf542ae2947fd71e70518ae3b3232708fd16fe5a5e57e978226bb4b84ab7cb29de135ef152ba2d0cad67f674559015caf62a01024fd1f4379
+EBUILD bzip2-1.0.8-r1.ebuild 3244 BLAKE2B f9849e6e361a376c00937be79f22974f710d689c73be3364ee17bc17bba539ebc6d451a2509ced464ea7a4ebaebb18030474e5105081dbc02ff1ed71dcd2403f SHA512 620e109630e8755f7712f620e8a4360cf712c3dccececc9d00d02472deff1ffa99281273e7c9688c2c080f4a9b56bebdafd23f4327b6523f7892706109e4b379
 EBUILD bzip2-9999.ebuild 1678 BLAKE2B 9b5c0dd688618e60c0be87e75dfffa168271ed8b335c1050435fec76c70c0d52ca069768e1f8a6cf4a473c220ac51ea5c948b086141f13bade0e916b03338d20 SHA512 8231a7fee67e3df64687c10cc815184ec46d744e3248bbdd27dd93f33df8112a1bcdc4457c97e02eb55a68decbcc704bdc074966bd23692e6fad538dafc5ef3e
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index b867474e5570..1484da57cb92 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index c6ca84ece131..49d36f93d65a 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index 3e42a4cbedfc..6e87d336ff7a 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,3 +1,6 @@
+AUX cksfv-1.3.15-destdir.patch 566 BLAKE2B 4bd22c37f2e254edc2956db45515666711a7ebb41322b0260492219c0061eb5a8ddd132c53d0dd5b49139e134b00dd0d85c372490c37d8c134f1a6238792e031 SHA512 b9f70b390922da4e353fa4b3bb5be46bd85701ee639a7b4c138fa6db0cd2aee20aaa807de040348256b1bbbca77928d699faa1e89de83604d56e8ab1a6a1f53e
 DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
+DIST cksfv-1.3.15.tar.bz2 27282 BLAKE2B c1df7bac982815915327753d8f6b888cc53395a0066bc5b34fb310d540c50c3006be2b9f31ebfac269d961126b0046a5b63fbbbe9c05c265953b2d2a94602a7a SHA512 a0b5286e0dce610e8b482a55cf8af38f8f8256e175435b6f2518c6566ea844c3cf2981f96c7600c7eb9b23b35cf19f1b55f540ba0f73f1267e4593e744858d43
 EBUILD cksfv-1.3.14-r1.ebuild 655 BLAKE2B fa3ff03e77bf86bcbaab1f73f5a591aa476f52b9f9693e903e714633ab7ac7f0e66e88c5b5eef02ee583a08b2b59225be9e6307eec9841ce437a369dd168caca SHA512 9690dacb7bf13035006bee9dccf634f008ecdbbb1b928452e97ec579bff51f8f00f41d397a5afa09960181219008f78a3901f803cdfa7623236f0178dba16b50
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD cksfv-1.3.15.ebuild 685 BLAKE2B ba3939af27410ad70502578249316e88ffbafa14b271c257abbc76ce26afbcc8ba22279e101952b21d441d60106b19454cc08e202cc6410f44197e836f95ed42 SHA512 cd92f1607e56d913a2ebf0d98dc584256afcfc90d0b193f33056eca92ea94a38727b8c1c672a1bd28658e1f4051e40d2fa5b3db5c6bee6eef35709782b296b26
+MISC metadata.xml 250 BLAKE2B 464b7b91f238241d7ed54230c2199459d0b86905b0e76ccbcfda7fb8466d4a2fbd3ed3d043696d26fcd2bbb405c47745f315b1f9001797535636038c2ed94f8a SHA512 a231e0814a9c32fc71cd94600d49161847d4dea3c59612bed1ac6e85e8a48d94f357f3b23338c7dd709cbdbdf4b969b839954655122e4e4075afb6cc583c5819
diff --git a/app-arch/cksfv/cksfv-1.3.15.ebuild b/app-arch/cksfv/cksfv-1.3.15.ebuild
new file mode 100644
index 000000000000..82027ff3bdc6
--- /dev/null
+++ b/app-arch/cksfv/cksfv-1.3.15.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="SFV checksum utility (simple file verification)"
+HOMEPAGE="http://zakalwe.fi/~shd/foss/cksfv/"
+SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.15-destdir.patch
+)
+
+src_configure() {
+	# note: not an autoconf configure script
+	./configure \
+		--compiler="$(tc-getCC)" \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--mandir="${EPREFIX}"/usr/share/man || die
+}
diff --git a/app-arch/cksfv/files/cksfv-1.3.15-destdir.patch b/app-arch/cksfv/files/cksfv-1.3.15-destdir.patch
new file mode 100644
index 000000000000..c9ae19b442d3
--- /dev/null
+++ b/app-arch/cksfv/files/cksfv-1.3.15-destdir.patch
@@ -0,0 +1,18 @@
+The build system doesn't know about DESTDIR which is a problem for us
+when we want to have isolation in our phases (src_configure shouldn't
+need to know ${ED}).
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -23,9 +23,9 @@ all:
+ 	cd src && $(MAKE)
+ 
+ install:	all
+-	mkdir -p "$(BINDIR)" "$(MANDIR)/man1/"
+-	install src/cksfv "$(BINDIR)"
+-	install -m 644 cksfv.1 "$(MANDIR)/man1/"
++	mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(MANDIR)/man1/"
++	install src/cksfv "$(DESTDIR)$(BINDIR)"
++	install -m 644 cksfv.1 "$(DESTDIR)$(MANDIR)/man1/"
+ 
+ clean:	
+ 	rm -f *.o *~ *.core core
diff --git a/app-arch/cksfv/metadata.xml b/app-arch/cksfv/metadata.xml
index 6f49eba8f496..c3a8ab4db220 100644
--- a/app-arch/cksfv/metadata.xml
+++ b/app-arch/cksfv/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="gitlab">heikkiorsila/cksfv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 2e627b2f43d2..3c40d8863b96 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -3,6 +3,6 @@ AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa897
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
-EBUILD cpio-2.12-r1.ebuild 819 BLAKE2B 08d6696adb989e2dfafca2317758955812fac942bbff67e4b43940a4607a765ee1181e273f265bf179d5edd82701a471d2f787ed0ebab46d8fe498d32f0b1eac SHA512 ae83b97c08efc5c28d9d312e8c7884534ee6b37a9c4550cc2445e50a12b561c15b2cbb0cb1358d00233b59b234a8442464ee710f038bb4bd02178a141ac2f8be
+EBUILD cpio-2.12-r1.ebuild 820 BLAKE2B 0bd3ab90aa51e11f7fdf9ad3fca7f8134953deeefd1f297e7c59acea4488e233255efc6cd7559972ce891d7a1a8d38c77dea4c550ef50eb140487a2c4a984c28 SHA512 79c3b2cb754b3b24fdf6cf792408971aba81048279887df0202eb43bca09727cf77250af7d4fb409f9eae378987cb8d9b9ed9660466ca4a172a70e5188e9fe17
 EBUILD cpio-2.13.ebuild 804 BLAKE2B e83fdf9524b6e956473f1fd974991d8ca50096d014335afc29d89739a6c1d541b18b1e1ef72e47de769e28920e9a137a65761bf0acfafeff161d7a42bce6f459 SHA512 1ed9849be48ed8effaac3046638090e4e7f4a3ab00a649bc69aa3b021d9663c55f1feb7ba1bf28ef4bd02fe97b4666bdbf1fccc8931ba9d63cd002f036fe83e9
 MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index 4c3a5cf1d7d0..8e803897a8cc 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 PATCHES=(
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index ce756e8afb86..c22430f18dc2 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,6 +1,3 @@
-AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
-DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
 DIST dump-0.4b47.tar.gz 583380 BLAKE2B a5a6c507fc67451e6ce5117b28b9e97e45783059358c357e1f6d4b268437c8340f13e0d77e97631112824eca8205c49d206a8a7904bc3e00b1f0d5abb31418f7 SHA512 e9c567fe2ffad196b9657c551d83f7607758f3704cad6cb407514bbe2bc765c16968997dc3a5bc92b9eb5900fa5bd6e7cebc92c81afff53339fca92891a5259d
-EBUILD dump-0.4.46-r1.ebuild 2204 BLAKE2B 4b3c3330641d1b450dc4b074902a20cd042ae2ca7974d07fe041ef3504daa7c9c598b1a572c238d0637be1168adbaa6f1d726e9f7a8337bb84e1a1b14de221e5 SHA512 9231cca4d70a776f1aeea7bd8fb3864af52b191fba5afd0ee76c0914971d9887c810189d7e6b3a55cdbcf6159a218638db4a17a2e30d0ea8163dccf714afb092
-EBUILD dump-0.4.47.ebuild 2245 BLAKE2B 43dff68f38c2943a34534d8cc2f65e43adde048ab74dc32712abc25e3618c8beecae5a86a592988a6f6ab6ccec106646f5d1120ba40a91738c1dd16248e3e455 SHA512 443456b1f6c6cda14f25c8e7e02221c96e1ab459890768c5dc059b7008bcfefcfbc3f56281e8e4aba2bf00741358850263524e432c3670d68614fc8a3e55d8e7
+EBUILD dump-0.4.47.ebuild 2205 BLAKE2B f33dd05e219610738dcdc06a49450932bcfc205f69604e407bc81f7d37a2d555cf30bcafbb55fb280f3e1f7ea8c3066983cf857399c9ce503a0f61d9def0435e SHA512 3317a307a1b5bfc507a56aeacd25b00d0ba05ae5a0a1194a0493c7ca501d6568a8e037912080208ff323fe056ccb8f1992004d84f0638c54826cae2a94b52cef
 MISC metadata.xml 442 BLAKE2B 2538d02cfc5053f384863f9b9eb06d0d143d5e53e6e5155d1b242b943fa9255afbb244cac5f79de78ac9bfe38197b1fe86d1c67602d7d2bbf63fa29424e56333 SHA512 37d2ba01ab35909dab9b0f96ea9f8de02ab9999d7da7724d04b4e5430a4d133ccec1cbd007fe9a6cbba619d39dcd66b48dc93b61cc1afa030b541574b7a75957
diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
deleted file mode 100644
index 1ebc6f993745..000000000000
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P="${PN}-$(ver_rs 2 b)"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Dump/restore ext2fs backup utilities"
-HOMEPAGE="http://dump.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-# We keep uuid USE flag default dsiabled for this version. Don't forget
-# to default enable it for later versions as this is the upstream default.
-IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ermt? ( ssl )
-	ssl? ( zlib )
-	test? ( sqlite? ( uuid ) )
-"
-
-RDEPEND=">=sys-fs/e2fsprogs-1.27:=
-	>=sys-libs/e2fsprogs-libs-1.27:=
-	sys-apps/util-linux
-	bzip2? ( >=app-arch/bzip2-1.0.2:= )
-	zlib? ( >=sys-libs/zlib-1.1.4:= )
-	lzo? ( dev-libs/lzo:2= )
-	sqlite? ( dev-db/sqlite:3= )
-	ermt? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	readline? (
-		sys-libs/readline:0=
-		sys-libs/ncurses:=
-		static? ( sys-libs/ncurses:=[static-libs] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-openssl11.patch
-)
-
-src_configure() {
-	append-flags -fcommon
-
-	local myeconfargs=(
-		--with-dumpdatespath=/etc/dumpdates
-		--with-rmtpath='$(sbindir)/rmt'
-		--enable-blkid
-		$(use_enable bzip2)
-		$(use_enable debug)
-		$(use_enable ermt)
-		$(use_enable lzo)
-		$(use_enable readline)
-		$(use_enable selinux)
-		$(use_enable sqlite)
-		$(use_enable ssl)
-		$(use_enable static static-progs)
-		$(use_enable uuid)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/sbin/{,dump-}rmt || die
-	mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
-	use ermt && newsbin rmt/ermt dump-ermt
-
-	dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS
-	dodoc -r examples
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
-		ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
-	fi
-}
diff --git a/app-arch/dump/dump-0.4.47.ebuild b/app-arch/dump/dump-0.4.47.ebuild
index 48981e19d4d5..d4a3fd541230 100644
--- a/app-arch/dump/dump-0.4.47.ebuild
+++ b/app-arch/dump/dump-0.4.47.ebuild
@@ -4,39 +4,40 @@
 EAPI=7
 
 MY_P="${PN}-$(ver_rs 2 b)"
-S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Dump/restore ext2fs backup utilities"
 HOMEPAGE="http://dump.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
-IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
+IUSE="bzip2 debug ermt lzo readline selinux sqlite ssl static test uuid zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	ermt? ( ssl )
 	ssl? ( zlib )
-	test? ( sqlite? ( uuid ) )
-"
+	test? ( sqlite? ( uuid ) )"
 
-RDEPEND=">=sys-fs/e2fsprogs-1.27:=
+RDEPEND="
+	>=sys-fs/e2fsprogs-1.27:=
 	>=sys-libs/e2fsprogs-libs-1.27:=
 	sys-apps/util-linux
-	bzip2? ( >=app-arch/bzip2-1.0.2:= )
-	zlib? ( >=sys-libs/zlib-1.1.4:= )
-	lzo? ( dev-libs/lzo:2= )
-	sqlite? ( dev-db/sqlite:3= )
-	ermt? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+	bzip2? (
+		app-arch/bzip2:=
+		static? ( app-arch/bzip2[static-libs] )
 	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+	zlib? ( >=sys-libs/zlib-1.1.4:= )
+	lzo? (
+		dev-libs/lzo:2=
+		static? ( dev-libs/lzo:2[static-libs] )
 	)
+	sqlite? ( dev-db/sqlite:3= )
+	ermt? ( dev-libs/openssl:0= )
+	ssl? ( dev-libs/openssl:0= )
 	readline? (
 		sys-libs/readline:0=
 		sys-libs/ncurses:=
@@ -44,9 +45,7 @@ RDEPEND=">=sys-fs/e2fsprogs-1.27:=
 	)"
 DEPEND="${RDEPEND}
 	virtual/os-headers"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local myeconfargs=(
@@ -70,6 +69,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	mv "${ED}"/usr/sbin/{,dump-}rmt || die
 	mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
 	use ermt && newsbin rmt/ermt dump-ermt
diff --git a/app-arch/dump/files/dump-0.4.46-openssl11.patch b/app-arch/dump/files/dump-0.4.46-openssl11.patch
deleted file mode 100644
index db18e8190f5c..000000000000
--- a/app-arch/dump/files/dump-0.4.46-openssl11.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: dump-0.4b46/common/transformation_ssl.c
-===================================================================
---- dump-0.4b46.orig/common/transformation_ssl.c
-+++ dump-0.4b46/common/transformation_ssl.c
-@@ -215,7 +215,10 @@ generateIV(Transformation *xform, unsign
- 	/* to be exposed to any attacker anyway. */
- 	*saltlen = 16;
- 	if (xform->enc == 1) {
--		RAND_pseudo_bytes(salt, *saltlen);
-+		if (!RAND_bytes(salt, *saltlen) != 1) {
-+			/* PRNG not sufficiently seeded */
-+			return -1;
-+		}
- 	}
- 	memcpy(ivbuffer, salt, 16);
- 
-@@ -274,7 +277,7 @@ ssl_compress(Transformation *xform, stru
- 	digestlen = sizeof(digest);
- 
- 	/* generate salt, put it in header */
--	generateIV(xform, salt, &saltlen, iv, &ivlen);
-+	generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */
- 	memcpy(tpbin->buf, salt, saltlen);
- 
- 	/* compress the buffer first - increase the entropy */
-@@ -351,7 +354,7 @@ ssl_decompress(Transformation *xform, st
- 
- 	// how to know salt length?
- 	memcpy(salt, src, saltlen);
--	generateIV(xform, salt, &saltlen, iv, &ivlen);
-+	generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */
- 
- 	EVP_DecryptInit_ex(xform->state.ssl.dataCtx, xform->state.ssl.cipher,  xform->state.ssl.engine, NULL, NULL);
- 	//EVP_CIPHER_CTX_set_key_length(&ctx, 8);
-@@ -515,7 +518,7 @@ Transformation
- 		//EVP_CIPHER_CTX_rand_key(ctx, t->state.ssl.key);
- 		//EVP_CIPHER_CTX_cleanup(ctx);
- 		//EVP_CIPHER_CTX_free(ctx);
--		RAND_bytes(t->state.ssl.key, t->state.ssl.cipher->key_len);
-+		RAND_bytes(t->state.ssl.key, EVP_CIPHER_key_length(t->state.ssl.cipher));
- 	} else {
- 		// how do we get keys?
- 	}
-Index: dump-0.4b46/rmt/cipher.c
-===================================================================
---- dump-0.4b46.orig/rmt/cipher.c
-+++ dump-0.4b46/rmt/cipher.c
-@@ -23,7 +23,7 @@
- char *
- cipher(char *buf, int buflen, int do_encrypt)
- {
--	static EVP_CIPHER_CTX ctx;
-+	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
- 	static char *out = NULL;	/* return value, grown as necessary */
- 	static int outlen = 0;
- 	static int init = 0, which, blocksize;
-@@ -71,13 +71,13 @@ cipher(char *buf, int buflen, int do_enc
- 		}
- 		EVP_BytesToKey(cipher, EVP_md5(), NULL,
- 			buf, strlen(buf), 1, key, iv);
--		EVP_CIPHER_CTX_init(&ctx);
--		EVP_CipherInit_ex(&ctx, cipher, NULL, key, iv, do_encrypt);
--		EVP_CIPHER_CTX_set_padding(&ctx, 0);	// -nopad
-+		EVP_CIPHER_CTX_init(ctx);
-+		EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, do_encrypt);
-+		EVP_CIPHER_CTX_set_padding(ctx, 0);	// -nopad
- 		OPENSSL_cleanse(buf, sizeof buf);
- 		OPENSSL_cleanse(key, sizeof key);
- 		OPENSSL_cleanse(iv, sizeof iv);
--		blocksize = EVP_CIPHER_CTX_block_size(&ctx);
-+		blocksize = EVP_CIPHER_CTX_block_size(ctx);
- 		which = do_encrypt;
- 		init = 1;
- 	}
-@@ -95,7 +95,7 @@ cipher(char *buf, int buflen, int do_enc
- 		outlen = (buflen+blocksize) * 2;
- 		out = realloc(out, outlen);
- 	}
--	if (!EVP_CipherUpdate(&ctx, out, &n, buf, buflen)) {
-+	if (!EVP_CipherUpdate(ctx, out, &n, buf, buflen)) {
- 		syslog(LOG_ERR, "EVP_CipherUpdate failed");
- 		errno = EINVAL;
- 		return NULL;
-@@ -106,6 +106,7 @@ cipher(char *buf, int buflen, int do_enc
- 		return NULL;
- 	}
- 	// assert(ctx->buf_len == 0);
-+	EVP_CIPHER_CTX_free(ctx);
- 	return out;
- }
- 
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 860b8ac3b69a..19142566ccb9 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.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
-DIST file-roller-3.38.0.tar.xz 877960 BLAKE2B af1c4800e24adfb36a8f8f108740f9cad14bcd40f797b2430d00e428d723587de75be03848aca612536cee768b6b372534e0b6a322dc40d7ab1c41eef540916b SHA512 9c2e3c105397bceb08e30c9796b9242633fe49772aed2e7f67461c34a51be1493e922301b1fc29bdcb0fa50d220f4a7db2ee7642f629007ce2bef00334d7110e
-EBUILD file-roller-3.36.3.ebuild 2176 BLAKE2B 6e5b451ec8ce8a4f43b59a5c51ddf2c7389489fe80549efede5ebb23463f699e9a27ee86932d1a43b011def4a7d0cb4327f3fd1959aca409df649fa08bd3d477 SHA512 b7de40066a28fb6761595db964f13d0b41710da2bb542a9a78740677b36ea4fcf3faff79a592090c11a1c3fb537718c667a2257b98f7109eb5b30d758da75a02
-EBUILD file-roller-3.38.0.ebuild 2118 BLAKE2B 07c23acfdbd21a77bacc13e757bfb80ab5c45057dde0d8de5c3659e6fe87d69ab6bac8973d7705f450e3c74b8df2082ba430ec0fd6b8d0270583c5ad6665fb22 SHA512 0ddb5b99f62bcead75cd0e2c9c4bb0efff6bbaa4d33c2299e0e7dd7055a1294ad30e9ba2704b5c6cb7686975e694b7c03d66ea6b34be3114419e1d9b32bbc1c4
-MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf
+DIST file-roller-3.38.1.tar.xz 875572 BLAKE2B 29a05d48971c2172177bd1aa52448ed5432a69733644b131517dbd7dd50cab971801d1bff5837dba74ae48ea0487614c7c7ebd4669f04f7d42e6257161fe1776 SHA512 b1936481140084c84d7bdbf361859b0ff1fed8329e26b692f0f0c8d1a3a1ec494b493aa0fb4de9f0ea5004b18e4bd69859656fe424bf413d720b04fc56e453f6
+EBUILD file-roller-3.38.1.ebuild 2180 BLAKE2B c2c10d784a90e57eb4a3f44511689e02042db061636c3055a97f54ed7449d6b8aa4b5dde339bd445025c395046a3b1aaf207763409c735e0d15def8b706d3ef4 SHA512 7b6bac2e9da061aa93d8b5da88d44090e20ad1dc01bf1bf3b95ba2532489ae5911f4c809fab528b5101c9d22a54b5813a1a8fcd0e589245ffb09f8c0d7c35a7c
+MISC metadata.xml 522 BLAKE2B 555fc1eb7ab102a7bd439544e158c0a554b8dee1d3891dbc3b9441c5063ad2666795c682e9ade30a920daabe5788017a67680095832e760b9c9c666dcba94928 SHA512 6a8988a025352b00d1dff7b4ab3f75bfb4f95b890a1e1b0fcfdd840a67fe4897dfcce275f8ff439345f094924c72171b1d03e70106f84bd8e0aff8de5510d698
diff --git a/app-arch/file-roller/file-roller-3.38.0.ebuild b/app-arch/file-roller/file-roller-3.38.0.ebuild
deleted file mode 100644
index 1e54bed626cc..000000000000
--- a/app-arch/file-roller/file-roller-3.38.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson 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 ~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:=
-	>=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="
-	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_use nautilus nautilus-actions)
-		$(meson_use libnotify notification)
-		-Dpackagekit=false
-		-Dlibarchive=true
-	)
-	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.36.3.ebuild b/app-arch/file-roller/file-roller-3.38.1.ebuild
index 4e98102c8e8b..7a57fade4cb0 100644
--- a/app-arch/file-roller/file-roller-3.36.3.ebuild
+++ b/app-arch/file-roller/file-roller-3.38.1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+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 packagekit"
+IUSE="libnotify nautilus"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
@@ -25,10 +26,10 @@ RDEPEND="
 	x11-libs/pango
 	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
 	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-	packagekit? ( app-admin/packagekit-base )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
@@ -69,7 +70,7 @@ src_configure() {
 		-Drun-in-place=false
 		$(meson_use nautilus nautilus-actions)
 		$(meson_use libnotify notification)
-		$(meson_use packagekit)
+		-Dpackagekit=false
 		-Dlibarchive=true
 	)
 	meson_src_configure
diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml
index c6657ffe3f7f..9db7caf1ab21 100644
--- a/app-arch/file-roller/metadata.xml
+++ b/app-arch/file-roller/metadata.xml
@@ -8,8 +8,6 @@
 	<use>
 		<flag name="nautilus">Build contextual menu extension for
 			<pkg>gnome-base/nautilus</pkg>.</flag>
-		<flag name="packagekit">Enable support for the distro-neutral package
-			manager GUI PackageKit</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">fileroller</remote-id>
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 9f3b9fbda2f2..3bd601768eb9 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +1,3 @@
 DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
-EBUILD gcab-1.4.ebuild 1115 BLAKE2B 384d5ef62f9354bd0182075d86e86e1bffeea178bf02472942898aea81c083f128d71fd883eee96fe44abeb8352fc2b48a07f1cb202d79979ea7f77a6d273ccd SHA512 a9084265d337bf85582d08579849a3f01cd02908a3346570ec480e49ad813faf7591ab2ac0e2b1b392783c9eea1d7d709a2effe27a722aa725b90b98e6707f3d
+EBUILD gcab-1.4.ebuild 1116 BLAKE2B 51072f0a075a8819345b64222721fb359ca4e0595816e82e87bb8ac38cb38a74ac371718d0f896f25d6ac431dda7b2790c5877d8d4c9a4c86618b9338f45894a SHA512 b09333d9808ecf4412b18ff4316febe0ff1968b1f05f08ae32b73ec431d198cdc5b017887a60716656109ed6c2b521a93ac7fc1f30d43496867e42855d7e3bfc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
index 71661b471bf8..38e48924bd1d 100644
--- a/app-arch/gcab/gcab-1.4.ebuild
+++ b/app-arch/gcab/gcab-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 49e1da30d02b..f928ffdd5e0f 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-autoar-0.3.0.tar.xz 297072 BLAKE2B 7c7204d605c80a6e0735e0be6dec1024e6073cb99d6bde885a1c8b10b7f6e6476a181c99b5bbb755abfdf86bc56aff3d9b174189ff29cc58d24607b482f242ab SHA512 2f5962e115b25be9578ecad51d9906e426bb60b675e42b364d9f0b67f0751cf59d4afd4dbfc8adc0d13256e5dcee445c5195262e6ff0839ef88350b1c6e5293a
 DIST gnome-autoar-0.3.1.tar.xz 297904 BLAKE2B 607c9b3a26cf23eed3b9b19c32e2e0b3b9127977b5836b0b263cc3163490fd10052716e073264bbe946e351ec096021dd243560f6e7781400029263705308328 SHA512 a8ece09f66d7f1761fb4217f267b8a6dd1dee2266cc10f9944b1860c364e0d671286c6bf9477bdee5d0dd231b959ebefdd7a7003d679c38fe1553863033311dc
-EBUILD gnome-autoar-0.3.0.ebuild 936 BLAKE2B b58a09009e3a27bcc77dea24117043e78e65608666277bb19b2b0cc029d048021ed9788a38b9c3399e1c85c5c2f6b571b8ca9b11778aeb3bbe32acb86c279ce3 SHA512 8cf3c31ad17f7239e6d43e11f23767fd05ab51d2268e3dfe05667cc62ec7900dfa5dfdd18a15e398a247fc6896715860b13ff68894c0b80d99637cab86da9d45
-EBUILD gnome-autoar-0.3.1.ebuild 939 BLAKE2B fea7fb981052b074386410ba62748af7a4fd09e08c11794a8f330123fcf988a92f132e30277b4ea632680e2ccb963dd8d4ab03583ff0629294234a2deac18c58 SHA512 afd3808574bd3a393e77ade4779ec49ccaa889a543d31e01d3dbec0dd92dfc5bf77d9f5946cacc3cb24da68ca8b357b61168363a7a932074c1c2fa7d053dad04
+EBUILD gnome-autoar-0.3.1.ebuild 936 BLAKE2B 1127152a69f70e7027e61eaccb6e8ae84c399e057ae17db77d0cd1484e596e9b0c5f203bb6ee6862decffeb3e7a2d91d40287085ceb92f6f2e1cffdda4d8d748 SHA512 83f69975a3ab7345ee07ca627ecd7bee5be1a9aa5890f7e4ff0d72e2ff783134d97aff66e3cc267074bfa0bd1b895f33325c57c5e027464850078334edb96c73
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.0.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.0.ebuild
deleted file mode 100644
index 8df76dd91251..000000000000
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Automatic archives creating and extracting library"
-HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-arch/libarchive-3.2.0
-	>=dev-libs/glib-2.35.6:2
-	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable gtk)
-}
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
index 5ef87130fe55..9fa0dc167189 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.4.0
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 718da0fd6749..af9cefff76e9 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,6 +2,6 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
-EBUILD gzip-1.10.ebuild 1080 BLAKE2B b8a0d64a37ca54fb45fcf8392b948e5f62fcaaf18969bce500a28d25988bf3049ef0a0c9a124fe7d6401e5997583e15c35fd8f978bca85812fda9189b75a4461 SHA512 d1bfeb944eb54c9383aabc1416063ed259afb86a47c1875dcab872954e5b627530cab5251c2527de3026c62c5e47049455c36139dc42700ccabdd228f3d02799
-EBUILD gzip-1.9.ebuild 1128 BLAKE2B fcc7de9606ccf57da14239d909ae785a872115ea13bd0d5caab544b8bec7f843774dc12c4f8de1900ccdc2aff13683ab59d76fe7f15905a51ed2aa1806e970ff SHA512 d1f7d608cc4d92f1b804b7c4a035ef01576c1b3f8982f26946cefb7814d5ed0fcc7c7c678461f21789dbbf8748c4e03434d18c57ce6be2c7035e1a4735bc19e0
+EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
+EBUILD gzip-1.9.ebuild 1129 BLAKE2B 07a984e42413101cc2227a241c3228020d6f10295009753b508e5e665f34acbad62bc01480097714f73b6380a1e51626e354c29dd0d249eaa7af18a3cfc97c45 SHA512 41fa1e202e57c15ee2e48078ebcb60ad9c1303a9e45f4cccf74c1823a2a95fe2422142fd091f8c465da79fe88d29c0173f4d4400216b80a484584104461d72be
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
index e1c3fc545fcc..c7101f915552 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 08f3b6b95e7c..5e55b04b2fff 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 1602e7f6a37d..f63290e3a8ca 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,5 +1,5 @@
 AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
 AUX lbzip2-2.5_p20181227-fix-unaligned.patch 1061 BLAKE2B a8c11adbbf53806b09d9b0b6b724247a17e450eac6953a9d9852539ab6d50901d739b243a0d4c72cc46cd7bfaa609fd6829af659e0c6ed6987e6725c471ca201 SHA512 0ddd04a06d2cc763b454074aba588d2cb252e0ab8c83c37133deb5cef2c265261fc38f6b32f8aed5ddbbc8aafdcb29e96df1b61f2f2cfd2e1b93818efd69114e
 DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
-EBUILD lbzip2-2.5_p20181227-r1.ebuild 851 BLAKE2B 427826bfec931181d64aa582b6bb82fa209f8dd52f364c42cb19661e644e1cdd85286b1e51f924ae60147f1474c1a596ffb12475560346fcac21ae4ff5cb523d SHA512 c17f5c769a6c651c8b7dab469f782f6c7af24ba3cbca05cb9a7ec2f454ed8d8bacb34d4d8780c1296d7b00ba38e580daeecc609b5124532aacd260005ed4ff8f
+EBUILD lbzip2-2.5_p20181227-r1.ebuild 852 BLAKE2B 7a74c59e4f2be8aec6dd63a367fe4e657a7ea46037acde43d7984650c0dd95f3ec65e642a2b6f01b90735d40aff90d178fc6b01747e19d38460678946677176b SHA512 e20b059c71684f695d66f42090a32febb1bcd2854593fdac5f48ab06fec64e278e56aed537fea9c91b255029408bcb6865c16d9e0347073d83df41d355e5821b
 MISC metadata.xml 652 BLAKE2B d44ba0b1387022f4fff2ec24e78c041a50e58f336abdcf8d31c3e2f9e429cde183000c6775eb81dbd50e9598508dcbadff5b3999dd6ee69d15214e8d22165a54 SHA512 64391d7d185471ef1b02e71a877adbebaafdb4d7bc95432d980d3559440dc199c4f68b275e98b8c0a2d10bfebbaff3544a9fa5d4bd34349404836468a0ee41a2
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 822636019153..ab756306f95b 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index f7f9ad322af7..6888857d8d07 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 870 BLAKE2B 20a7842d83b43155289a5866a7f024669081784c3678012c47d2717f225f408386b1a245d460830b15dab9c285f7562bb91dee9484524c6df00e75f99a22477c SHA512 8bbea41dd634ed95a201b98f7b70f77f3cefafb615b6f6219e4f950ef7739c7a82b3ef61aa921db8c62382f93c4862326cf05ca13d94ca95070824d7dc9aee98
+EBUILD lha-114i_p20201004.ebuild 871 BLAKE2B d5c50e46e9bbc274afe14f3447d2a58baee3a648457b2a184bc891d98befe376f73f38d1712e36af73c2388a46ac5a0f8781f05045da383e4489cdea5d3b81fb SHA512 e7e575c584b14e736e75c60ac5afc469b776c205393860f373aca52f41ae264d61484100922488bcac46eff4b5d75e303f9284bda357be7a2b49d7e445045c0f
 MISC metadata.xml 323 BLAKE2B d62440b3345512ef9a0f084ae6b4a8e1026825106313de9ef0262e8c48f823615ca258ed718a14c5f9a0fdf09036db3980c3a8caa4c817fcaf6c466eb86dd832 SHA512 e1dcabab6c7ebb049bc73543800cd05e0ee7c911dfb399d4ec1b735494f6b5820d98546e5c2eb86274215c06008116a4b779d413aa982cad0fa068b8d470f1d0
diff --git a/app-arch/lha/lha-114i_p20201004.ebuild b/app-arch/lha/lha-114i_p20201004.ebuild
index 654cab125457..88831bf85bd4 100644
--- a/app-arch/lha/lha-114i_p20201004.ebuild
+++ b/app-arch/lha/lha-114i_p20201004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 1828ec5fd576..c3f9c3dbe804 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,5 +1,5 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
 AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
-EBUILD libarchive-3.5.1.ebuild 3889 BLAKE2B 69eb46f44c95cb4a6dae1efc2fc95ed5a37b2f5262961f31abb2902e3acb14e3acc5ea07332ed06393cb265f1696406a902f794fc9179265f67c9a315a410771 SHA512 02f5ddeec3bee50c8abebefc48030768378943141e916e6e6616a694e7ebdc80b8bfc15a3cd2f0dee126262006933a25e1e7494913cb681ba3a01a3a7cdc43c3
+EBUILD libarchive-3.5.1.ebuild 3890 BLAKE2B ba23ff4c95a0a4022f7175fb30f626ba3fea138220ad3c9075849001e30ac101739ade752458fe48753ea3eb5501ed84e9048464a7a7f4fd4f7e5dd54135e414 SHA512 c8062458251fad902c29b39a57284631a2d3babe7ca4ecc4a2b1b46ea1b5b8babf05a174be2ea4910f5768bf1db32b88dffa7c6b272bbfc7b63e31b78f2a8a37
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
index 29fe27756e66..2db8781cfd2a 100644
--- a/app-arch/libarchive/libarchive-3.5.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index 2c18b392060c..3d2f9c234726 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -3,5 +3,5 @@ AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb4
 DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
 DIST lrzip-0.641.tar.gz 262761 BLAKE2B 5a81d9ca8b40c141c90488e9ffcd1dfd5bef3fe7cf9b02c00b9382cd902ef8cd891401f21c9cdd5d5750daf639c05a1e6f1f010fcbf42a9cdaa4f11921fac783 SHA512 cb14dda15485faa24cb840dd94ecd4741bd47464770ae8b27f97b5c263d8a32e40ceb17b288f0f70426598ef2acf84b091593fc8cf7a0f2db0abde88d09a301f
 EBUILD lrzip-0.631_p20190619.ebuild 1171 BLAKE2B b9c10629ea1ab82c589dd57ea939652afd22166f870438a7afc08b72d72b3e1d0b70af788dd24db7906f4804b9509e86065331fe053bd7085da8d767c1da7280 SHA512 d772a9acf5490b0be1eff06aedc8fcd4ab659e5be3ee9c1b6a4320d4799157472fe684aa8f4f4f0b017771c2d69b6e487d82572b37f8ffad1ef51e672ae1c9e2
-EBUILD lrzip-0.641.ebuild 1113 BLAKE2B 4b5324400567699433108c4032a1d43b2212f5b36e324bb7f4404f36c5bb0ab65a8578b55ad6fbcb5a16134bccfda2d05a3371f0cc7b3f135703f47e2c75b6ba SHA512 9e4edd36636df3cb03ae32ac9cc88efb4ce2b99f0ed974059dee79c7e8e0e4474f696cddd2cb6f9452b3b3d3b7b09b90fab3ad4cbf7b83b48d15e9fd526b460e
+EBUILD lrzip-0.641.ebuild 1106 BLAKE2B 050248374266fceaa6b6e5de500045cc468575c79d4999534205863e34c2d0918772cab601c1ff190ebf5294d9466a3d4008420563eb15b7bce042474a2dbd88 SHA512 e01da5824d1e250419178fa308e14fa5124c9156629feddf2cb4ba4ccf6e8ef330d1a58d8d1d2eca47450a0eb7bf49a78b6ea596bb60c350444c79877ce2e3e9
 MISC metadata.xml 607 BLAKE2B df5e2e425d0046a6cb9d66536d6295fe454b057948e2605c69309d72acde8ecc4bc7ff2d68ac705ec4960eb4cad8603e33d7c7060404743173b50eef4da621f9 SHA512 e02e533237ee5737b2ad1e134fdf48e3c1350e4c2e1541f27ad465608ede575976fab666d136eb5314bda99bc5e1d2f55d7cb7b90c6cb744e407d6c7704bd158
diff --git a/app-arch/lrzip/lrzip-0.641.ebuild b/app-arch/lrzip/lrzip-0.641.ebuild
index a5c7f90aa0c6..a89029b177fa 100644
--- a/app-arch/lrzip/lrzip-0.641.ebuild
+++ b/app-arch/lrzip/lrzip-0.641.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index 2aca87d55f50..4be94b6be81e 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,3 +1,5 @@
 DIST lxqt-archiver-0.3.0.tar.xz 157492 BLAKE2B 05d9862c75cacf3b73670333a5b2dafb6abfcfd7433a1ebc3d27948122db875f892eb58a05221c880d1ac23530362ae4d9e7c6ebe0f06552b10bb903d51a6868 SHA512 840fae890611b081a1355ceb58ca65276784e6825822859ff2d6506190212268f1c67733dc94c65c9c5758f8d6a25c286c2b339356a50f29474b0c7ce2569d2c
+DIST lxqt-archiver-0.4.0.tar.xz 167124 BLAKE2B 2d9295200c284e2dc0c2b538a92952dd0a11882211e5d1d5838141583b4a595b65c26a057e5c9733190182a5f78958e15d0e086356d75dd4e0c72d3510a34cfc SHA512 e1b323cd118af3726009e153c4f9766ec53b29fa0280530da16e2101d36ec45b55de0fe3d87c1386a4e5b3d88712fd209659b4ebb9344af689812600ae136ed6
 EBUILD lxqt-archiver-0.3.0.ebuild 1173 BLAKE2B ed90bcdc16bfe9a9401ef0ee07cbba79cf7c1bba6dd4f87be0a535442f96f63c69b534bb62d0a6767dd974d6ea92c7ad3f05ca8710b66e1f117ac477dbee1f28 SHA512 7396a031b3c47f978d67a01f2cef96cfd7bfd3375b8c409bf6af5dd22f438eb922379d4c70c000f8ac0f56bb7f2652c76598bd962a42911b7e3bdcea5a117385
+EBUILD lxqt-archiver-0.4.0.ebuild 1175 BLAKE2B 5235a42a1662743906235aa3a2c70b48ff11725208e377405467dd1c7cabef7d444082a48d967656e8144eacff672b2ea0c78aa23ccc5ebf261758f5c3cd4564 SHA512 bfacb98d217c22d0b805e21f66a50ce88694f0dc2973ece09728ebb38b00fda5516011771adc245fe9c036a8e3026db7c2854853eac2212e3556888ee215b4d1
 MISC metadata.xml 329 BLAKE2B a6082a9d0185aaa5f233d41d9de505901392c80159cbf4cf769e1a38008aaa06793e2283c974df743f2141488bdb2cc087e7990953b16b752092f31de7840c83 SHA512 42d4c3e67fbc3a84a79ed73710e8322f4a30ae6565e1aa2cbf122661e6864a8e102e67ab973942953fb2358754303b3f2d2963f3ebf15188bc23fd8ca31f5e60
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
new file mode 100644
index 000000000000..4bf9466ba805
--- /dev/null
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI File Archiver"
+HOMEPAGE="https://lxqt.github.io/"
+
+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 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.9.0
+"
+DEPEND="
+	dev-libs/json-glib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=x11-libs/libfm-qt-0.17.0
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_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/lz4/Manifest b/app-arch/lz4/Manifest
index 78a5907564da..6921e0024e1e 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,3 +1,3 @@
 DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
-EBUILD lz4-1.9.3.ebuild 769 BLAKE2B 580f02d6a7c506676a131870f329f70155ccf28b2fc3c81b3b4443a9c00a061ecf9cc33ddcd4f2fd5c732a1827d927d667d929f1cc5b97108f219f733bc91fab SHA512 e6f2f3dfcd6f258eb0a69311fd984a9155b3fd9f04a72df25bce3c87434ceec2d006b24718866af9d90c719d208ebb4a83fa57d075d1cbf31ed793ab97432e6a
+EBUILD lz4-1.9.3.ebuild 770 BLAKE2B ccec090ad61d3899c4a0ac87feb1bf7e88bc8861f50d1ec0be672c5f7b6f400b81374f524c1edf072fb4eb472fdd76b0bf6ba5a017764d2e1f0816ff00d2d4f9 SHA512 144cea4029471a28d26511608095f4cf32cefa80c0a059a2c61c50227bf4744e1fbd7adaf8460fdef8f8377c97657df4ee5bc29a7d5a1db2e1b208a22957676a
 MISC metadata.xml 488 BLAKE2B ffeed518b26856fcf19099ec33e1f9e93d302411504037c2eea791dddcb64e7fbc13b425a6797bba3386dc69810c021b32c66223dda4838bb710d5a2a86e725e SHA512 bc9e9b477dd0fbf300efd55ce4c31350fee375ded0b3f463116488fd4e66ee685b55464a46338abae47e0ee845333019dfba9ee2e459dc0dd91b640d42bd4902
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index 74a473c1e9fe..02eac78fb6dd 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2 GPL-2"
 # https://abi-laboratory.pro/tracker/timeline/lz4/
 SLOT="0/r132"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index 3f955dc2cb6f..213891444b83 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,5 +1,5 @@
 DIST lzma-19.00.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-19.00.ebuild 1012 BLAKE2B f365b49cf0347b05182ae84fcd349b769b31774bee8353d5db348dffcfc622e41fc8a39f253ba86811537c7a3aa45401119615c7515f5e0800b07a4cebe2e5be SHA512 a0c37b280e59a1f55d881ceadb2fc59c26e0e47d19b0f245bf7c18042f0e45dc86a8d87f484990bc10fdec7d30efe93276b5a04992b220e1ae2b19a8fefea7a9
+EBUILD lzma-19.00.ebuild 1011 BLAKE2B 5010610a9f2fdbef324426b97e25881cab9f4b3e281ef89a04a0cb633af8826d8644a7804231a1543bf8672e66c8f25ea04be6589b3bba59721011640313efe5 SHA512 32a1be293e4b438e73ec9faf5a33d04c7da25c82f9784839ce12adfe7b4d9206da7bbef277a44e420d8aedf1de559ffac14e02d22d3468fb3701894478a41b81
 EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 768a2f1db8ffa970a91e108e9666a1ce3fb2d7061bd8f79c678333ee2c7f864391e0d605d4255bf73934288f3b2afbd84bb0ae4385a49b3cb763851602a6fb08 SHA512 c472806e0b31156679c40ef8ae60e6a6b4b079e49c721a8879683b5991dfae9630550663c983289bf3533dc5eda47eb6eae92c0b5830dd84c545ba0d073afdac
 MISC metadata.xml 474 BLAKE2B f4cbef9ec8a896782590f1e51783f9054b2a2e7f0731bd8798df222cdcb41f9ea9343642e0ca0e1e9ca2d277e35d397fd4d27c17d3415a9078e0326ef8f1dfa1 SHA512 76975957bec1e489dc20569d89a198b4dc70307032b11e716822ce9b3d11a0688fef94270ec1d23995b81b01fee8a4262d9d22764096b207096d887c0494c9f6
diff --git a/app-arch/lzma/lzma-19.00.ebuild b/app-arch/lzma/lzma-19.00.ebuild
index dfc53ece7bcd..b4759f78f3fd 100644
--- a/app-arch/lzma/lzma-19.00.ebuild
+++ b/app-arch/lzma/lzma-19.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.7z -> ${P}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 BDEPEND="app-arch/p7zip"
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index d118c2e2f14f..7a0a37588615 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,5 +1,7 @@
 AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
 AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
+DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
 DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
-EBUILD makeself-2.2.0-r2.ebuild 706 BLAKE2B 310acea611438b2796a39feb28edf9e51454a33498845220995e9d4d1212e35fb96847949b11758c33624fd4ec6301d080e1cdd383904036b7c3bdf33dd12235 SHA512 aa4211a08ffaad8b4d116d98474efa9dfb6208e8dd9d30a7044ed50c4bb3c150fde5c97c2d383f19f5bc6e98c9d530f7ecd5011b15237b4de9df555ba1c49bd9
-MISC metadata.xml 279 BLAKE2B 8a6c887387a4bcf867fa969048c281706fc5d65d5e9e9ba0a501148326c3fede4d4ec2770908a771437aaf6a0640efd44f723cc2c3e84bb0ef455be4ca4c4833 SHA512 19449735028e77231307a51d7778a21561adde9feca814292a96b178a5906bd9f109ef18f2167683cac505d99ca90c32522e6b40e9b16d040089b5a790910fcf
+EBUILD makeself-2.2.0-r2.ebuild 695 BLAKE2B 24c8845a3765c0540fbc61a0d479a52aa48368c5992391b24a6e50d4d21df96973fd4c24dfb37d72eade758d1350b04dcce6061603e1e36df7aad1c461440cf7 SHA512 3686991760d6bdaca0ae09db9506f6337609550052041ec60a5d1da3321ed99a08f1f5e149c56228b0086f1a664531b8df81690496bf80774fe8f7546bb08022
+EBUILD makeself-2.4.3.ebuild 945 BLAKE2B 6ccc7d8b7311ae87c9c4d9d43e32457c1f2d9b2c32a6bf0e83da1e1c0564a73297b0b2a741e61f4df3485803e67f69a44ba4e7c709f8fc428a5f48938c0af2a2 SHA512 e5d953ccca8ddc860893480bf5a1e762ed310a3c60366406cc65e9f1f8578c5e465c955d6625d70609f742d10410371d4f4587dcc64d9d5323ccd12a9c8c4e6b
+MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
index b172fd0d2204..04f9402991c5 100644
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ b/app-arch/makeself/makeself-2.2.0-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit unpacker eutils
+inherit unpacker
 
-DESCRIPTION="shell script that generates a self-extractible tar.gz"
+DESCRIPTION="Shell script that generates a self-extractible tar.gz"
 HOMEPAGE="http://www.megastep.org/makeself/"
 SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,8 +16,6 @@ KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/gentoo-functions"
 
-S="${WORKDIR}/${PN}-release-${PV}"
-
 PATCHES=( "${FILESDIR}/${P}-help-header.patch" )
 
 src_install() {
diff --git a/app-arch/makeself/makeself-2.4.3.ebuild b/app-arch/makeself/makeself-2.4.3.ebuild
new file mode 100644
index 000000000000..a46a9d81b0c7
--- /dev/null
+++ b/app-arch/makeself/makeself-2.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="Shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	default
+	rm Makefile || die
+}
+
+src_install() {
+	dobin makeself-header.sh makeself.sh
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README.md makeself.lsm
+}
+
+pkg_postinst() {
+	optfeature "lz4 support" app-arch/lz4
+	optfeature "lzop support" app-arch/lzop
+	optfeature "pbzip2 support" app-arch/pbzip2
+	optfeature "pigz support" app-arch/pigz
+	optfeature "zstd support" app-arch/zstd
+
+	# Also bzip2 and xz are supported but they are in @system.
+}
diff --git a/app-arch/makeself/metadata.xml b/app-arch/makeself/metadata.xml
index e9ea9a6233c1..3ded3c291465 100644
--- a/app-arch/makeself/metadata.xml
+++ b/app-arch/makeself/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <email>matt@offtopica.uk</email>
+    <name>Matt Smith</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="github">megastep/makeself</remote-id>
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
index d420a79b3ada..9e03abaa4ed9 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -1,6 +1,6 @@
 DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
 DIST mt-st-1.4.tar.gz 37864 BLAKE2B 25ae656b6442e53570366405ba76da9150cf1d4fe33c612bf922d8be967ce6b60be191948507a62bb1881d4be63ed192f7d03f1d63c38f5772aec2f3d2fe455b SHA512 e6655a5957d3ac470c0cb0a1955a12397aa22f3ea1a427cf776f6bf2d6fd665439b2bfa54c3870b7974da537f0fe71d3be43126be1a7db903e6bc7be4cfb10ec
-EBUILD mt-st-1.3.ebuild 573 BLAKE2B 0ddffdc56bf6b6b405258820a6999931b2a868236c430e489dacc472526d5d9f6a0b5a14305e7c01850b8850ca4a04e68371eeaec8fa17141358b92424a8cf89 SHA512 53ad80258a22e1de26e7d1442762944653e3748e65db9bff40e735aec48b1978429462b1c8b396cba1b058659f1d2d6e422dded35d9cca4379de9fca5692ad95
-EBUILD mt-st-1.4.ebuild 532 BLAKE2B 4e902de4d3aee2c5b94066c8fba3753c8386dc8b2205dc8d39ca9a41a80a3d9f7011faabcda3d6694fecf71b998f85cfb64fdb4d7660758ec90a3d3e7952da08 SHA512 f0d074fdb440a7a5308006b8f20f74bf6d92b5ec1f2a5c9ac52785679b9c5e9fda61f8f342bf5b19a3824d884ab207c1ae891bf856f92cde38bd981314a1cc8c
-EBUILD mt-st-9999.ebuild 453 BLAKE2B 92c6e6718a621bdec7e78722c742ad1deb91da0192f20115b0d941194c4f7bb5ef0f95cb22484815999eb1d44b658498b6584cd0d71c412ffccf404b21910720 SHA512 a1241b5d9bebc4b7bd4e10d939f2f6305b1d166a4d12270484b5533c28894dd361e347b74cbc477b50e00e154c3ddee060a9b46bcef5a4d6bfcaca080d4aa416
+EBUILD mt-st-1.3.ebuild 576 BLAKE2B 7d4d5548c23356bf97881e87fd122769bc6ee3b47ff454174ea33b7db96a374d9fa8ce8bca1dddfd7772fdf62bc8309a0a163644c18e0d1e5dd64b1cd437067e SHA512 55445e527238fbd7c74d28130d61f3e2c52a32546c8187981da1cfb9bcff6d9080c8249b641c42de7ddf1092655d0a09342dc414b24dc12f6647bcfc672403b5
+EBUILD mt-st-1.4.ebuild 533 BLAKE2B f8a88d6b0b0fb8f517a4d1d62de79e9c6e6ea0f15252f14eb7928d8090c7ebeb6ba25844203c5a0042e9e4b472f0a7850c92cbfe29db0f972512cdcc761562b8 SHA512 4a273e78c26eecc8272173e7d8c073336d600253ec42ec6cf1f2ac09daadc3da8f000e4843db944a8036a6a388808f1e112880bbf240014611e0257d5d38c5a0
+EBUILD mt-st-9999.ebuild 442 BLAKE2B eec75acf65e5cf086bad28749243bf479c4fae4f314905277f2cb878519fdbf7095ba6430e69648c1deb742fe9bd21259f965ebf7b6d6965ca0ef7f4d62e8796 SHA512 d8e72531838ac93eb103f46cfb3707f00b2aa2cf0109cc5190114f9b0d8505458d502237b2b3aa3d0c8efe64e6dd6c830ca832ad39ea2e4998428e43f57f60e7
 MISC metadata.xml 244 BLAKE2B e551dd172f35c5abea703cec8f7c899f1fec22dff135d50208419088aaeb0b2464e3ab44fe7c759147d43e9d0897a3fc8c8087089b4dfdff158907e835d5626b SHA512 904a7d356000f52257174f15912a3b79fe0b6bee390128a2f9821e749b393964c626f9afd751d88414086d7e28eab2183ad41dbaab911aad6ac5480e3b265922
diff --git a/app-arch/mt-st/mt-st-1.3.ebuild b/app-arch/mt-st/mt-st-1.3.ebuild
index 6124ae9ca95d..5d5cae52801e 100644
--- a/app-arch/mt-st/mt-st-1.3.ebuild
+++ b/app-arch/mt-st/mt-st-1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="control magnetic tape drive operation"
+DESCRIPTION="Control magnetic tape drive operation"
 HOMEPAGE="https://github.com/iustin/mt-st"
 SRC_URI="https://github.com/iustin/mt-st/releases/download/${P}/${P}.tar.gz"
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-arch/mt-st/mt-st-1.4.ebuild b/app-arch/mt-st/mt-st-1.4.ebuild
index 8677862cdc02..b63ab7081319 100644
--- a/app-arch/mt-st/mt-st-1.4.ebuild
+++ b/app-arch/mt-st/mt-st-1.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="control magnetic tape drive operation"
diff --git a/app-arch/mt-st/mt-st-9999.ebuild b/app-arch/mt-st/mt-st-9999.ebuild
index 6201e07af279..4588f304d124 100644
--- a/app-arch/mt-st/mt-st-9999.ebuild
+++ b/app-arch/mt-st/mt-st-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="control magnetic tape drive operation"
@@ -10,7 +11,6 @@ EGIT_REPO_URI="https://github.com/iustin/mt-st"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 
 src_configure() {
 	tc-export CC
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index ad2dc4c0f2b8..a341a4d94120 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,7 +1,7 @@
 DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3
 DIST ncompress-4.2.4.6.tar.gz 36006 BLAKE2B 1460fe803ed621e5e6e5ab506d8909acbfb1d3b91421cf7c7bc10b6b03b0cb6bb4ea616240a7aa500813d5fbf0a958e1e981da8a5f752d985ddcbf7fe9280d9c SHA512 03dd9670c48548d6f7a028dd307758ce7ac61997297c1075d65457ac849e8f2d710bc38fa9eb42e4b2cac163c1b93b7cf7eb197e90cbd689a1274df3de2a3ed8
 DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42
-EBUILD ncompress-4.2.4.5.ebuild 713 BLAKE2B df9874c6a19d0e5aa1ad9d8b50247c3bbaabc02fc5c9d8e337f5000e46e9e997d32374d3132e4c1410d8c8701797c84c1a07f82d5a8d348ac6dc11df533ee510 SHA512 85fba2c9e4d1cd14f32fbb1d6db47c5b67b9488be3ade284cfa81027a1cf154cdfa48adac53403a5bb881c95bf76766de35a5e2ce837225e8721191e60b0135f
+EBUILD ncompress-4.2.4.5.ebuild 714 BLAKE2B 5ca2a9af0133f965c7efa35f8c9d3d63baf65feac1d3fc80473fe2d21be7335b0723da863d9af705fe7bbf62509cf1e909f87c98c0d648ef8be7101370fa46d1 SHA512 1331f5cb39d5d9346f61ff944985c72c134ccd3e016981bc363bb52eda85c9f97c7d069288477b724c20e26fe27b8db1d007a15b61a6abeab1c76e210f73ca56
 EBUILD ncompress-4.2.4.6.ebuild 757 BLAKE2B 1d2c306d614db2608463f3d1db440c6c96732642a94c1dadb69dcc790c4b2f728ba80ed9308a326669bb57d21b37d228be54dbaa73742028b98ad099838c7ef5 SHA512 86704d7ea8d9cba09042fb814c464878787c028ad3d6509133ca2df00f823eda37f61b466a21374a35967a23f46480504f861c55bbcc28cb2e3988f902279c5c
-EBUILD ncompress-5.0.ebuild 757 BLAKE2B 93f6317e764b596441dbf550b00ea79c31aa4cbed9111c636b46c7d6ab84a06a6f5364def5736e63836988dcbbdd17a5cdd0258465395c50066e7f50bc9f5e06 SHA512 e29b0a213c9aa9d8479dda3576394ca3cb6857ca37d15ff1e481f238cd11df0dc49d904cb16f56fe9cc14ba57f77a055febe9491b45827b459f5cc568f504ebd
+EBUILD ncompress-5.0.ebuild 750 BLAKE2B ac8723df91a087aa45d41904b9586cfd0055f0e67cecbf0aca2ef009c70926af8e4e397a9a40fc4bb45741c203d533bf32e4927be9bd485554d1581ad74f6dbd SHA512 e4aa5c3b4e261f2bd6810f212a224ac9e5a6714071e477db1067212d71707406172edb34af8bd0e9481db6fbc63e7516326210ed3d296c5f6ef3359fbdbb00aa
 MISC metadata.xml 392 BLAKE2B 1e59934b640d08d7728f15bd88534fb4e72e0c8cc6c39cf4fa5f5a188c4443bfaacf081a8284d2c508806b7c11553d1ea5c18cc477db48fa733875d2d4535cd8 SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
index ae90effb56e2..6e674e404fac 100644
--- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_compile() {
diff --git a/app-arch/ncompress/ncompress-5.0.ebuild b/app-arch/ncompress/ncompress-5.0.ebuild
index f98381e6801c..096db9bc9a6e 100644
--- a/app-arch/ncompress/ncompress-5.0.ebuild
+++ b/app-arch/ncompress/ncompress-5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 5edfa2709395..97aae81e9606 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -5,7 +5,5 @@ AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604df
 AUX WimHandler.cpp.patch 413 BLAKE2B 06e1ef38fbb8ae11f9c28df68c7e15db52060974930f61bdd5a04d970bc71f724a5122b05ad24b0e89d6b2142f54762ce4b6467d25345fca89075d6626abf9b3 SHA512 c246a7d912ec965b5212a510893aa1c9bd47b66b8f0fb47c03d46e5f3f891e2134cb8733594fd84f7e6034ebf07a9aac633230e2a0eebfb476f6429469058a75
 AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
-EBUILD p7zip-16.02-r4.ebuild 4626 BLAKE2B de3aa55ac83dcf37923a0e78ea8d6bf9615e032ed6d2e03a5b02ef72f56fc962aa74f8d0e1cc1b1dfdccc9f30c6e5e12c8ba8cd74c36ced378abc62dd94c3ba7 SHA512 505a65e89ee9b95fb25783431465315170d5a2566abcef63e02a4c59dd620580aaf78386f282829f997488b0190f507d7e89d12e3d6967c32626a0808b8f95cc
-EBUILD p7zip-16.02-r5.ebuild 4791 BLAKE2B 0f50cfa479b53a2416caef68dd5cae3e2631f69251a0da39ab3ef56c712af1a1d1f32c03cda3d5c4018fabbe6632b444f96ab345cc66e35815452870d27c681f SHA512 e481261da736c57fc870c3891c929927d71f77272641da7eb203871527fd6a7ec5348bf09dce225d096c5507cfdad09efd8bf06e0280dfb8b1afdd796a2fa8b4
-EBUILD p7zip-16.02-r6.ebuild 4776 BLAKE2B 5b53d4b964d1e2e6db7e00e521b9808962d30a53572a82084072f7ee4589e37be9804cdf5e31baef52b6153dafcad1f3e6839b3220d5ab4fcd71de1fdc0989cd SHA512 6b54c96587cd5bdc6dcf6fb39ced6fb88256f5f5a7e64306b690c48f5894bb789464f6c504ee345a387ba5f5a7db21a932b4da4d27945bb6f5d928ae206ae7f7
+EBUILD p7zip-16.02-r8.ebuild 4270 BLAKE2B 777d68aad2371428f48198b02d2fbc3ebcd1f653421e12719a40d86fe79e847f870cebce3015468acaf9788c55d3f89bd98884e3911d3f8f25c29cda89ffedfd SHA512 b346e1dc7f2f723c1c19a40f710705fd6102e2095111d85aefee437170479f282daffba872982f8f74f2d03e0a4f9438fa832dd4ee98c9e26d667a0130b07ccf
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild b/app-arch/p7zip/p7zip-16.02-r4.ebuild
deleted file mode 100644
index 93e6132eddbb..000000000000
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs wxwidgets
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
-
-LICENSE="LGPL-2.1 rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
-
-REQUIRED_USE="kde? ( wxwidgets )"
-
-RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOCS=( ChangeLog README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-darwin.patch
-	"${FILESDIR}"/CVE-2016-9296.patch
-	"${FILESDIR}"/CVE-2017-17969.patch
-	"${FILESDIR}"/CVE-2018-5996.patch
-	"${FILESDIR}"/CVE-2018-10115.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use pch; then
-		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
-	fi
-
-	sed \
-		-e 's|-m32 ||g' \
-		-e 's|-m64 ||g' \
-		-e 's|-pipe||g' \
-		-e '/ALLFLAGS/s|-s ||' \
-		-e "/OPTFLAGS=/s|=.*|=${CXXFLAGS}|" \
-		-i makefile* || die
-
-	# remove non-free RAR codec
-	if use rar; then
-		ewarn "Enabling nonfree RAR decompressor"
-	else
-		sed \
-			-e '/Rar/d' \
-			-e '/RAR/d' \
-			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
-	fi
-
-	if use abi_x86_x32; then
-		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use amd64; then
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use x86; then
-		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# Mac OS X needs this special makefile, because it has a non-GNU
-		# linker, it doesn't matter so much for bitwidth, for it doesn't
-		# do anything with it
-		cp -f makefile.macosx_llvm_64bits makefile.machine
-		# bundles have extension .bundle but don't die because USE=-rar
-		# removes the Rar directory
-		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
-			CPP/Windows/DLL.cpp || die
-		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile.list \
-			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
-	elif use x86-fbsd; then
-		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
-	fi
-
-	if use static; then
-		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
-	fi
-
-	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
-		einfo "Preparing dependency list"
-		emake depend
-	fi
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
-	if use kde || use wxwidgets; then
-		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
-#		emake -- 7zFM
-	fi
-}
-
-src_test() {
-	emake test test_7z test_7zr
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
-
-	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
-
-#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
-
-		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
-		doexe bin/7zG
-
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r GUI/Lang
-		doins -r DOC/MANUAL
-
-		insinto /usr/share/icons/hicolor/16x16/apps/
-		newins GUI/p7zip_16_ok.png p7zip.png
-
-		if use kde; then
-			rm GUI/kde4/p7zip_compress.desktop || die
-			insinto /usr/share/kservices5/ServiceMenus
-			doins GUI/kde4/*.desktop
-			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
-			for item in "${ED}"usr/share/kservices5/ServiceMenus/*.desktop; do
-				item="$(basename ${item})"
-				dosym "/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
-			done
-		fi
-	fi
-
-	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
-	doexe bin/*$(get_modname)
-	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
-		doexe bin/Codecs/*$(get_modname)
-	fi
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-
-	if use doc; then
-		dodoc DOC/*.txt
-		dohtml -r DOC/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-16.02-r6.ebuild b/app-arch/p7zip/p7zip-16.02-r6.ebuild
deleted file mode 100644
index 49e822f2436e..000000000000
--- a/app-arch/p7zip/p7zip-16.02-r6.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs wxwidgets
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
-
-LICENSE="LGPL-2.1 rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
-
-REQUIRED_USE="kde? ( wxwidgets )"
-
-RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOCS=( ChangeLog README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-darwin.patch
-	"${FILESDIR}"/CVE-2016-9296.patch
-	"${FILESDIR}"/CVE-2017-17969.patch
-	"${FILESDIR}"/CVE-2018-5996.patch
-	"${FILESDIR}"/CVE-2018-10115.patch
-	"${FILESDIR}"/WimHandler.cpp.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use pch; then
-		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
-	fi
-
-	sed \
-		-e 's|-m32 ||g' \
-		-e 's|-m64 ||g' \
-		-e 's|-pipe||g' \
-		-e "/[ALL|OPT]FLAGS/s|-s||;/OPTIMIZE/s|-s||" \
-		-e "/CFLAGS=/s|=|+=|" \
-		-e "/CXXFLAGS=/s|=|+=|" \
-		-i makefile* || die
-
-	# remove non-free RAR codec
-	if use rar; then
-		ewarn "Enabling nonfree RAR decompressor"
-	else
-		sed \
-			-e '/Rar/d' \
-			-e '/RAR/d' \
-			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
-	fi
-
-	if use abi_x86_x32; then
-		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use amd64; then
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use x86; then
-		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# Mac OS X needs this special makefile, because it has a non-GNU
-		# linker, it doesn't matter so much for bitwidth, for it doesn't
-		# do anything with it
-		cp -f makefile.macosx_llvm_64bits makefile.machine
-		# bundles have extension .bundle but don't die because USE=-rar
-		# removes the Rar directory
-		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
-			CPP/Windows/DLL.cpp || die
-		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile.list \
-			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
-	elif use x86-fbsd; then
-		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
-	fi
-
-	if use static; then
-		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
-	fi
-
-	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
-		einfo "Preparing dependency list"
-		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
-	fi
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
-	if use kde || use wxwidgets; then
-		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
-#		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zFM
-	fi
-}
-
-src_test() {
-	emake test test_7z test_7zr
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
-
-	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
-
-#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
-
-		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
-		doexe bin/7zG
-
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r GUI/Lang
-
-		insinto /usr/share/icons/hicolor/16x16/apps/
-		newins GUI/p7zip_16_ok.png p7zip.png
-
-		if use kde; then
-			rm GUI/kde4/p7zip_compress.desktop || die
-			insinto /usr/share/kservices5/ServiceMenus
-			doins GUI/kde4/*.desktop
-			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
-			for item in "${ED}"/usr/share/kservices5/ServiceMenus/*.desktop; do
-				item="$(basename ${item})"
-				dosym ${EROOT}"/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
-			done
-		fi
-	fi
-
-	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
-	doexe bin/*$(get_modname)
-	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
-		doexe bin/Codecs/*$(get_modname)
-	fi
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-
-	if use doc; then
-		dodoc DOC/*.txt
-		docinto html
-		dodoc -r DOC/MANUAL/*
-	fi
-}
diff --git a/app-arch/p7zip/p7zip-16.02-r5.ebuild b/app-arch/p7zip/p7zip-16.02-r8.ebuild
index 2f8242418453..b41f7d8a8f5c 100644
--- a/app-arch/p7zip/p7zip-16.02-r5.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild
@@ -3,31 +3,27 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs wxwidgets
+WX_GTK_VER="3.0-gtk3"
+inherit multilib toolchain-funcs wrapper wxwidgets xdg
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="http://p7zip.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
-
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/nasm )"
 
-S=${WORKDIR}/${PN}_${PV}
-
-DOCS=( ChangeLog README TODO )
-
 PATCHES=(
 	"${FILESDIR}"/${P}-darwin.patch
 	"${FILESDIR}"/CVE-2016-9296.patch
@@ -61,7 +57,7 @@ src_prepare() {
 			-e '/Rar/d' \
 			-e '/RAR/d' \
 			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
+		rm -r CPP/7zip/Compress/Rar || die
 	fi
 
 	if use abi_x86_x32; then
@@ -75,7 +71,7 @@ src_prepare() {
 		# Mac OS X needs this special makefile, because it has a non-GNU
 		# linker, it doesn't matter so much for bitwidth, for it doesn't
 		# do anything with it
-		cp -f makefile.macosx_llvm_64bits makefile.machine
+		cp -f makefile.macosx_llvm_64bits makefile.machine || die
 		# bundles have extension .bundle but don't die because USE=-rar
 		# removes the Rar directory
 		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
@@ -85,7 +81,7 @@ src_prepare() {
 			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
 	elif use x86-fbsd; then
 		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine || die
 	fi
 
 	if use static; then
@@ -93,7 +89,7 @@ src_prepare() {
 	fi
 
 	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
+		setup-wxwidgets unicode
 		einfo "Preparing dependency list"
 		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
 	fi
@@ -103,7 +99,6 @@ src_compile() {
 	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
 	if use kde || use wxwidgets; then
 		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
-#		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zFM
 	fi
 }
 
@@ -112,25 +107,20 @@ src_test() {
 }
 
 src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+	# these wrappers cannot be symlinks, p7zip should be called with full path
+	make_wrapper 7zr /usr/$(get_libdir)/p7zip/7zr
+	make_wrapper 7za /usr/$(get_libdir)/p7zip/7za
+	make_wrapper 7z /usr/$(get_libdir)/p7zip/7z
 
 	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
-
-#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+		make_wrapper 7zG /usr/$(get_libdir)/p7zip/7zG
 
 		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
+		exeinto /usr/$(get_libdir)/p7zip
 		doexe bin/7zG
 
-		insinto /usr/$(get_libdir)/${PN}
+		insinto /usr/$(get_libdir)/p7zip
 		doins -r GUI/Lang
-		doins -r DOC/MANUAL
 
 		insinto /usr/share/icons/hicolor/16x16/apps/
 		newins GUI/p7zip_16_ok.png p7zip.png
@@ -139,30 +129,26 @@ src_install() {
 			rm GUI/kde4/p7zip_compress.desktop || die
 			insinto /usr/share/kservices5/ServiceMenus
 			doins GUI/kde4/*.desktop
-			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
-			for item in "${ED}"/usr/share/kservices5/ServiceMenus/*.desktop; do
-				item="$(basename ${item})"
-				dosym ${EROOT}"/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
-			done
 		fi
 	fi
 
 	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
 	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
 
-	exeinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/p7zip
 	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
 	doexe bin/*$(get_modname)
 	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		exeinto /usr/$(get_libdir)/p7zip/Codecs
 		doexe bin/Codecs/*$(get_modname)
 	fi
 
 	doman man1/7z.1 man1/7za.1 man1/7zr.1
 
+	dodoc ChangeLog README TODO
 	if use doc; then
 		dodoc DOC/*.txt
 		docinto html
-		dodoc -r DOC/MANUAL/*
+		dodoc -r DOC/MANUAL/.
 	fi
 }
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 24b63ef627f4..a6cee6ee8d7e 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,6 +1,6 @@
 AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df
 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
-EBUILD pbzip2-1.1.12.ebuild 1064 BLAKE2B e4031113be7ccedef8e3d602621822b3d96be3f9e7b2da85111b1d9f99ad662f3ab065f0f38acd9437f38f3e3ee4b577d029320f4928f2bc03d1630d81bd58cb SHA512 b2b09892db8c5dc40a619937a643cbfdf4393bff17c935a4a016466ad7f0a3cb7c2f519443be598f96ac6040df71b7f2ce59be100a7fd1e69448b6f698f235e7
-EBUILD pbzip2-1.1.13.ebuild 1140 BLAKE2B 8af7cf7d85ca0e1b5392d840cf739a018de1212c7d6cda213417b452ff5066f2b11270e2edeb4a8ef70fa35de68e6a0d2cfc16c393acd45cd820dc263b387cec SHA512 35b0abcb9cef5d09a2452569a25a9182e73705b6b3c22d1147eb5804388009d48d4fca388729c254eee3108336ebda13f20904f08d17792e8f9af0c3953f1ed9
+EBUILD pbzip2-1.1.12.ebuild 1065 BLAKE2B 24d74afc0b0f91da9de6775bdefef2ca1e9447b48e2a921ca3ccfde4338d6f744597a41e8b0e9c9b340d8214ab626aa0914e8961c43c005e2d707f60cd5846cb SHA512 2c77819b5770e25e8a1f6257fb16d2129658d7fdbfa3d33ed3e685e305919b6d489306b2c3b656531b35e46054a31a67e824b244e9cc0d2cde83acbd56d1f169
+EBUILD pbzip2-1.1.13.ebuild 1140 BLAKE2B 3a1d4196b753b95b205b77fcff57552f7549938f0bd70bcf65db1f9208dee7761a0cd8f9f66fedde007918af2bac17d238181ee9b2ad48d837a7f3c006c93c19 SHA512 dfcb8bbcad2a4a44996cfe04f45ce7efe7d0618a8f6a00c9d6d62e8f9e04213c6d43e2f5b34012a036a0501f2e880e9b78524ef93132b0fb6dedb89b48b4e09f
 MISC metadata.xml 443 BLAKE2B 3a25a8281989265bb3339d4b46442e5c73920567ff19bd12e57a6aa41d40534428e409ca9dc548318d2487288e12e2c6bb305809c7585c3d6742c8709a649d9e SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0
diff --git a/app-arch/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index b1c5fe68fa03..0d647fae6661 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic epatch toolchain-funcs
 
 DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
 HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index 18d59a91340f..f9ccda454629 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic epatch toolchain-funcs
 
 DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
 HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 4b8cae84827b..da96124396a3 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -2,7 +2,7 @@ AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db2
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
 DIST pigz-2.5.tar.gz 106438 BLAKE2B d1db42e412d91243aebdc06204a032e1d9dd7e01f659cc428e8a194df26242782d22328658b773b61ccbdf1e34a7ada4d358a93d9c6eda7d7e78c4291ca901ac SHA512 8f52900b8664c67b5b1813ac2f6e226d899c72ba19eefd6424181dc4dc0416d38ad3c7e5fe3dce6bdb58f5ac34ec0269f846c43f9aef6f69a121713113c1643a
 DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
-EBUILD pigz-2.4-r1.ebuild 1011 BLAKE2B c592162331a4859c29fe80b0b2179793ced6ad17a3ddde33e97ca22fe3f0b457241844919a50819ff2be89f21d616e0e848b56e59387685ad0e31258d3fb06f6 SHA512 f577698a7ffed04a96df22616bf3bf8001f218ab688cec86fdb88eb05e3b8a7f03972f17a8c794193ae61e6139c3ca8465c17d6d801d876af05acb29ad182d08
+EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B e1c0774598db74d40076ae564be85a4162e8b8bf30021af753f5898796fd3af76669e7cf3ed1f150700e9018bd9f689b572bb011c10ee9b1e5d005f0c5b9a6d4 SHA512 2a31104d83f09e9dbfde55b198abb677c43e00d5f0ce22a5c00acfabe9953c3afb486e153e60000ccf7ba7eadd54886b75ee92afba0d3053faa31fa8a273d1de
 EBUILD pigz-2.5.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
 EBUILD pigz-2.6.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
 MISC metadata.xml 739 BLAKE2B 66bac4d792d20a9edc0a4b52f55c4f02e5e9ff79b9c67365af252b928dd68b63f71a6cc75c31f824c5c0f63917f6c4c11de2cc2e82d78b7ce4518f9ac1868223 SHA512 26106d41b334587ca0aabd620d481ce6c8729fc279ddb97a529286910936a8a25d42a2f09b8ee48b9ac9343cd3384a6f7d6ccaaf39ab111214e88aff5203e90e
diff --git a/app-arch/pigz/pigz-2.4-r1.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
index bd45334879b1..f23df83523ad 100644
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ b/app-arch/pigz/pigz-2.4-r1.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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index fcd83a5dff07..13b7703d85e8 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,4 +1,4 @@
 DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
-EBUILD pixz-1.0.7.ebuild 1153 BLAKE2B d66b37b1874a4687d50453c036c8089d0886d65a48603a9c3f28a5b68f1ffb93c4cb8221aa0f8fd699a9eb3c38f9e3812fe4129c32a2453c674a0c4525b6320a SHA512 305f8e96edb4b34b9c8b48f2746fff3e42605cbc111d4f5f24d9f810141b12d5224ef1c194885df9e83f25955804d3212d38fe099615cd5d1455ae3087958414
+EBUILD pixz-1.0.7.ebuild 1154 BLAKE2B 3f8c3519bcb40770bfe085434349bdb5d2b0765bcf8258537d2cff8697e853a8b13f17f7a629a256bb3357e2271836d72a109370eaab973ef9d6c9f7cb479ff1 SHA512 80424d1fff60b5ec19f3c86a45bbc793f65ad24285909581b5c3aaba96bf8d63238a71626180fa54500d2d57ad500824919a92632e09bbb1d7a223bc8fc5a31e
 EBUILD pixz-9999.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
index a8ebba1a088a..83c9e097ed89 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 44eb388edef1..66ee55cb6509 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,5 +1,9 @@
 DIST rarlinux-6.0.0_p20201201.tar.gz 609227 BLAKE2B 8cf0052a7b2d53c57ae5e24290f24f4815815682a199d99a9b4fe120d01b3c31699bf6cdf46ddabc144944ab7437fff4043f16153770c7e732ee337082308978 SHA512 1c7abf04b2fc67dbc329210ffba707faf2d368750789cab695a45f25381f219cf9c7ad09a071b9caf4889ffae24b87260ebdfd18900891230c1fc2d8ba7a9fd7
+DIST rarlinux-6.0.1_p20210407.tar.gz 610095 BLAKE2B 897a72f7fca5efe828bf21cfd6ce5a320b5aba8fb9ca7f83991fda292ab753f860188c632aa96fa5c8e50bc3bbfda644d163e349e68a655681f36e1d36d5991f SHA512 55627c4cf7ad1651f4f9d79650b9b6ea203e20573f65158c366e4a2ec5492549e0f74d7c5ec96b71f7264a6ecebd7f6b5d8706d294f0e4bb66ca7d5eb57d9f39
 DIST rarlinux-x64-6.0.0_p20201201.tar.gz 598314 BLAKE2B 778e4f2360617ae04a30cafdec54485c757c0aae66c925c353047850a9873a536e258d8835d78cdcf6b69b4000814c242db311fda74a8dee492bd5916c879e79 SHA512 7a9fbed46954c06b15109a5af6a945702e0dec949349e17b7e31753a04298abfb80c6f2514224926aea920d26f2f2578ae8fca61c8ee3f1883e9ed60139e0968
+DIST rarlinux-x64-6.0.1_p20210407.tar.gz 598720 BLAKE2B 7b33c2d10064db20d9bea0d416e3531dbafec659733ac361fb6c87afd646bdbf8eb8ac8581c854ec2cf193a8fbb3fe3da028a20653ead6e566e9b8de4be3b1e9 SHA512 58b308ee90dbbb416cbb1d510372fc6099c499155787e521a9103347ca853d0c30552a3f0d74207cb456fa3081a7d41c11685208bc996325b825f832cba12b12
 DIST winrar-x64-6.0.0_p20201201.exe 3334088 BLAKE2B 37d7d4c3ede27a049eb3ca42b944e49570cd109c2c940ddaa40139700ed7ad32d292bdec6d9d6b60908bbeba2e363b8013cc91331419325dc4d3c1613b93d782 SHA512 c161d760070a133f249fba8730fa7268435b3c7f32f5cfa59ec228f3c7a94e915f0a201749e234df0314f1b436d8d46365bf1a7fc118a9b34e8f7419cb556b71
+DIST winrar-x64-6.0.1_p20210407.exe 3342736 BLAKE2B d85763f9f78528c0da838efc4ad131eaffd0c97087394df32373847110127735f8199fedc7d577dee7fff97cb31566d1431eb31a202c36f340cbf5acbea045ce SHA512 9b897be51947871cbc4a3395e4f25644ac5bf328c86b033c58b127710264abb1486dac28f91b421c6f8e1196466fd91313acd379077fdfba7795df8cb929a7b2
 EBUILD rar-6.0.0_p20201201.ebuild 2232 BLAKE2B c038b494adcc5ead0eae6c03f39518221598195be4f1aa99601264d01fc22c86dfd985fb88ea6ad3697d1afc71c42404ffd06437f9b046ffb2710226a051b0eb SHA512 ed19c27d77c6b806f780f61670632e2f4f1d19e77fef3871e722a9c6c34b91a8851b9cfd30fe10c0b7b3906c01c80e635dcc82d416392182830a2765c6e39809
+EBUILD rar-6.0.1_p20210407.ebuild 2234 BLAKE2B b8f103104510af1eff6ad4a0d44554a4d0d2e346a8c353c77fb7bde77f6e8937fa64058155840fcc18c676da4fb6ec4d5e66367959bbb11c4067b3eb0516c42e SHA512 5959dd9089df6285771f395c5ad07905c4a624fa4128e95d28f4ae938ae751dc470bbeea231780efcc79b986ad6bacb060edef0cfb523b70dfd0c33e82af40a6
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-6.0.1_p20210407.ebuild b/app-arch/rar/rar-6.0.1_p20210407.ebuild
new file mode 100644
index 000000000000..d927f40b3a30
--- /dev/null
+++ b/app-arch/rar/rar-6.0.1_p20210407.ebuild
@@ -0,0 +1,109 @@
+# 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/rpm/Manifest b/app-arch/rpm/Manifest
index c5db7b862083..1e53a6070ccc 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,10 +1,13 @@
 AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017ebaffbad9c2a14947c43e784ddaa349cc77da9ee7fb9e1ce4ee2dec296b57234a74d56c9e08449e067bca403fa7ee6 SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305
 AUX rpm-4.16.0-autotools.patch 439 BLAKE2B 173435c31b0e06f47948711da00452d08dd644fcd8ed05e61f7ed31db56a670bacdb4ca1504dd64818752e30868541e3c50f8ab84833101607cf8c487cc93bba SHA512 fce8b036dfc55e5602721206788a1a755e2df8ef6b1cc94f047f7180f97efa750957ffa063cc18c274fff8b20f41181aa1c46c11ad2feed9689d50f4f696afea
 AUX rpm-4.16.0-libdir.patch 1136 BLAKE2B 6099eb30744db0debf1f1eb0a99e2f88488c805527951b3d3e6315782d793cbca20afe3dded579c3869e90116393dd5c3e37d9fbf98c2c18a41e5c34196fab08 SHA512 c592d5d4430ed41b06dc98dafac2f81bbd63e60f29a34f8d6280b1a9b0b38cfaaf5cb091625a0ea29450b219a620f1426876d8ff3a6dc85258ce9e7a5df141fa
+AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7edae47f8b9597a57f1b7e3b4848129dc50f1b001f5e8ae92f5f1c07cbe51330ccd8c15867e7624ea07756317eaca6 SHA512 8fd4c0ee785fb583172df7b7543ba790927a9d4953a0368bc4a641fe6e34b35011e3d3cbecaf80c58e79239e68bdab6797c8592f0c5185197df726a51e06d224
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
-EBUILD rpm-4.14.2.1-r1.ebuild 3460 BLAKE2B cc58ef05231af0d5b76b4ac6157a5def7646529000b34ef091717c73c3927c45567735538fd3199f5aff5e28d6e7d80d33e022d7ec5d7d64188cb13ffe5ea318 SHA512 1c86cd41ab1dcd1ee54eea05d99dbc7f04a0f7bab57f4a8190c1c8d6ea6d308a4e47c987c5b02acca091e1351847f04baef4219a6f1ea40a417296be43517c40
-EBUILD rpm-4.16.0.ebuild 3447 BLAKE2B 97c70da29498eab733fe8a2b33b19b7d3403e015bf85df9b8052e28497c6cac6fba53c0a1a3246ad1c4707689aa55e2244a8a9314b50a193eb288cf7b36c2839 SHA512 9b6ca679b277c9dfa66d63a488bc6410919cc14e0776d51f05cb1164617042b8dab88dc27f20c98dc45e5ad3e7a11409ed9f99650576201997ad41aef90b2f6a
+DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
+EBUILD rpm-4.14.2.1-r1.ebuild 3461 BLAKE2B bac45050bb09146ca2e266747f3b35bbf37bcd089d87800bf332ae348e087fb1443f4b86a4a8676083739f2fdd74bfe54c20ff99cb680a8147dc01987632b6ae SHA512 533a3687b8f56e219bb7cacb3dcc6f2dc29fa6546977d70c8e33c6ab97ad43ebfd00cdd9c4ca6188bf0cba1c4b40911b83e2c5ab1702c6911899a1a77d52b7e9
+EBUILD rpm-4.16.0.ebuild 3935 BLAKE2B ca9fcf934a6acdfc918ccf658b1959528c5c11d0b5784402f5f599743a0a9536bf054ef8eef3cf3d9b0dfd13ce0c63d5e961d97790fb423c418cd4e48e87faff SHA512 bcbeec2d9533cdb7c41dde254fed52b579e118834cfbe033b7afa283e9813d34bb10fbd63bd31097bf974bfb1ca1037611ffdba87087d405c2aead85fb3b7f6c
+EBUILD rpm-4.16.1.3.ebuild 3638 BLAKE2B 9f9268febc26d1f74b513e39c5317081f228f15285ae8e64f61c8e5c5afc5cca0bc1dbbfea53a569591ad4f25971c8ecaf44cce816f596439c5f5b996458e253 SHA512 174cff4ee03cfac24c23e90d47f48a070303a6fc77cf8631c22a449d9ebd9b5c1e16ec877b68d13033533ecd6f191b737724f87371e01604b711f996a4dc0967
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
new file mode 100644
index 000000000000..a2c95ff064e2
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
@@ -0,0 +1,34 @@
+diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac
+--- rpm-4.16.1.3.ORIG/configure.ac	2021-04-13 19:32:35.630955569 +0100
++++ rpm-4.16.1.3/configure.ac	2021-04-13 19:32:54.939623251 +0100
+@@ -957,13 +957,7 @@
+ AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
+ AC_SUBST(RUNDIR)
+ 
+-if test X"$prefix" = XNONE ; then
+-    usrprefix="$ac_default_prefix"
+-else
+-    usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+diff -uNr rpm-4.16.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am
+--- rpm-4.16.1.3.ORIG/rpm.am	2021-04-13 19:32:35.584956361 +0100
++++ rpm-4.16.1.3/rpm.am	2021-04-13 19:32:54.940623234 +0100
+@@ -1,10 +1,8 @@
+ # Internal binaries
+-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+-## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
+ 
+ # Libtool version (current-revision-age) for all our libraries
+ rpm_version_info = 10:3:1
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index 093c7b5ef40d..d75365d36031 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 1742df61ac57..3e6a36bfe072 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-2 )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools flag-o-matic lua-single perl-module python-single-r1
+inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
 
 DESCRIPTION="Red Hat Package Management Utils"
 HOMEPAGE="https://rpm.org
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~
 # Tests are broken. See bug 657500
 RESTRICT="test"
 
-IUSE="acl caps doc dbus lua nls python selinux test +zstd"
+IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -53,9 +53,16 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-rpm )
 "
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
+
+	# Added USE=openmp and this check for bug #779769
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -69,7 +76,6 @@ src_prepare() {
 	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
 
 	eapply_user
-
 	eautoreconf
 
 	# Prevent automake maintainer mode from kicking in (#450448).
@@ -78,11 +84,16 @@ src_prepare() {
 
 src_configure() {
 	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	# NOTE: 4.16.0 warns:
+	# "configure: WARNING: Using the nss library with rpm is deprecated and support will be removed in a future release!"
+	# Only libgcrypt (default) and openssl are not deprecated. We should consider this.
+	# bug #780684
 	econf \
 		--without-selinux \
 		--with-crypto=nss \
 		$(use_enable python) \
 		$(use_enable nls) \
+		$(use_enable openmp) \
 		$(use_enable dbus inhibit-plugin) \
 		$(use_with lua) \
 		$(use_with caps cap) \
diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
new file mode 100644
index 000000000000..32b827a153fc
--- /dev/null
+++ b/app-arch/rpm/rpm-4.16.1.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-2 )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="!app-arch/rpm5
+	app-arch/libarchive
+	>=sys-libs/db-4.5:*
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dbus? ( sys-apps/dbus )
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/libgcrypt
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	lua? ( ${LUA_DEPS} )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	# Added USE=openmp and this check for bug #779769
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-4.16.0-autotools.patch
+	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	eapply "${FILESDIR}"/${P}-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	eapply_user
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-crypto=libgcrypt \
+		$(use_enable python) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable dbus inhibit-plugin) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl) \
+		$(use_enable zstd zstd $(usex zstd yes no))
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		for docname in librpm; do
+			docinto "html/${docname}"
+			dodoc -r "doc/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+
+	use python && python_optimize
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500):
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
+	fi
+}
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 9931edd4ecca..a6c230971f88 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,6 +1,6 @@
 AUX rpm2targz-9.0.0.5g-add-zstd-support.patch 719 BLAKE2B 0450ee5f7e6010db15f77d474da633fdab17c7b39657971bd64aebf89876a368c7bdbd4572e30a51825ae741efcad6f0845b10aed362c8502101d54485369cd5 SHA512 dd5ea497a2983c45f7c2055b7f47b911f86a5246b90bb1d55d8f75dcb1c9f25f2c20d75e7f19a3df65b62320e8397d465d25f5d5ea234a65230da4922b274079
 DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
-EBUILD rpm2targz-2021.03.16.ebuild 656 BLAKE2B 393a0d52fa311892074da9e7252a8c1c1e21489350f8d041865ad36fef5dabb271e445b8976eec4e429678c43e83dc7dc9a277580993e66939e48847825ff308 SHA512 807abd105b1e3d26c7c220fa5ab26576cc4b62d618b7d3dc416238bafc9f204a451d0ce6ac3ae807e8b504c803dc4adaa68b62ca6dad1007bae7a48933c7cf6a
-EBUILD rpm2targz-9.0.0.5g-r2.ebuild 790 BLAKE2B 967290186bbd63d569bf60838f23c82df5ab6d3b69fa4817b662a31359d623b0e68b0456f3733e7608f72f9076e0f4cb9e5e647c72fbfe9549ca4bcf73dbabce SHA512 8e7aec2613164f579ea9147cd8a184e47643c776275b717620dcdb017315b957821a9348d95a0f3ac11d2305b70b7e28470a91181049f12c65de33c21084001e
+EBUILD rpm2targz-2021.03.16.ebuild 743 BLAKE2B b9ebccd7401f9f9396801d36e0b9e08c0bf5df13b809ab1d1426d835282d34224331a31d708b21cbb0ff62fbbfb767ea59e07dd79d836e7eb2be4a0997488404 SHA512 d3147a08302a964749b5157d2020fce507b13b8aa4d61d92dd012aa4fd745dcfc9e7dea5b50477ff377f0a8b86ae0b2c834a27ba425049c0a1761559385dc741
+EBUILD rpm2targz-9.0.0.5g-r2.ebuild 791 BLAKE2B 29b329dc66c931358b9e6d378081d348900fb3191768b86b4283f27d3613b5ab84573e0688425f98b412bdf91f0fb865062cf3ac28ea94688f9584b5a4520e67 SHA512 ab2bac841a63959bd172fac9d08cf2b84f8945b7247307f4c56c68a159387bf1a006df8412bf9c0943d92cb14a2028ee6deadb7279673edf24af650b1a3ad5d0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
index ee07654a10f6..3c1814afd616 100644
--- a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
@@ -21,3 +21,8 @@ RDEPEND="app-arch/cpio"
 src_configure() {
 	tc-export CC
 }
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install
+	einstalldocs
+}
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
index a255cb3577ec..d2cb2194cd49 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
@@ -11,7 +11,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 ~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/rzip/Manifest b/app-arch/rzip/Manifest
index 4bed7e95c1da..977cc70a3f33 100644
--- a/app-arch/rzip/Manifest
+++ b/app-arch/rzip/Manifest
@@ -1,5 +1,5 @@
 AUX rzip-2.1-CVE-2017-8364.patch 1006 BLAKE2B dc84fc222e5fcf1c0e5a37eda05bfb136b9603eb3c510edabd91bfc639b2c4a9f9956ce8cf152c94fb255c1b749a5eb8dfd0d13f65a2a4682a008f6fc236ab4d SHA512 18f594eca2f805770dad7569ad8cffbb934e74b85b04cc91cbcbb04fbc936529f68121504c50b037cfb848e9ba90131a5b35a1d236f0c1453d55fd8b415a7ed6
 AUX rzip-2.1-darwin.patch 4829 BLAKE2B 7e6cd7273573517aa29e73f0556e6b33d4386d71872d643d448859a48308b8fcd59b1a2c6749117e39c8184ac4239053a97757b2e4e821b7b9e7232e99af2120 SHA512 a3cd2c98a486626767eacd5a949ecf1f328f11bd663a1f4b9f758314dde709e9fd73fb1239dec8737d4511f61225f47682b610b9a2609646613a774d6f6ad5f8
 DIST rzip-2.1.tar.gz 46785 BLAKE2B da38d7ae74149824dd33f3ecb1a7f6f63d63a8ee54c57565e4edc5915b503882d4de20b19c22228e8d3fc698477b6c8f095c2a399d442101a83ee66f4bfbcc63 SHA512 06ed760ba2b7f09781a2e9312b645d41c145f96e3ee55ddf573714493e92466366ec6394267e5e06b0d8c42dcb67e1ae99dafa417a84737ce2b4a650a9059a6f
-EBUILD rzip-2.1-r3.ebuild 1099 BLAKE2B df47add991b4b905aee0710e0a4837314c23179cdb530a78f47c7874cbc67bbe86e5ca872d2c4d0a0443727163f7fe39b79760013ec1e18675557e6ca3249acc SHA512 1cb9bb863c1690861130a49fc5a504de7470f73aa191e418996a4a012fe12e0a2db1eb86a7fd65ffe7025d777293e5900a5471118dcb2779fe710c74aaca5601
+EBUILD rzip-2.1-r3.ebuild 1097 BLAKE2B e2b62d401e8d5c187f960472cb4fb6b3d6a26b4c2919fabafb6eb2c627be345ab45d0eec8e93a9527a58b28465ee2332a259368852c9be0a514781bb7ca5644e SHA512 d1dd5198be16e27fd482ec221cdafb64dbcf7cc4a5eb9ee2133b5e01054601c27a1bcd16f14bcb08a07b39e90d0be0a1642e0bdf8bd663041c12c999db6c3a04
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/rzip/rzip-2.1-r3.ebuild b/app-arch/rzip/rzip-2.1-r3.ebuild
index a069fe7ccf31..f771c83cd97b 100644
--- a/app-arch/rzip/rzip-2.1-r3.ebuild
+++ b/app-arch/rzip/rzip-2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="app-arch/bzip2:="
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1-darwin.patch
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index 2f7f7cdd412b..1e5fa619de16 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -2,6 +2,6 @@ AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b6
 AUX sharutils-4.15.2-gcc-10.patch 1048 BLAKE2B 4148ca1ffd1fd5469234a0af1efefa38f179a19527fc18b4df638d63a3d128f4f2f3934b94e3c862a515555199d16da4d59a508cc4aab1d097aa6e390967be2a SHA512 75fcd9ea81d1d8c63eee8525aac8eeeaa4c8caebf223670951489f0869dc50f0af84b647443df60927f184a89659c44c91c6f6a7ce12b874821037322ce079ae
 AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf
 DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
-EBUILD sharutils-4.15.2-r1.ebuild 1090 BLAKE2B a837e6083ffd24cb8762c10cd37709fbf18ac34076f7a2a396669a623faa25b49d15ff0734dfbb227094009d5b21f75ba14131fd3b60a197eb71bf7c20259660 SHA512 1d3eaf5f67ec7b8568295f74c937d25fd36e10b231540342175471f40e29c31368c9636a1ece2680d24b6e2482b76ebdb7e01d1a5ecf4dbe8d8d0e711ddb4809
-EBUILD sharutils-4.15.2-r2.ebuild 1077 BLAKE2B 0924325dfa180615a836f3ca8352dd640894be807ceb1c67085b14f67a517fba175f7abd442ae47d0f8bfe02cb74f31d809d4fed6d60608a3c41706d1aeaa5a2 SHA512 e8fb9b29639ed28c5361251e0ca181e55eba94fde7fae9816ab10b0b1c57911940c29d3e75ad5fcd00376c135868cf6d4a5f264501f64d21bfe2ec690f3e97c8
+EBUILD sharutils-4.15.2-r1.ebuild 1096 BLAKE2B 5e92d730f975a4e4c6e0dd929cb8060148af9c8a2b028392960aeec2fd0e6d08dba11216cb0e13b0b8c8dd9edf4a13e58e4562ca496435e3fd92205059a265b8 SHA512 9ec4c419729eb958a797b53b944fb7bfbb383bb765cfb7f10f9261096ffb2ed045734a2625125cac3a8114a822378f75086f3cb8bbb5af3f020898f88548e602
+EBUILD sharutils-4.15.2-r2.ebuild 1069 BLAKE2B f61c80d519df1a6eae837be805e91397a6f090cd410573966dd89b046ce4393ea25879821365191090bbe5628a6b761b9329b476a4537683f5b52e8e3de7356a SHA512 8c3ac5cc174e7fc4ef557ba5cf9246889139164de365d0d347bdbadcd67c0a9cbfe492cc09f621b61e5ce9486ac33d690b8e0f7cddd00b8d75b2583e0004a7f1
 MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94
diff --git a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
index abee94661bc9..8b17c701b23b 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic
+inherit epatch l10n flag-o-matic
 
 MY_P="${P/_/-}"
 DESCRIPTION="Tools to deal with shar archives"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="app-arch/xz-utils
diff --git a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
index b086acd4168a..9f77f1799941 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
@@ -3,24 +3,23 @@
 
 EAPI="7"
 
-inherit eutils flag-o-matic
+inherit flag-o-matic l10n
 
 MY_P="${P/_/-}"
 DESCRIPTION="Tools to deal with shar archives"
 HOMEPAGE="https://www.gnu.org/software/sharutils/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="app-arch/xz-utils
 	sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
-S=${WORKDIR}/${MY_P}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.15.2-glibc228.patch
 	"${FILESDIR}"/${PN}-4.15.2-CVE-2018-1000097.patch
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index b3afc38105bf..0dc35974b0d1 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,4 +1,4 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
-EBUILD snappy-1.1.8.ebuild 1824 BLAKE2B 3476d38a27b461e655d3cb9e9c45fcfd67c751940b1010a6b5fc4a9e9081b5c6be575390d004ef6b2857bc977f677a54de67c9820135e8ca26b03c6b97aa633e SHA512 9d59f8529a5051535c6b8810d515c6dda1307586e17bfb251ac659dfc5614e75a88d9e498d46467e2d2b26f2b229a7e5d87f5fb662ab47d1767e06203726d0b1
+EBUILD snappy-1.1.8.ebuild 1825 BLAKE2B 4b19d78a843db8eda46fab568953a4f652dba370efa95f3fa8c8fec618b8a1dd35acf778fa1ca9fba4c5e49299218689feb7ef39a957d9bbd3c7d81afcee38aa SHA512 c1e57f6643737792ffc3ccfc11ad65e3255f8bed581b6ab2e41c2c2b7d7da916dad9d381bcedf9fb6e1587af6cd76386b8cf2516bcd378e2461fa0d5882c388c
 MISC metadata.xml 584 BLAKE2B 2d3686f675dacd34cd4577a0dcf304ac5556641d41c432447c89b5cecb82549a4aa4e82f702714b2cd1a31e6cc6b1cf098785a0ba557ebf90c5534d11221473a SHA512 0f09da2b9e381a8fcd8b0e0f1ef762228dd98287ac455bd526c0377b3269069d733467586aaf941d41bbe47c719613bc21ac9e0f08bb637afa27e3626c60a679
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index 64b7812e05e7..4a455d9b01b9 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 604f3ea98701..7cb6a16a6744 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,7 +2,7 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
 DIST tar-1.33.tar.xz 2224824 BLAKE2B 500bcf4b919881da13f7336c617b4d618b5f898e4d8606867c8917be165d4a3718783a2959896226df451d7acdd78ba2fd1d9fc774d7905fe0dbe2375e3329fb SHA512 d7c31147fafcd815bb54e3862c078dccc3f192a9fa149c2275bd89a21fcd54a4bdaa8343cacf4f76cadc2f57fd4ed955682c1b6f23d438add5a13cc35bd25260
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
-EBUILD tar-1.32-r1.ebuild 2012 BLAKE2B 766a281a21badf8a0be405419b962c09952ea2af2b8fb103e8c64fec188568a02d28e9cade253049b12ef7bdcb881791ed56585058f7280d26eaf68a0690a9eb SHA512 c4c707e16510174b57b36eb1c567ed97cd617adaadf78b56c3c6bbf8b2f44f64b6bc35582d37d6de7a51e8e965be56016dc984c5e20df0bd439056362ca5b9c3
+EBUILD tar-1.32-r1.ebuild 2013 BLAKE2B e3b6541a23e734fc1d929c7e7bde258d2730a31e00259456846fb41dfbcd03fb9010b5a4e386055439da8c89cc4b78ffe90ecae5437cade3283cdc2f5aba88d1 SHA512 61f259fb0399165481772697ab198c50d9489ee706e91f540d1387c52f49efde8ad2d0855208ba2c3701a35c73223d3dc43786aee5be87d574f9bee4e18917d2
 EBUILD tar-1.33.ebuild 2071 BLAKE2B a3059d9bee7ce72e6d0404d1164b3480fc29da18bf11fe8d9ea12e969db486c973d9038f6b3869608e9d14c1cb2be87a283304fa8602b4239247c0131a6ec028 SHA512 b360b92f120f41dbc9515dfbc4ea0a8e63e01d8f95ffa6c067ad5a72dc54001a50d2d0036ca13fc041bdf0ba276245fe2703ae7e3132c7dd90453ce37149e81c
-EBUILD tar-1.34.ebuild 2064 BLAKE2B da27104fadd674fd74186a4c60c09425cbc60844a4af8653575ccf2e1b9d98cca084fe70b9d1cca59cf8eec7ae81b4714a280747a5967788c7173e672fdcabf2 SHA512 15912963a002315a1b7abdae06b8ed877819d833fa3449e198b904480419c0e296eb592d64d02529a39ec08e98c2bde45e72e0d1177ffdaa7d305142395cc488
+EBUILD tar-1.34.ebuild 2063 BLAKE2B b8f3db3b5a8dd956795949139f79ad6a7ffb2de34cd2b6875b5f5b3860c29c133f43d390f4b55ee015d797ae89a3332c37a13cdd4cd2f74693948abdcad4505f SHA512 be9fabb9b6589e567569be68b4bbaba05d1756b654e2f8f02e5d74069fc40ac66c80156d64559f7f31546adb0da640182ca1d211822fa4c4ad44af33e977cd3a
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32-r1.ebuild b/app-arch/tar/tar-1.32-r1.ebuild
index db7d8023d601..7d3bb9785671 100644
--- a/app-arch/tar/tar-1.32-r1.ebuild
+++ b/app-arch/tar/tar-1.32-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
 
 RDEPEND="
diff --git a/app-arch/tar/tar-1.34.ebuild b/app-arch/tar/tar-1.34.ebuild
index c0ae4fe56e54..a089bfec1d43 100644
--- a/app-arch/tar/tar-1.34.ebuild
+++ b/app-arch/tar/tar-1.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.xz
 LICENSE="GPL-3+"
 SLOT="0"
 [[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
 
 RDEPEND="
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 3fd304c99fe5..cd8d28ae3916 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,4 +1,4 @@
 DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb16e4c501510f88c4b20e214026d1a39f93e3a1e37129d8b54b61f90aa04ca56d9bb1bb186ea3d394772ef48660d6926312ea3 SHA512 bb704cc1881601b3319b6052bce71f1c98d638b6822f32b9595c9b5434898187d747220c7167cc4acb2bbdbe8bde8618856fdcd277a69026a4bef41950cbb46b
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
-EBUILD unace-2.5-r5.ebuild 676 BLAKE2B 85f2faa74d8edf4e5ed2416c9158c3ba6c8176393b8de55290839474a4ab3cfbb9adca2d353f695052f48d2abf5a48110c11a9acf6b519a9f25c9b22b8d9536f SHA512 4217d27125a6af348d8351c4bdd2929b45d976c7d25bea86ed3ec8a29a6c9f2f587df81f6d8ef8180c7145430610a586d203f0d339e87e01fb6a4504b3866367
+EBUILD unace-2.5-r5.ebuild 677 BLAKE2B d6e46d2e819fa3d5a13c708cbceadd3def0bb3ded130420767e6411e5cd3853fc847191f35a9f0ea198d1a3e6a5dd56a8d80128223a63bbc2bc51f3384cbcdda SHA512 33572c57f7b86998e043fff8b73449d08ca340e28e47766c701672285d08827d8ae77e473d8733903a4acb71732db7904990eeb999baa6301a656df02b3b95dc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r5.ebuild
index 51a526825234..fd5a75cbe2f2 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.
 
 LICENSE="freedist"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 PATCHES=( "${WORKDIR}"/debian/patches/ )
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index e77d25d41cc1..392794bdf55c 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,7 +1,7 @@
 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.3.tar.gz 232331 BLAKE2B bcea5219daf8338cbb73fc43131d1c7e7a4c576164a30d79352d1bb3a96b3c66fd190dc40a5149b9bf38e723c0654bc5d5d45e246276c2ea18c1c8dc9904e555 SHA512 1ec20e7a122cb7f48936c691a8c3dc96b4dd989aa8416e6a96332733a0839490996baa22f709af3eb07be17e5987d871f995b5dbc36284cb951bed8047bdfb7c
 DIST unrar-6.0.4.tar.gz 232379 BLAKE2B 39382eeb71cafdeaa608ef497c44cd88d950d761e5c8395a224b2bdd530328a0060dec658aec943f9af8e135ce29cf86c3522ed17799f869cd0d84cbd7acc74a SHA512 9d2beb39fa0e3c60298b482967f1ae51d8a6531c88f5b8b053cc8905c033c0235cabb776d8449f9d96da6b81946167b84d19acdf93dda7ada14cc3c53bb7df19
-EBUILD unrar-6.0.3.ebuild 1875 BLAKE2B d3f4a2c0afe8625dd1c46aca9d7f24fd80683f4ca850922fd725ea2678c842f0d8b393f8f509474739b0db28d88353c5850a6f640635f287a7e31953aaf45198 SHA512 374346828c9673da77f9dbc71a5ae39fea900238da437dbd6db0b2838fe8f586bcf58a2b6a0323e2401561f5bffced13659d13d62c8504f7f6b2be0abfcc6d2c
-EBUILD unrar-6.0.4.ebuild 1889 BLAKE2B a4af1d6556180110b67f6581699c3f282ab4c039c8a5672b0c39c8819cc313ccc9cc522d342915061139bd8297beca26113e28d622ed1daa90c0b800c1966625 SHA512 008cd6a077705d080d4dcc8c3678e15343e56f08d011a5611ed6c36a426554247e3809f45764e00bd93b693e48bb3f4d4a2c0cdcb75c418c7332698cb3b6967a
-MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
+DIST unrar-6.0.5.tar.gz 232702 BLAKE2B 8e33d116ae9de06818379f4303241dd7f44ba319619829d0eb2c9257b3fd27e473b636d40edd6049a1ff096ea722fee0a71bf145456923b2664087dbf7d4554d SHA512 cd6d9b316a2daf2f3f81b28b4d6054cbe7ca9a7e39087a5dc7e4c554e5d5590b395243f03f019bf358e127be48dd219e827fdb6af7543305a52c3f87f6e32dd7
+EBUILD unrar-6.0.4.ebuild 1883 BLAKE2B f5d07b289b8446ae79daeb3b49be0f9c908b31b2bb22e5209d8c48a8f6e11da75aeaee912edc0d9b9d42397b7bb41f322427f6303e269c132caf7b979b7b386a SHA512 9619fb9a9f6f5d18f9ddb6377b99d62a8227c7464af4dd1794173537ff3432c7b3bca1d28d73a8d411f3ff44af3fc3633f5ab36569f35527869ecc04abb89449
+EBUILD unrar-6.0.5.ebuild 1889 BLAKE2B a4af1d6556180110b67f6581699c3f282ab4c039c8a5672b0c39c8819cc313ccc9cc522d342915061139bd8297beca26113e28d622ed1daa90c0b800c1966625 SHA512 008cd6a077705d080d4dcc8c3678e15343e56f08d011a5611ed6c36a426554247e3809f45764e00bd93b693e48bb3f4d4a2c0cdcb75c418c7332698cb3b6967a
+MISC metadata.xml 520 BLAKE2B 14f38803f23547426b6d1d87101a52cc5260b65313dfc727c0c8d8a719326792ba10ed27b584dfaa2be23811fcca217fe5418daa22ba90a6217a38cf4db84267 SHA512 9654aa3df0a399d971cad519392a232e1cbd9f407702bd2fd6fa31472fe6fc8966df787b3a99861f43db2e9bc3f8ced5d2840c21b10cbff6c74b07923d60e116
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index 08898384e738..0a18fbade38e 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://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>
-</maintainer>
-<slots>
-  <subslots>Reflect ABI of libunrar.so.</subslots>
-</slots>
-<upstream>
-  <remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
-</upstream>
+	<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>
+	</maintainer>
+	<slots>
+		<subslots>Reflect ABI of libunrar.so.</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unrar/unrar-6.0.4.ebuild b/app-arch/unrar/unrar-6.0.4.ebuild
index 4715611272fb..ff89fa03aada 100644
--- a/app-arch/unrar/unrar-6.0.4.ebuild
+++ b/app-arch/unrar/unrar-6.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-6.0.3.ebuild b/app-arch/unrar/unrar-6.0.5.ebuild
index 773d93d1e121..4715611272fb 100644
--- a/app-arch/unrar/unrar-6.0.3.ebuild
+++ b/app-arch/unrar/unrar-6.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
@@ -39,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mkdir -p build-{lib,bin}
+	mkdir -p build-{lib,bin} || die
 	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
 	cp build-{lib,bin}/Makefile || die
 }
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 00a4d532a735..fac0af2f2ef8 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -4,5 +4,7 @@ AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1dd
 AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5
 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
-EBUILD unzip-6.0_p25-r1.ebuild 2803 BLAKE2B 756d32ff21b15b3462f6437192130582fe49855a93dc1edafcbe6ad0dd01ffdd1161b81f16b35b86bd159e6b0f73224b7fe2a34e3ae8848d274bf1be7e84eb2a SHA512 d7748c46afc50ecbfc2d7ed99f3813da25edce920075687c40a6f9836ef0310a338e3e3373649795415a31ab269656e470f5f16148e9d460d9d99b6bee02843f
+DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f
+EBUILD unzip-6.0_p25-r1.ebuild 2804 BLAKE2B 5494fe51d269c97c8ddb3cec2632e87f8066835e9ef382579cfe988cebfb8c76595c7a86cc049484801ca121775e3e4301c96ba32aed6a144f954f1e0b226a2c SHA512 bc7ab1b7d4358ab4a6edd677e110c287b9f2c091cb0694f647883d88e9ef4db28c104bb5fde015f0bae79291dab3f7db5d6a9bb066b3950d188779d0131a38ed
+EBUILD unzip-6.0_p26.ebuild 2812 BLAKE2B 2f71a2852fcb76cbee948c071d315aef82201483439febd7c1c9b0ca257db7c70e703ad4768f3f9f0c9c25499eee0cde1c03abdad29f2ee4a41e75a90cadcc35 SHA512 bafc279d72cec5f175f2589b429e9fa0bb31d28c85aee8fdb1e3062917dbbe8dfd9705016ad0ff4609e537f650518aab815575320e06978f83a76b03e177ba4a
 MISC metadata.xml 586 BLAKE2B 67250bd2c90d0621ff6dc6c609d4b7938b213cc0907081165136c6ff985772d9292738719d2176964a93e6c99701dbc2129333d31abb42079e39f5333ce797e1 SHA512 dc3b7a2f09a84656771c2d3c2bec757ec9fcc6ed34208dc789ae669a20a247d6791cc34f67b33f374b6e6322a138a1777da8b26c35f71f7715173391eaa2f7bf
diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
index 54bf325de944..398013305c5d 100644
--- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 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 ~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="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild
new file mode 100644
index 000000000000..636bf3cce0c4
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0_p26.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="${PV//.}"
+MY_PV="${MY_PV%_p*}"
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
+	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 natspec unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local deb="${WORKDIR}"/debian/patches
+	rm "${deb}"/02-this-is-debian-unzip.patch || die
+	eapply "${deb}"/*.patch
+
+	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
+	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
+	eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch
+	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+	sed -i -r \
+		-e '/^CFLAGS/d' \
+		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
+		-e '/^STRIP/s:=.*:=true:' \
+		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
+		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
+		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
+		-e 's:LF2 = -s:LF2 = :' \
+		-e 's:LF = :LF = $(LDFLAGS) :' \
+		-e 's:SL = :SL = $(LDFLAGS) :' \
+		-e 's:FL = :FL = $(LDFLAGS) :' \
+		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
+		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
+		unix/Makefile \
+		|| die "sed unix/Makefile failed"
+
+	# Delete bundled code to make sure we don't use it.
+	rm -r bzip2 || die
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		i?86*-*linux*)       TARGET="linux_asm" ;;
+		*linux*)             TARGET="linux_noasm" ;;
+		i?86*-*bsd* | \
+		i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
+		*bsd* | *dragonfly*) TARGET="bsd" ;;
+		*-darwin*)           TARGET="macosx" ;;
+		*-solaris*)          TARGET="generic" ;;
+		*-cygwin*)           TARGET="generic" ;;
+		*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
+	esac
+
+	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
+	use bzip2 && append-cppflags -DUSE_BZIP2
+	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
+	append-cppflags -DLARGE_FILE_SUPPORT #281473
+}
+
+src_compile() {
+	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
+		emake -f unix/Makefile ${TARGET}
+}
+
+src_install() {
+	dobin unzip funzip unzipsfx unix/zipgrep
+	dosym unzip /usr/bin/zipinfo
+	doman man/*.1
+	dodoc BUGS History* README ToDo WHERE
+}
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index 6e16694059fa..f6ef79daac62 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,3 +1,4 @@
+AUX upx-3.96_CVE-2021-20285.patch 4481 BLAKE2B 345bce505a045c53b48dad3102f52588ceb7f2736cdbeab31ed5f65a5cf5a5344cb9ca700cfc3d7fac2569a91f454a652a676c83aafb1be884b0fae229d3afae SHA512 f596f13634eb2173f4c549d41387bdb6785501afb7d3a68d70f90dcdbadc615e95de024e1810af2b3663137692a7322d32a290357e0f7a96ca2acf51228b0abc
 DIST upx-3.96-src.tar.xz 792524 BLAKE2B 21af85dbcfdd1bf0151a653c865db13c9f30b9de0b9b4b94557ddd55736c7053dd829c5d72b9a7e5aa94a71ecc0151145dd66d7d98ded178c50ff7357d0ba442 SHA512 2d4d1be21d274d9bfdee9b9815396f5e5ff0bcdfb781b7be5fafa4d1e224028e412ec5f5ba607c482671aae27ccf9069abb2db0fb58f78f3a102a51897df2b11
-EBUILD upx-3.96.ebuild 810 BLAKE2B a7c7fabd58c3b527f48b7a6905032150aed66eea7efbfd5e07938367d0bd61dadf2f55924252bfbb2bcc1867af40ef7a55e46113ee2651695343dc6ffea8fb1a SHA512 221f0fc937505130b3c1d0014fd0236e2fbff597a0e2a1d19bb8b4a0dc5141800d50013f352f49b64599b106b6b0825b214854cbaaf181c4943364f79aaa66b1
+EBUILD upx-3.96-r1.ebuild 864 BLAKE2B 227dd8b0cc3d09522229cfeecf0f1c4a864d66aa558b0d7ac5589bef470cad6e0dd3db0e53006ce870bc127704f10a823af4c284943516e76173081f40ce36da SHA512 b83bba2a294a4f79d412e18319d5b3985ae1107cecf7b742a3e0a9672a8df38a53c51266c22327b01c2b205253775eab538c333b5ac057ca2c18b03e41eb02e4
 MISC metadata.xml 478 BLAKE2B c0d96932b628c0448fbdc1756445798bb382ea120b499a2bc2c9320b392730835e5bad5785ef719f5a95d381f3768e7bf2d7f4dbce76d8993052ac9a761f422d SHA512 5bd0548fcf13bbd34c5fc97bd139a6b1398bbc99db984cd730188280fc490864cf704858c132e0154b0681eca5a26a93fa0eeb029d5760fcf17d83be2d83d51d
diff --git a/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch b/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch
new file mode 100644
index 000000000000..1d47b2a8bb67
--- /dev/null
+++ b/app-arch/upx/files/upx-3.96_CVE-2021-20285.patch
@@ -0,0 +1,76 @@
+From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001
+From: John Reiser <jreiser@BitWagon.com>
+Date: Fri, 11 Dec 2020 13:38:18 -0800
+Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ
+
+https://github.com/upx/upx/issues/421
+	modified:   p_lx_elf.cpp
+---
+ src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++-----
+ 1 file changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
+index 182db192..3a4101cf 100644
+--- a/src/p_lx_elf.cpp
++++ b/src/p_lx_elf.cpp
+@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack()
+                         int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ];
+                         if (z_rel && z_rsz) {
+                             unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val);
++                            if ((unsigned)file_size <= rel_off) {
++                                char msg[70]; snprintf(msg, sizeof(msg),
++                                     "bad Elf32_Dynamic[DT_REL] %#x\n",
++                                     rel_off);
++                                throwCantPack(msg);
++                            }
+                             Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off];
+                             unsigned relsz   = get_te32(&dynseg[-1+ z_rsz].d_val);
++                            if ((unsigned)file_size <= relsz) {
++                                char msg[70]; snprintf(msg, sizeof(msg),
++                                     "bad Elf32_Dynamic[DT_RELSZ] %#x\n",
++                                     relsz);
++                                throwCantPack(msg);
++                            }
+                             Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp);
+                             for (; rp < last; ++rp) {
+                                 unsigned r_va = get_te32(&rp->r_offset);
+@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack()
+                         int z_rel = dt_table[Elf64_Dyn::DT_RELA];
+                         int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ];
+                         if (z_rel && z_rsz) {
+-                            unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val);
++                            upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val);
++                            if ((u64_t)file_size <= rel_off) {
++                                char msg[70]; snprintf(msg, sizeof(msg),
++                                     "bad Elf64_Dynamic[DT_RELA] %#llx\n",
++                                     rel_off);
++                                throwCantPack(msg);
++                            }
+                             Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off];
+-                            unsigned relsz   = get_te64(&dynseg[-1+ z_rsz].d_val);
++                            upx_uint64_t relsz   = get_te64(&dynseg[-1+ z_rsz].d_val);
++                            if ((u64_t)file_size <= relsz) {
++                                char msg[70]; snprintf(msg, sizeof(msg),
++                                     "bad Elf64_Dynamic[DT_RELASZ] %#llx\n",
++                                     relsz);
++                                throwCantPack(msg);
++                            }
+                             Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp);
+                             for (; rp < last; ++rp) {
+-                                unsigned r_va = get_te64(&rp->r_offset);
++                                upx_uint64_t r_va = get_te64(&rp->r_offset);
+                                 if (r_va == user_init_ava) { // found the Elf64_Rela
+-                                    unsigned r_info = get_te64(&rp->r_info);
++                                    upx_uint64_t r_info = get_te64(&rp->r_info);
+                                     unsigned r_type = ELF64_R_TYPE(r_info);
+                                     if (Elf64_Ehdr::EM_AARCH64 == e_machine
+                                     &&  R_AARCH64_RELATIVE == r_type) {
+@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack()
+                                     }
+                                     else {
+                                         char msg[50]; snprintf(msg, sizeof(msg),
+-                                            "bad relocation %#x DT_INIT_ARRAY[0]",
++                                            "bad relocation %#llx DT_INIT_ARRAY[0]",
+                                             r_info);
+                                         throwCantPack(msg);
+                                     }
diff --git a/app-arch/upx/upx-3.96.ebuild b/app-arch/upx/upx-3.96-r1.ebuild
index c9a668ebacec..26a73f6191a8 100644
--- a/app-arch/upx/upx-3.96.ebuild
+++ b/app-arch/upx/upx-3.96-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}-src"
 
+PATCHES=(
+	"${FILESDIR}/${P}_CVE-2021-20285.patch"
+)
+
 src_compile() {
 	tc-export CXX
 	emake CXXFLAGS_WERROR="" all
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 21a3ed4bdd72..11648292c9fd 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -4,7 +4,7 @@ AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
-EBUILD xar-1.8-r2.ebuild 1448 BLAKE2B 74478d6b433f9b3c4a2ddaf89bf516498bc8a890ce000ff67b982dad8a4c8a2ba237c7cc783d98c3e9086a3deebdf944a55bd0a1201697b9197614630d71d418 SHA512 b1be3e0775d9ee94da80f355904cea1926018a49a7c6eb95ff2c83489f42811dd3bfc83aeb0e2e8a2f92ef138c4b6ce1ede9e448764a2d5ba5b8f7499952857e
-EBUILD xar-1.8-r3.ebuild 1997 BLAKE2B 31f6ce42ea1fc579a1ceae7902e02d6203fbb0196c39f51b25e5876dd3eed88352f92996001626724afe5de978b3a8f1f718aacd602504a879d26d670ecf4f9a SHA512 067a07e7fe93b327b3b180cb57bd7db220906d80939ef90d931b100a03baf36732b88251b18d7207089f45480030362e56102fe46a090052651c69b49371869b
-EBUILD xar-1.8-r4.ebuild 2449 BLAKE2B a95924accc5c4f85e51f62fda7c67f3697c00ea8b6a8aeb761226195157c12ed1e73da18492a7f6182003b8a298117faca3606419006828222a1b8f6c2998c12 SHA512 1ab97b7555b1279f1b67901b769656a4cc009422c0edd5e07e4820f161c5edd056708f79d225c93f7b2489270da31757b809a01074f3c0f55efd5329cee6b548
+EBUILD xar-1.8-r2.ebuild 1496 BLAKE2B 737b07466392835311009bdb16f0fef85471a8ce6b395381d55477e83448a31d44f6e4fc7c6da67770339b67c79dcc53da6d0e3ea1cac115fe26cfa37789aa24 SHA512 9c7d378512c85960e83ed94089b2971f73ac9888f2357fa5ca0aff031cb3296679d2989360452dc76900c5fd92a2a3806814997d23d81981d62658abd4663d5b
+EBUILD xar-1.8-r3.ebuild 2045 BLAKE2B 183951d2e5503fac78474dee403c64087acd87e3ead8fd6d5ff0f0012eba80b37c1dd3e3a4cc0577cb77a2f3be451342eeb247c7ce21e606b34a971398aa3079 SHA512 853148a764583ebbf2f4ae492bd4880945c1584a33ae1512c2d9de33c3d39e3423c37eee48154c166ce12fa61c8afdc67364db35b597cdc7e28daecdf8dd3ca9
+EBUILD xar-1.8-r4.ebuild 2511 BLAKE2B f8ef096dd9d6f81b4b4443e65cd06168f3ae9ca4e248cbd3a44ab8a66b086dd1729ef9517600ebcf7f2e532bc83f9a72f0197b1c8532e52edba7023283d9299e SHA512 9993026f1a7013d283fd452690f555577199e1e818370123bcc174cfa055c67bc9a61f5568c303c969d9eaef0d53cb0add268553cd90645815d69db5f2464e13
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index 1b681345aa51..3f30d62f1a98 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 APPLE_PV=400
 DESCRIPTION="An easily extensible archive format"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
-DEPEND="
+RDEPEND="
 	!kernel_Darwin? (
 		!kernel_SunOS? ( virtual/acl )
 		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
@@ -24,7 +24,10 @@ DEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
@@ -36,7 +39,7 @@ PATCHES=(
 S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
 
 multilib_src_configure() {
-	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl)
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild
index a93682518b97..d3b4fc4be1a4 100644
--- a/app-arch/xar/xar-1.8-r3.ebuild
+++ b/app-arch/xar/xar-1.8-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic multilib-minimal multilib
+inherit flag-o-matic toolchain-funcs multilib-minimal multilib
 
 APPLE_PV=417.1
 DESCRIPTION="An easily extensible archive format"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
-DEPEND="
+RDEPEND="
 	!kernel_Darwin? (
 		!kernel_SunOS? ( virtual/acl )
 		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
@@ -24,7 +24,10 @@ DEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
@@ -54,7 +57,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl)
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild
index 75c3815b66cd..d73ec3eae709 100644
--- a/app-arch/xar/xar-1.8-r4.ebuild
+++ b/app-arch/xar/xar-1.8-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic multilib-minimal multilib
+inherit flag-o-matic toolchain-funcs multilib-minimal multilib
 
 APPLE_PV=417.1
 DESCRIPTION="An easily extensible archive format"
@@ -24,6 +24,7 @@ DEPEND="
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
@@ -65,8 +66,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	append-libs $(pkg-config --libs openssl)
-	use elibc_musl && append-libs $(pkg-config --libs fts-standalone)
+	append-libs $($(tc-getPKG_CONFIG) --libs openssl)
+	use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone)
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index d0f8a39c9a88..464ef2e950ed 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,5 @@
 DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb SHA512 e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f
+DIST xarchiver-0.5.4.17.tar.gz 1077111 BLAKE2B f68f22258dbfaeb37333fab3d2ea1b06e23e143f90df6cd94f7601961636d1e5a929e1353ac956ac9a7341813593fcfb35d5197666dbb0920ddf63e4365f34e1 SHA512 5b19fd0fb90f99aee0ac2576bc4efce9ef4eef9119fc118815f6d925e3877c0895475fbdf7363d8adfb6371fb7fd73299ea3a7cb3b6d9fff19c89d1d287d3a84
 EBUILD xarchiver-0.5.4.15.ebuild 1428 BLAKE2B 05941c387d97a5ff0e7e9e4c98c1c7a57118c562016213caaf0d464be9084787b9c9dab44cfac0cc982a3cb6c49473eabce5264b516952677d89a9adc57e2b4f SHA512 af14235bdcf1bf71033fcc1457e592fbaa2f7f6a5285a5740d8c6c530ee1f48df88e67ccb7f011253598dba2b33b901eaad150a6f0c9fcb98bb8ad00e482b424
+EBUILD xarchiver-0.5.4.17.ebuild 1325 BLAKE2B a8ba4fb6a0ad10190214c57bb8ae9b8e75ca21bcea7a7f58894fdb0337ca62151645a5e1300ec495cc2bad647243929d20c0bd83c2facdeb4c51856209ec94d5 SHA512 270b67aa43cdaa127d30dd6bfcf3a375e09fcb36489384c49dc391d8db0cdd1a10c1acc76e942e7126df5b5e395c1f2cdea30bb4791853f730be1eaf6d52dc6c
 MISC metadata.xml 447 BLAKE2B 9427d1c1f2062c7efa986b9182cefd225dac542e30a254b787470a2060fa6c3838dadcde3c3fdc9b10aa99fde66a6928286bdb2ae80437bd5590a8899e3f99fb SHA512 35841081a561194fd9ce87cf0232f727e0a7e86caf3564c6551c412ba397f1b759cba10b977fb4d9148529aaab313275e3e8066bebaa0848bc30e6c466e38a93
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
new file mode 100644
index 000000000000..019605f89c3a
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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
+RDEPEND=">=dev-libs/glib-2:=
+	x11-libs/gtk+:3=
+	!!<app-arch/pigz-2.4[symlink]"
+DEPEND="${RDEPEND}"
+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/xdms/Manifest b/app-arch/xdms/Manifest
index 591f913e8e37..e6f307c06491 100644
--- a/app-arch/xdms/Manifest
+++ b/app-arch/xdms/Manifest
@@ -1,3 +1,6 @@
+AUX xdms-1.3.2-dont-compress-man-pages.patch 499 BLAKE2B 69be6d731cff4d369d57d6a9fc71f122ade07f48c6351ada5e45ffa9f668d68bdf82ff2091dcdf64803659677a2d24b2133b8e04217f7ccb3273710df33497f1 SHA512 1b0e209782c68961515bfe3c6055732652ed6eb6a8aae968ab7273a5174274d37ec024c68179e43c433a129546483105c68a76c74addccd938b202dbdea3f2ee
+AUX xdms-1.3.2-fix-build-with-gcc-10.patch 1887 BLAKE2B ba0c0316bd660eebcdb3f70c29fbce2726f09528c1ef19e7659a527b6054fd6d5449a9310ad398ab05bb1ce309becfc7168f9a83bdb15177850535e3889b2d31 SHA512 e7dc413aa2b21a01fdcf1c1b19ea8a9f42ce249f3450cebc5aeee966120d67e3f2e56af2d4d4aa9bcf13e2d83edaa51b1ba1030a9f519dd4c536d592f907deea
+AUX xdms-1.3.2-respect-DESTDIR.patch 957 BLAKE2B c3296fdc3ef98936a76c76548f4294775faaa016d6ab5ab38f673c09a860b1da0a96f29824ea6583f31eb77c6ed2fbe34afcc8c561e1d842634f013a7afaa711 SHA512 59960128c6cb364483948c4009e9f465c9521990725079dea3b1431863cbacf4152ab138ee681c7226ccfa1202db2e9780cba4baa860b50b8069b0c16fb574d1
 DIST xdms-1.3.2.tar.bz2 43010 BLAKE2B 97118ce2052a93e334b02d1687e4c867f7158bdd99bfc4249a7a22d1eee57c6d6bbb26c640f0bdb61004997fcb6218724de40c759ae51f4b72da8dee0ebde48d SHA512 e29dd1d2373c635ba953ef526849e0b8fa645a0da91fff3a3512ce26eee43fb2c1280f27fae0a42a4fd47106494d6e44c5684eff3581661e538780927b851cac
-EBUILD xdms-1.3.2-r1.ebuild 656 BLAKE2B dd1c41a9b764b8dd66cbbe01b9ea69159f2b8ef3323df303f448529b15c98f38cfbd717ecf169131a6acd1a58f0a9925808beeb392f7175a604cdd2028959d9a SHA512 d014365da30a5ba188c6df9709b6c3049f0b22c4dc00b687cdf7aac199dfbe83c097f1fb5caf1f69f37e6631aaab7d9696ff7359e64fa45359bfbeaa84a59d66
-MISC metadata.xml 864 BLAKE2B 209b2fd1290a35b6d372b5725bd9d297a2d9b86a56bc45bdfd725e81399f004ac6d4de87386d883e921bc6a34d2e45797d029d71ec317f7c3930a4d7faf991f6 SHA512 a535abd221a7ea350cfeb4fbb84585cc4f4d6ee83f607ae5d0eee73a709b8df5ed3cf9b3056dbd6b8a68ff06353c5c8b407f322a06a3bbeb5fe3d6d0cea4cdba
+EBUILD xdms-1.3.2-r2.ebuild 963 BLAKE2B e1fb08de2cc825114fd3636881f510eb00d38156f8327516af1c4ff5906807176fe297ce00748364147747e4fc8896c4794e5454c7fc3ae58361490c35493d29 SHA512 19b70de944766c51f9df5a7ef996a2fbd21bcf5124975ae4aa1c814da902b90c6e7953cefc61199d5cd9cdeed8118eb853b43ba2bd7fc81998958120734dfdba
+MISC metadata.xml 946 BLAKE2B afe54847b8a528e4a20820fc480adfc6d78fd7d6d7db421649cc15934f6275526da3a3f7b144008c98d0da18c2ab38e32d12c00d9d5417382c58b2dce742db4c SHA512 bcfbd892265aeab44994d7acf53d2a952a1c76ba42ed70dbd30e0fd4bb84edf8c77951ca4b677d49c380e049bd21ec64881f6340c05599239f6d858500a582c9
diff --git a/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch
new file mode 100644
index 000000000000..3396b59a309c
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch
@@ -0,0 +1,13 @@
+From: Sam James <sam@gentoo.org>
+Subject: [PATCH 2/2] Don't compress man pages
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,5 +11,4 @@ install:	xdms
+ 	install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/
+ 	chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms
+ 	chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}
+-	gzip < xdms.1 > xdms.1.gz
+-	install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/
++	install xdms.1 ${DESTDIR}{PREFIX}/share/man/man1/
+-- 
+
diff --git a/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch b/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch
new file mode 100644
index 000000000000..dad00addead3
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-fix-build-with-gcc-10.patch
@@ -0,0 +1,80 @@
+https://sources.debian.org/patches/xdms/1.3.2-7/0002-Fix-build-with-gcc-10.patch/
+
+From: Jeff Law <law@redhat.com>
+Date: Sat, 9 May 2020 15:16:39 +0200
+Subject: Fix build with gcc-10
+--- a/src/u_deep.c
++++ b/src/u_deep.c
+@@ -17,9 +17,9 @@
+ #include "getbits.h"
+ 
+ 
+-INLINE USHORT DecodeChar(void);
+-INLINE USHORT DecodePosition(void);
+-INLINE void update(USHORT c);
++static INLINE USHORT DecodeChar(void);
++static INLINE USHORT DecodePosition(void);
++static INLINE void update(USHORT c);
+ static void reconst(void);
+ 
+ 
+@@ -98,7 +98,7 @@ USHORT Unpack_DEEP(UCHAR *in, UCHAR *out, USHORT origsize){
+ 
+ 
+ 
+-INLINE USHORT DecodeChar(void){
++static INLINE USHORT DecodeChar(void){
+ 	USHORT c;
+ 
+ 	c = son[R];
+@@ -117,7 +117,7 @@ INLINE USHORT DecodeChar(void){
+ 
+ 
+ 
+-INLINE USHORT DecodePosition(void){
++static INLINE USHORT DecodePosition(void){
+ 	USHORT i, j, c;
+ 
+ 	i = GETBITS(8);  DROPBITS(8);
+@@ -171,7 +171,7 @@ static void reconst(void){
+ 
+ /* increment frequency of given code by one, and update tree */
+ 
+-INLINE void update(USHORT c){
++static INLINE void update(USHORT c){
+ 	USHORT i, j, k, l;
+ 
+ 	if (freq[R] == MAX_FREQ) {
+diff --git a/src/u_heavy.c b/src/u_heavy.c
+index fff93d3..8557b71 100644
+--- a/src/u_heavy.c
++++ b/src/u_heavy.c
+@@ -30,8 +30,8 @@ USHORT heavy_text_loc;
+ 
+ static USHORT read_tree_c(void);
+ static USHORT read_tree_p(void);
+-INLINE USHORT decode_c(void);
+-INLINE USHORT decode_p(void);
++static INLINE USHORT decode_c(void);
++static INLINE USHORT decode_p(void);
+ 
+ 
+ 
+@@ -74,7 +74,7 @@ USHORT Unpack_HEAVY(UCHAR *in, UCHAR *out, UCHAR flags, USHORT origsize){
+ 
+ 
+ 
+-INLINE USHORT decode_c(void){
++static INLINE USHORT decode_c(void){
+ 	USHORT i, j, m;
+ 
+ 	j = c_table[GETBITS(12)];
+@@ -96,7 +96,7 @@ INLINE USHORT decode_c(void){
+ 
+ 
+ 
+-INLINE USHORT decode_p(void){
++static INLINE USHORT decode_p(void){
+ 	USHORT i, j, m;
+ 
+ 	j = pt_table[GETBITS(8)];
diff --git a/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch
new file mode 100644
index 000000000000..3db969932084
--- /dev/null
+++ b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch
@@ -0,0 +1,22 @@
+From: Sam James <sam@gentoo.org>
+Subject: [PATCH 1/2] Respect DESTDIR
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,10 +6,10 @@ clean:
+ 	$(MAKE) -C src clean
+ 
+ install:	xdms
+-	mkdir -p {PREFIX}/bin {PREFIX}/share/doc/xdms-{VERSION} {PREFIX}/share/man/man1
+-	install src/xdms {PREFIX}/bin/
+-	install xdms.txt COPYING ChangeLog.txt {PREFIX}/share/doc/xdms-{VERSION}/
+-	chmod og+rx {PREFIX}/bin {PREFIX}/bin/xdms
+-	chmod -R og+rX {PREFIX}/share/doc/xdms-{VERSION}
++	mkdir -p ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} ${DESTDIR}{PREFIX}/share/man/man1
++	install src/xdms ${DESTDIR}{PREFIX}/bin/
++	install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/
++	chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms
++	chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}
+ 	gzip < xdms.1 > xdms.1.gz
+-	install xdms.1.gz {PREFIX}/share/man/man1/
++	install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/
+-- 
diff --git a/app-arch/xdms/metadata.xml b/app-arch/xdms/metadata.xml
index ec5a204b1712..3a9a20905857 100644
--- a/app-arch/xdms/metadata.xml
+++ b/app-arch/xdms/metadata.xml
@@ -9,4 +9,7 @@
 		Can extract the files contained inside the DMS archives, if the compressed disk is an AmigaDOS disk, using readdisk made by Bernd Schmidt.
 		Can process multiple files in batch with a single command, and also use stdin and stdout for input and output of data.
 	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">heikkiorsila/xdms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild b/app-arch/xdms/xdms-1.3.2-r1.ebuild
deleted file mode 100644
index 14f419cd4b8c..000000000000
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
-HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms"
-SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	default
-	sed -i Makefile.in \
-		-e "s:COPYING::" \
-		-e "s:share/doc/xdms-{VERSION}:share/doc/xdms-${PF}:" || die
-	sed -i -e "s:-O2::" src/Makefile.in || die
-}
-
-src_configure() {
-	./configure --prefix=/usr --package-prefix="${D}" || die
-}
diff --git a/app-arch/xdms/xdms-1.3.2-r2.ebuild b/app-arch/xdms/xdms-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..07dce668c10a
--- /dev/null
+++ b/app-arch/xdms/xdms-1.3.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="xDMS - Amiga DMS disk image decompressor"
+HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms"
+SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.2-respect-DESTDIR.patch
+	"${FILESDIR}"/${PN}-1.3.2-dont-compress-man-pages.patch
+	"${FILESDIR}"/${PN}-1.3.2-fix-build-with-gcc-10.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i Makefile.in \
+		-e "s:COPYING::" \
+		-e "s:share/doc/xdms-{VERSION}:share/doc/${PF}:" || die
+
+	sed -i -e "s:-O2::" src/Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Needed to avoid typical "Undefined symbols for architecture x86_64"
+		append-ldflags -undefined dynamic_lookup
+	fi
+
+	./configure --prefix="${EPREFIX}"/usr || die
+}
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index e07f509be48c..7b350286aa70 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,4 @@
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-EBUILD xz-utils-5.2.5.ebuild 2765 BLAKE2B 4d30653dd29043d86f5bc418c0dfb714301581d3a253967be8d62b61622be5f2fb1efe1600f4ee9b3d4a92b86dc96bdffe9ab39a79a1551bb0e31ce0c48b6413 SHA512 56106512d081a43c59b1c536dd3aa05c2507f9d3409022fff1f1b17a014d0d265a8f5a506ef1e67fa9c03e0620375ecd2a8bc4adee45383d630733c0bd5c9584
+EBUILD xz-utils-5.2.5.ebuild 2766 BLAKE2B 0dcf3293012914303c1893602ac12389a8994206bee0ff2edc80283e6c46e1105d69252446dbb72dcb795dd63e0faa94c9d01e4badd9f0ace598a7e44aa1d37a SHA512 a46bf8554c455558edbf7cd220eb611a59778ba5d6a46f5d59356aff94feea6675aed9b395865ab6d281ae7c82ee50bf2a1f7125cf5708ececc8a7117f58d101
 EBUILD xz-utils-9999.ebuild 2774 BLAKE2B 5fc27d6432e3c91a091bd78e1cf876e7e2231e98658eb3aa8794104a1b8be72f1390ebd7f939e8ad13bc53c1b7478d9cd64805283cab31bebc03cdcaa1851ab3 SHA512 d94eb53b779f2c5dbf077f7d89b136d43ab164a18b881c5bf14f3e0a1da10d9e36a2ed1df8078eaa721e6e3d54906e2b1ecddf9a1ba64ebbc18ec27402340210
 MISC metadata.xml 538 BLAKE2B 06981ff73e0b5996d9231d91eb18dfc31f03c7120d68eae5eb1bf98a5b99fecea4622ee0e3649fc655db4abc455a46627a0b77c971afb5729f7c8c5e50b0f616 SHA512 1f1cc9d8bb737ec14e06c1cc41f27dfc4140efb2e9c5bcb749ecc4cba11df9ee5513d8874e0f78a8ba8d597e16c532ad25891f31824beab2ec02e3455a95f8c3
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
index d4c053d92622..f3623aeb5329 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 8720a3520e4d..4d2efacc0717 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -6,5 +6,5 @@ AUX zip-3.0-no-crypt.patch 1116 BLAKE2B a4f12f492b3f844a0e822f27f1acb81d826484dd
 AUX zip-3.0-pic.patch 502 BLAKE2B 6ac03408e40986fbbc7219fa1f96f8e2fdc448071dcc1321e7f047068468ce2ba21b30bbea3f5cbd33cff528fd8f5493ce47b42e1c9a6f61c09a38a0fd12c3bd SHA512 055396cb0cfbf994d5be95533c4e7a8ad35120e2250dd2df1757f54b2b722c32d413dda61ac4bb96f0af93965d0a184794626ba6ca37a14ed04f984e544ae9c5
 AUX zip-3.0-zipnote-freeze.patch 1926 BLAKE2B 5976c4ad62d25f4ace8e17a85b77c99fb5ea75151d6ddd8fe27ee22cb7669d98281e26952c623b6e367fa880fce693d393a79fc619e13d8ba530b2aa38b8b70f SHA512 edd90964bc4f1bd3cc45f719905f3688ebd779aea5f10439b2331d668774ed55e645e025d9f408cedb8313848d4e26ba39726d019543e3533f79f1ef83620932
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r4.ebuild 1698 BLAKE2B 6f549516e94a4323ed29108f2349835f48c3762537aee5e8d9acf7427c998cb4dfb77abcf52e4c6c5d1fbf6d5c783e8d60dffb3a826a3c7ca115848271042588 SHA512 2541fb801ab128a1e3d1637913161b608e1d8bee756ea5fa1a60a6417305a14ea067f33ac0e8f5541ba925187e24871c94c8af94489f5e1aad38a4ad07468c1a
+EBUILD zip-3.0-r4.ebuild 1699 BLAKE2B 9b61739a90913a8efb093f4827be99e5493c339500102eaf868b7490134098e6e46349f3477161bc73ce9cc5d64726567a004dbbf54e84ebb1801396144e9a9f SHA512 d49380812061f1b019cea5d16e221520d7a881bc8094a30338bf09ad715525835f67e526675c238ffe4b67fe8e3b4db5a56c3c5908bf542c3813f2b7d3903918
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/zip/zip-3.0-r4.ebuild b/app-arch/zip/zip-3.0-r4.ebuild
index 09c1613a642e..d03dd55d5bf2 100644
--- a/app-arch/zip/zip-3.0-r4.ebuild
+++ b/app-arch/zip/zip-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="bzip2 crypt natspec unicode"
 
 DEPEND="${RDEPEND}"
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index d710a3272f20..fa81d0fd8d5f 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,6 +1,3 @@
-AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
-DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
 DIST zopfli-1.0.3.tar.gz 195227 BLAKE2B fed322e6d0baf8e9008e91fef4c459e8f67f0e7d62942469893d89b8ca39ace6d1ac68cbbc322e938e66a613ea9a36e3ae9f59550b5f4964107bec490a07038a SHA512 362cbeee0b3f04a4c5da512f82671491f874d4ec7b693dca9724ae42123d7ac184cc4d5de1872b4f1fc938c97f79dfdb482f62d1fca4a17cff6d267f6021e8d2
-EBUILD zopfli-1.0.2.ebuild 966 BLAKE2B cab9a7529b3516654f4c9fc84b38ba72d2b3000c70682d61b6ca42eae86655bab2ca3fc6929d481a140324a4669bf496a5b08d645f4c2b39895b677e73b17102 SHA512 401c5e1a4be1ab1dd813335758c04ead724d5029f631f960cc3017e036aca3a3d80043ba93b4064d12c041d1217129cce05aeb92fa6af40a9719babccab4db16
-EBUILD zopfli-1.0.3.ebuild 507 BLAKE2B 27771f307925839a6ed0b115a50a15e51b1c4311e72bd4706761a745b477f25df507e177a6759fecb4d9551747af64e559159fdfc54ad2d4bd260252dfd9980d SHA512 8b3fd3d6addef7bd8fa6f5cc2b9e285d705941a9f19d76742318e5d92c965243a19ec597b94e5bb59b6001deb9db9906369b21f8dc72ef62829af87cc4e4cee0
+EBUILD zopfli-1.0.3.ebuild 508 BLAKE2B 971df5dced1142538cdd2f07e9aa8bcae37310f25c4c122640ae22aec431fdfee471ab1504bd1bfb4cab349e6baf18b9a72423bf5f3769be07e955cc54d318b3 SHA512 baf5268329ae9fb4dbef467dbbc81877be489e363e815d1766c36950fde6fbc046829d835419edd4e8d8e1f036c4ea16150c5634b8d89458c29193b2e96b302e
 MISC metadata.xml 250 BLAKE2B 1c20423b13baa29fbe982337cf7c7f75c02e96e0dc84a35efd58db42561327a91a2d1d8efde9631df1bfaa561dedf0bf3533939eb62fbf00901ea55bd3eb59b8 SHA512 86aa5b6da7a3b70221832eafcdcca8585939f670834cdcc205c7f1674d1ad8b81ebd9135e0c699d4073ea5d496170334dee1000ea83767973cae4e49981377ab
diff --git a/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
deleted file mode 100644
index 07a1c121032a..000000000000
--- a/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 90221a4d79dcbf44239b9b07cb7c3ec7c090a4a3 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 18 May 2018 20:43:23 +0200
-Subject: [PATCH] Respect env CC/CXX, split LDFLAGS, use libraries
-
-This is a port of files/zopfli-1.0.1-makefile.patch to 1.0.2.
----
- Makefile | 32 +++++++++++++++++++-------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 30b931e..bf063df 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,10 @@
--CC = gcc
--CXX = g++
-+CC ?= gcc
-+CXX ?= g++
- 
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
--CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+CFLAGS += -W -Wall -Wextra -ansi -pedantic
-+CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
-+LDFLAGS += -L. -Wno-unused-function
-+LIBS = -lm
- 
- ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
-                 src/zopfli/deflate.c src/zopfli/gzip_container.c\
-@@ -18,24 +20,28 @@ ZOPFLIPNGBIN_SRC := src/zopflipng/zopflipng_bin.cc
- 
- .PHONY: zopfli zopflipng
- 
-+all: zopfli zopflipng
-+
- # Zopfli binary
--zopfli:
--	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
-+zopfli: libzopfli
-+	$(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli
- 
- # Zopfli shared library
- libzopfli:
- 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
--	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
-+	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
-+	@ln -s libzopfli.so.1.0.2 libzopfli.so.1
-+	@ln -s libzopfli.so.1.0.2 libzopfli.so
- 
- # ZopfliPNG binary
--zopflipng:
--	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
-+zopflipng: libzopflipng
-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng
- 
- # ZopfliPNG shared library
--libzopflipng:
--	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
-+libzopflipng: libzopfli
-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
-+	@ln -s libzopflipng.so.1.0.2 libzopflipng.so.1
-+	@ln -s libzopflipng.so.1.0.2 libzopflipng.so
- 
- # Remove all libraries and binaries
- clean:
--- 
-2.17.0
-
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
deleted file mode 100644
index b1ceb137f61c..000000000000
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Very good, but slow, deflate or zlib compression"
-HOMEPAGE="https://github.com/google/zopfli/"
-SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DOCS=( CONTRIBUTORS README README.zopflipng )
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)
-
-src_prepare() {
-	default
-	tc-export CC CXX
-}
-
-# The Makefile has no install phase
-src_install() {
-	dolib.so libzopfli.so*
-	doheader src/zopfli/zopfli.h
-
-	dobin ${PN}
-
-	# This version was erroneously not bumped to match ${PV}
-	dolib.so libzopflipng.so*
-	doheader src/zopflipng/zopflipng_lib.h
-
-	dobin zopflipng
-}
diff --git a/app-arch/zopfli/zopfli-1.0.3.ebuild b/app-arch/zopfli/zopfli-1.0.3.ebuild
index 9fcaf2e720e4..d25c4c0ccc17 100644
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )
diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
index 60e131775d80..b100cb7fa06e 100644
--- a/app-arch/zpaq-extras/Manifest
+++ b/app-arch/zpaq-extras/Manifest
@@ -10,5 +10,5 @@ DIST min.zip 9560 BLAKE2B 45eb51bfbfbc65506df34b0967068e318f1f1834504d2b3df9d3af
 DIST zpaq-fast.cfg 359 BLAKE2B b441461e367f6d7e49da9ed6a23dfe8d4bd8d75f516cd47a8c46c04835267026558fec5890f46b0fc04c2bfcfc1c16ebe4c0e5a21fa0e3b671290b68185c812a SHA512 3f1118bdb61bea4c8df4e7a88a9ae079aecbe9f1dfc2aa7935334d330d374a248ab2327da9524857ca9c2b214ac32f3d2dad6ad420f0688b65384c2263147e57
 DIST zpaq-max.cfg 1754 BLAKE2B 5d522fc6afdfa3376d971fb57b94d1f2e916ffaf93cc7900472650ff928feb2c55e30fb92ff6e12b47266d17f47804fb4a223d57726c95740b9f636ae64b0326 SHA512 12758ea633cb37619c26753f8a4f368a1adc1b682a3ec738e36b8f39bff06f81dd9b37f9b58839ad43488d9b821690a9cb43e276da88f36d1b20f842cbcab70e
 DIST zpaq-mid.cfg 786 BLAKE2B 4f12176d42628eb85424490219509c0c272258ed260cecd34e772a4f42961af51a31ed8e9bd47cc8b0622673f5d3463742ac4d4f888b33af7f06e05bc38ea415 SHA512 ef08f70b5541396a690b7df630ddbb9fb3093b7617acb26394e9f7da40d5191343500bb0b6f0e66ed73fc840b7d5666cbc47a74f7eabba6abbe3743de7db7235
-EBUILD zpaq-extras-3.ebuild 1503 BLAKE2B 246e484a3af59a8cb53aee615c66a960986e708b1dd90ade5a48dd9010000071fde03f5e7dd5d3b86a442d6ed138c53431229c2d0700613d9fdd8e572b960007 SHA512 ede3d7b8669599dbee1384e1e3239f2a0164a9944582ffce7d96f50ca4c4474821f6ec67e0177f10257d230773f803cda171ccf55ef82da423f72e8a68181a05
+EBUILD zpaq-extras-3.ebuild 1498 BLAKE2B 8f398fda2db2ebe813e2d5cf3ded8bafc68ac617f855be2e9ec2a56e59130ff185f07f841f390802ee3a5c555220e6dab9f5f692d6e1f7edb77a1525bafa2c55 SHA512 5a97c5b3a9111b99de8f9c70b03eafe0b83bb9d7e212c79f488aa82a4557e222baf90d80ed98acaa4a1119afee1ee6500e2bdc8d30483bf66fa08180c96ef0f5
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/zpaq-extras/zpaq-extras-3.ebuild b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
index cb8fc5815ebf..f4bca00bfc94 100644
--- a/app-arch/zpaq-extras/zpaq-extras-3.ebuild
+++ b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="A set of additional compression profiles for app-arch/zpaq"
@@ -18,17 +19,15 @@ SRC_URI="http://mattmahoney.net/dc/bwt_j3.zip
 	http://mattmahoney.net/dc/lz1.zip
 	http://mattmahoney.net/dc/lazy100.zip
 	http://mattmahoney.net/dc/lazy210.zip"
+S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 RDEPEND=">=app-arch/zpaq-6.19"
 
-S=${WORKDIR}
-
 src_unpack() {
 	local x
 	for x in ${A}; do
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index a900a420d5e0..8bf2ad229419 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,12 +1,3 @@
-AUX zstd-1.4.4-make43.patch 3577 BLAKE2B 55e6e743b44f8ad9048d4ab94c7058b82fc3fdbcf7863dbd7fe1933c62f736bbfed1d57a1fbd26f24159bae96094b393e1067b0bf467aeb40a464c7b34e741c5 SHA512 800c6dd70c09705ad7eb3e031c451d6e9cf0a06b1a42f0fbb0e474e0873596641bb5e4c03681955ec883d34ffaa4aa8ae207f399c4753c0f6f05afe70f56254f
-AUX zstd-1.4.4-pkgconfig_libdir.patch 8322 BLAKE2B 2c7bcc57cbbf549919d0f7ce4538afd5ef8face1624b4bb348d77725aa22349e306614a8bd75666fae0308f05fc64645211dbc2f3fe4efaddf7027c845fd5d0d SHA512 e748145592281a218495076c44d081c994923605fff2f9561a04ad3a00ba38847e4855549610da4d91d50c4bd5198270482ae59277571e9723a46b967a088632
-AUX zstd-1.4.5-fix-uclibc-ng.patch 762 BLAKE2B 3ead6b2ca56a6109b984a7e4b73d80b8a92e10f8ff20547e27fe897d70dac7bff15f1acedf6cca3ab0ea9ded07c2cdb8ac2ee5665eeb7a095c742c5614c73604 SHA512 e4de6367b47b016d9a0179b57cc06c9e232d0a736e20ff0cf8132d36512a5a232d8583d91b1453f7a122d63b85df96688053f02552b2717ff2f22bf30a0c0002
-DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
-DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-DIST zstd-1.4.8.tar.gz 1816546 BLAKE2B 950d03c408e9d3fc2081969553c46247a1b8c13a22542effbf70373625bbfeb2a810e0adf0e1c6180cef590e7a28487191b1a577982fddc7a00d1507b461efd5 SHA512 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
-EBUILD zstd-1.4.4-r4.ebuild 1829 BLAKE2B af328824a7bf0d2c624eb44b2944fb6722a8029fd60a27699099b43df8bf185632da2e22c33dd817e0882431f5969e43442011dec99d6373ad6b335702458550 SHA512 0a78f7dc6ac514feb22cab76f61ba43e5bbe23399cdcaffcdd5073cb4ff01cda577c11082e9421973f9143e7eac07a511e0b7660c92d601d4ce56574a7fa7758
-EBUILD zstd-1.4.5.ebuild 1730 BLAKE2B 7512b6b7c94c40a397af11f7ba0a829efa992c1850100eb210cafbc0c37fc348be18b3cc0b3a729ee8b21e613cdf3adc5a864e1cba26f8e6b300ae93730cd949 SHA512 657b61078f485e216f2315e9ce3c586e36c14a1655d7f252e748c027ea69e38f71dbd439996f897056eba1a277104387a3e6d7012d10978e3e892bfd9e7742f1
-EBUILD zstd-1.4.8-r1.ebuild 1678 BLAKE2B 7544c7630e0a7b31f0c536c9704ae93f8ac35e5c2ced17b3f728f960d85cc584739e9e1995383cd198d595620366d7b1fd91dc2a57a29b3bb57ba3903adb7661 SHA512 45126b517b8c50c5ed7a21f742bbd05f66b9cc4ea3976532b3f8bb20aed04920867be2b1126e7d5889aa4f7f3a1e10e7ada9cb2d388ddfed40f79564cfaa08ae
-EBUILD zstd-1.4.9.ebuild 1670 BLAKE2B 36cefbd7cd1ac3d6845409c2ad18999c29fb7539c9545ad2ee31b6627485e06cc3c41f32265707206e8a64352fce3d92bf4f8da7c3261bd9858fc6e5e1463332 SHA512 09ca34b1d8ac65cf1800d49e9be043bdfe268df36e68a52596ff6f9fd31c33fbf33cccea1935b31023c0becc5a2dab6eb42d59fc549152be909d26683e22d95e
-MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
+EBUILD zstd-1.4.9.ebuild 1670 BLAKE2B 4ecc7d03f5dd84ea8d21325d79e605e0240a97b437aa89f086b29f70236c91122021e793e02c96481e6ff44b2aedca24d56fbc5bcac016f54016e3a65afa1c3f SHA512 f5556bfc7c0118b6a757b464d905e59cdbbf8de0739f1816b17fcff7c12eee6576c834f78408a3c9253615bcf5e967f8a9d4bf6183399a9d24549df64bfc6f96
+MISC metadata.xml 409 BLAKE2B c955efa52a6bb0508c7a648281351c4eb37c8d0381b71317948fb33fcf49acd837ebaa86a66d46c561ec86b97a914f64795ea424ee2f9fc06ae13a5e00343ac8 SHA512 d3a660c20edfc5f404dd02df9819178e7501483db8a548b434cd6f19d9634352b80a6118d5bb5bd27496f0d1a7d5e1aa9adbbc21f1604bfa3f78aa99a252d1b6
diff --git a/app-arch/zstd/files/zstd-1.4.4-make43.patch b/app-arch/zstd/files/zstd-1.4.4-make43.patch
deleted file mode 100644
index 679e0b791e33..000000000000
--- a/app-arch/zstd/files/zstd-1.4.4-make43.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 06a57cf57e3c4e887cadcf688e3081154f3f6db4 Mon Sep 17 00:00:00 2001
-From: Bimba Shrestha <bimbashrestha@fb.com>
-Date: Thu, 6 Feb 2020 14:10:51 -0800
-Subject: [PATCH] [build-issue] More portable header prefix usage (#) (#1987)
-
-* make 4.3 build issue fix
-
-* Changing header name and adding comment
----
- programs/Makefile | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/programs/Makefile b/programs/Makefile
-index b75314a8..a9ee3cb5 100644
---- a/programs/Makefile
-+++ b/programs/Makefile
-@@ -94,9 +94,12 @@ endif
- 
- VOID = /dev/null
- 
-+# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/)
-+NUM_SYMBOL := \#
-+
- # thread detection
- NO_THREAD_MSG := ==> no threads, building without multithreading support
--HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
-+HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
- HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0)
- ifeq ($(HAVE_THREAD), 1)
- THREAD_MSG := ==> building with threading support
-@@ -108,7 +111,7 @@ endif
- 
- # zlib detection
- NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support
--HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c)
-+HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c)
- ifeq ($(HAVE_ZLIB), 1)
- ZLIB_MSG := ==> building zstd with .gz compression support
- ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
-@@ -119,7 +122,7 @@ endif
- 
- # lzma detection
- NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support
--HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c)
-+HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c)
- ifeq ($(HAVE_LZMA), 1)
- LZMA_MSG := ==> building zstd with .xz/.lzma compression support
- LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS
-@@ -130,7 +133,7 @@ endif
- 
- # lz4 detection
- NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support
--HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c)
-+HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c)
- ifeq ($(HAVE_LZ4), 1)
- LZ4_MSG := ==> building zstd with .lz4 compression support
- LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS
--- 
-2.24.1
-
diff --git a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch
deleted file mode 100644
index e8d745a56aa2..000000000000
--- a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_libdir.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From e668c9b52896e1cf92c99da3b01e3bdbbae77100 Mon Sep 17 00:00:00 2001
-From: "W. Felix Handte" <w@felixhandte.com>
-Date: Tue, 18 Feb 2020 10:50:38 -0500
-Subject: [PATCH 1/3] Fix pkg-config File Generation Again
-
-Revises #1851. Fixes #1900. Replaces #1930.
-
-Thanks to @orbea, @neheb, @Polynomial-C, and particularly @eli-schwartz for
-pointing out the problem and suggesting solutions.
-
-Tested with
-
-  ```
-  make -C lib clean libzstd.pc
-  cat lib/libzstd.pc
-
-  # should fail
-  make -C lib clean libzstd.pc     LIBDIR=/foo
-  make -C lib clean libzstd.pc INCLUDEDIR=/foo
-  make -C lib clean libzstd.pc     LIBDIR=/usr/localfoo
-  make -C lib clean libzstd.pc INCLUDEDIR=/usr/localfoo
-  make -C lib clean libzstd.pc     LIBDIR=/usr/local/lib     prefix=/foo
-  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/include prefix=/foo
-
-  # should succeed
-  make -C lib clean libzstd.pc     LIBDIR=/usr/local/foo
-  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/foo
-  make -C lib clean libzstd.pc     LIBDIR=/usr/local/
-  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local/
-  make -C lib clean libzstd.pc     LIBDIR=/usr/local
-  make -C lib clean libzstd.pc INCLUDEDIR=/usr/local
-  make -C lib clean libzstd.pc     LIBDIR=/tmp/foo prefix=/tmp
-  make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp
-  make -C lib clean libzstd.pc     LIBDIR=/tmp/foo prefix=/tmp/foo
-  make -C lib clean libzstd.pc INCLUDEDIR=/tmp/foo prefix=/tmp/foo
-
-  # should also succeed
-  make -C lib clean libzstd.pc prefix=/foo LIBDIR=/foo/bar INCLUDEDIR=/foo/
-  cat lib/libzstd.pc
-
-  mkdir out
-  cd out
-  cmake ../build/cmake
-  make
-  cat lib/libzstd.pc
-  ```
----
- build/cmake/lib/CMakeLists.txt |  5 +++--
- lib/Makefile                   | 14 ++++++++++++--
- lib/libzstd.pc.in              |  4 ++--
- 3 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
-index e92647bf1..29ff57aa0 100644
---- a/build/cmake/lib/CMakeLists.txt
-+++ b/build/cmake/lib/CMakeLists.txt
-@@ -134,11 +134,12 @@ endif ()
- if (UNIX)
-     # pkg-config
-     set(PREFIX "${CMAKE_INSTALL_PREFIX}")
--    set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-+    set(LIBDIR "${CMAKE_INSTALL_LIBDIR}")
-+    set(INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
-     set(VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}")
-     add_custom_target(libzstd.pc ALL
-             ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc"
--            -DPREFIX="${PREFIX}" -DVERSION="${VERSION}"
-+            -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}"
-             -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake"
-             COMMENT "Creating pkg-config file")
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index fd1710cf1..dbd64994c 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -224,6 +224,16 @@ LIBDIR      ?= $(libdir)
- includedir  ?= $(PREFIX)/include
- INCLUDEDIR  ?= $(includedir)
- 
-+PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p")
-+PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p")
-+
-+ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p"))
-+$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file)
-+endif
-+ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p"))
-+$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file)
-+endif
-+
- ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
- PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
- else
-@@ -239,11 +249,11 @@ endif
- INSTALL_PROGRAM ?= $(INSTALL)
- INSTALL_DATA    ?= $(INSTALL) -m 644
- 
--
--libzstd.pc:
- libzstd.pc: libzstd.pc.in
- 	@echo creating pkgconfig
- 	@sed -e 's|@PREFIX@|$(PREFIX)|' \
-+             -e 's|@LIBDIR@|$(PCLIBDIR)|' \
-+             -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \
-              -e 's|@VERSION@|$(VERSION)|' \
-              $< >$@
- 
-diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in
-index e7880be47..8ec0235ad 100644
---- a/lib/libzstd.pc.in
-+++ b/lib/libzstd.pc.in
-@@ -4,8 +4,8 @@
- 
- prefix=@PREFIX@
- exec_prefix=${prefix}
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib
-+includedir=${prefix}/@INCLUDEDIR@
-+libdir=${exec_prefix}/@LIBDIR@
- 
- Name: zstd
- Description: fast lossless compression algorithm library
-
-From 73737231b95976f24b7b9bff96240976b11dcce0 Mon Sep 17 00:00:00 2001
-From: "W. Felix Handte" <w@felixhandte.com>
-Date: Tue, 18 Feb 2020 13:17:17 -0500
-Subject: [PATCH 2/3] Allow Manual Overriding of pkg-config Lib and Include
- Dirs
-
-When the `PCLIBDIR` or `PCINCDIR` is non-empty (either because we succeeded
-in removing the prefix, or because it was manually set), we don't need to
-perform the check. This lets us trust users who go to the trouble of setting
-a manual override, rather than still blindly failing the make.
-
-They'll still be prefixed with `${prefix}/` / `${exec_prefix}/` in the
-pkg-config file though.
----
- lib/Makefile | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index dbd64994c..b067c11a2 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -227,12 +227,21 @@ INCLUDEDIR  ?= $(includedir)
- PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p")
- PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p")
- 
-+ifeq (,$(PCLIBDIR))
-+# Additional prefix check is required, since the empty string is technically a
-+# valid PCLIBDIR
- ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p"))
- $(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file)
- endif
-+endif
-+
-+ifeq (,$(PCINCDIR))
-+# Additional prefix check is required, since the empty string is technically a
-+# valid PCINCDIR
- ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p"))
- $(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file)
- endif
-+endif
- 
- ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
- PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig
-
-From e5ef935cf6160768e20cd73db3d9450aa8b7f8cf Mon Sep 17 00:00:00 2001
-From: "W. Felix Handte" <w@felixhandte.com>
-Date: Tue, 18 Feb 2020 13:40:58 -0500
-Subject: [PATCH 3/3] Fix Variable Capitalization
-
----
- lib/Makefile | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index b067c11a2..db35207bb 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -219,27 +219,28 @@ DESTDIR     ?=
- prefix      ?= /usr/local
- PREFIX      ?= $(prefix)
- exec_prefix ?= $(PREFIX)
--libdir      ?= $(exec_prefix)/lib
-+EXEC_PREFIX ?= $(exec_prefix)
-+libdir      ?= $(EXEC_PREFIX)/lib
- LIBDIR      ?= $(libdir)
- includedir  ?= $(PREFIX)/include
- INCLUDEDIR  ?= $(includedir)
- 
--PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p")
--PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p")
-+PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(EXEC_PREFIX)\\(/\\|$$\\)@@p")
-+PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(PREFIX)\\(/\\|$$\\)@@p")
- 
- ifeq (,$(PCLIBDIR))
- # Additional prefix check is required, since the empty string is technically a
- # valid PCLIBDIR
--ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p"))
--$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file)
-+ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(EXEC_PREFIX)\\(/\\|$$\\)@ p"))
-+$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file)
- endif
- endif
- 
- ifeq (,$(PCINCDIR))
- # Additional prefix check is required, since the empty string is technically a
- # valid PCINCDIR
--ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p"))
--$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file)
-+ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(PREFIX)\\(/\\|$$\\)@ p"))
-+$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file)
- endif
- endif
- 
diff --git a/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch b/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch
deleted file mode 100644
index e4c2335d199f..000000000000
--- a/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1dcc4787965aa8f4af48ed5a2154185750bbaff5 Mon Sep 17 00:00:00 2001
-From: Yann Collet <cyan@fb.com>
-Date: Mon, 13 Jul 2020 14:16:33 -0700
-Subject: [PATCH] fix uclibc's st_mtim
-
-reported and suggested by @ewildgoose (#1872)
----
- programs/platform.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/programs/platform.h b/programs/platform.h
-index 2b4b9f2d8..68be70bb3 100644
---- a/programs/platform.h
-+++ b/programs/platform.h
-@@ -102,6 +102,12 @@ extern "C" {
- #      define PLATFORM_POSIX_VERSION 1
- #    endif
- 
-+#    ifdef __UCLIBC__
-+#     ifndef __USE_MISC
-+#      define __USE_MISC /* enable st_mtim on uclibc */
-+#     endif
-+#    endif
-+
- #  else  /* non-unix target platform (like Windows) */
- #    define PLATFORM_POSIX_VERSION 0
- #  endif
-
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
index b9782eebc304..934435006f16 100644
--- a/app-arch/zstd/metadata.xml
+++ b/app-arch/zstd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">facebook/zstd</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facebook/zstd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/zstd/zstd-1.4.4-r4.ebuild b/app-arch/zstd/zstd-1.4.4-r4.ebuild
deleted file mode 100644
index b361ae879fc8..000000000000
--- a/app-arch/zstd/zstd-1.4.4-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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}/${P}-pkgconfig_libdir.patch" #700780
-	"${FILESDIR}/${P}-make43.patch" #708110
-	"${FILESDIR}/${PN}-1.4.5-fix-uclibc-ng.patch" #741972
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-
-	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
-	# where upstream build system does not add -pthread for Makefile-based
-	# build system.
-	use threads && append-flags $(test-flags-CCLD -pthread)
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${@}"
-}
-
-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.4.5.ebuild b/app-arch/zstd/zstd-1.4.5.ebuild
deleted file mode 100644
index e8a10f35729e..000000000000
--- a/app-arch/zstd/zstd-1.4.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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}/${P}-fix-uclibc-ng.patch" #741972
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-
-	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
-	# where upstream build system does not add -pthread for Makefile-based
-	# build system.
-	use threads && append-flags $(test-flags-CCLD -pthread)
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${@}"
-}
-
-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.4.8-r1.ebuild b/app-arch/zstd/zstd-1.4.8-r1.ebuild
deleted file mode 100644
index a7b21ee6fe57..000000000000
--- a/app-arch/zstd/zstd-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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}"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-
-	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
-	# where upstream build system does not add -pthread for Makefile-based
-	# build system.
-	use threads && append-flags $(test-flags-CCLD -pthread)
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${@}"
-}
-
-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.4.9.ebuild b/app-arch/zstd/zstd-1.4.9.ebuild
index 28bd4413d0df..da3fe8961c8c 100644
--- a/app-arch/zstd/zstd-1.4.9.ebuild
+++ b/app-arch/zstd/zstd-1.4.9.ebuild
@@ -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 ~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
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /app-arch
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)