gentoo resync : 03.07.2021

19 files changed, 25 insertions, 94 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index e873c52a626f..e3a1f5eb2549 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index aab3f2414562..4b564ecaa481 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,5 +1,5 @@
-DIST engrampa-1.24.0.tar.xz 1678920 BLAKE2B c40ba6a77d667f25853f6ae8cef51a54b32402e9446d6712bcfe8b6cfbddcc39e076604fad6ead1717bcedc52716be028ac9bf912c5762fa204e3ee5d6be10bb SHA512 b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce
 DIST engrampa-1.24.1.tar.xz 1680000 BLAKE2B 3059f98e5db99aabe270a89d7edf334ddca8b9cfd963a34f8b7b99356a1b7a9b14c9f641ea6582f893a5f6e4fe46dde00e5375d7b1c71b80299a7f5121839549 SHA512 9d51f24987cecfdd2c560b1ac8f8699bb5ed010bcd5b4a449a1103f725bc63046d0813d28424a3ae7dfcee0568dbf2a282f27ac5512b1c342dafeaec5bcd3b4b
-EBUILD engrampa-1.24.0-r1.ebuild 1731 BLAKE2B c3481a8dd2b5a938a817fb34e0ca33cde7c9401cfa562186e7536efd613d36d50ad1060e9f9d176503c430d12f536e8e8a528c518e67695479c790bebcbb17d8 SHA512 01f928deea86747e76525e07e3a98649abe16a2b15504f21abbc827b9f2baaebc7d42b6e4d3241f9fcf842e6f8fdaa3b4ea19901cca2d2b6faf6b212e0830f30
-EBUILD engrampa-1.24.1.ebuild 1694 BLAKE2B f3f8a974a60ea69cd26acbcdfa59b9714119ba16558250abfedbc09ab7f5055fe6fe1a6960d3e91f33698e142cd668fcadffdc59a42910b18684313663960a4f SHA512 1add3ab73be1f41e9d7be1ef99a8d5c273dc9d3ced0d87a7d9dded59852a37fd750df2c691e707e2ffe08a0a93e2010550b182add36d740d4460173f0a41866f
+DIST engrampa-1.24.2.tar.xz 1687432 BLAKE2B b2ef407aef77f9ecd3f8b06d2e991615a39fa2d4487678292d035a7cab882551bc8c757c6a15037b828cb51aaba14c2ec25e85e891770f6f8c9b453753d87b42 SHA512 1e0acecfe42e3945fe43729283522dfd56dc4cee92a4d5998c995a496f42f41b284ec10f01eb142139c1cec65e3b5a037299b168b73a2e6e828ae3ab4b9c777d
+EBUILD engrampa-1.24.1.ebuild 1692 BLAKE2B 2584960bbad9ba530780d3a7919b27cfc4c801e68fbe922193a2bf878aa8c1dc6dcfa0c4d48689bb2ea6b2addd629a02798bd5929378e05b06408df458b657a2 SHA512 771abb1dd041a396a708b3f1a908228e07367a0141bfb9102da72904dd960ccbd3f3157962dd3d3f5db2392e1a0f7615a8ec23c7122a6839d333b6fcc3c8e82c
+EBUILD engrampa-1.24.2.ebuild 1683 BLAKE2B b4029ba15bf65777b83f5cfba02c5f331ae2914ca9a640255b50349e3bb9a5376837b9530275f44a1a5143f1d8bf8c8ee637f336e11894a2829fb66ce3797c8d SHA512 2df499309ba3c3bbfc464f83026f573b89c14ad76fc4e7886ca19ae52941829e5fdc3710cac9d8043aef2a88ade775a774c85635fde1037dac1b288c061b3810
 MISC metadata.xml 590 BLAKE2B a67378188ec008cbb9e6790dc02a042f0ae46e3f5c1bd2a277923bf3a05682523f884e1d9858f6406430cd54a6c33754a5dd695acb360bc99f7939bd3160e931 SHA512 9c3b2fbe1667d3408600a10b63be3141136acabfe6ed53a637ff5fbeff50a44ca7f0463b48597dc1473eb29ae31e7f222e11cc68432fdc12f34c7bca38bb89d5
diff --git a/app-arch/engrampa/engrampa-1.24.1.ebuild b/app-arch/engrampa/engrampa-1.24.1.ebuild
index 73db09d470f4..cd2d7638007a 100644
--- a/app-arch/engrampa/engrampa-1.24.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate optfeature readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
diff --git a/app-arch/engrampa/engrampa-1.24.0-r1.ebuild b/app-arch/engrampa/engrampa-1.24.2.ebuild
index 97e69c4bfce8..506779c08365 100644
--- a/app-arch/engrampa/engrampa-1.24.0-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MATE_LA_PUNT="yes"
 
-inherit mate optfeature readme.gentoo-r1
+inherit mate readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
@@ -50,10 +50,6 @@ src_configure() {
 		$(use_enable packagekit)
 }
 
-src_install() {
-	mate_src_install
-}
-
 pkg_postinst() {
 	mate_pkg_postinst
 	optfeature "Support for 7-zip"  app-arch/p7zip
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 841403ce695b..63b00489575b 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -1,3 +1,3 @@
 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
-EBUILD lzop-1.04.ebuild 953 BLAKE2B 4a358ec8972a3133b487a8fc5851007741c22ef80c54460a92f8a69ea752980193d6b73d011316c6dc38ecc149c5385b901d9c21127c4b1da1a4b3e22d4ccafe SHA512 c1c84a4bf658ce997484597d7d9384789cf6dd51803a16c2a2f8253dd05c54951141e250dc9b8ec7a8fefc13eeba0bf1ca24c60dd6992061568dcb504962a170
+EBUILD lzop-1.04.ebuild 960 BLAKE2B 6cd33156a80227e0b6854a344dbd0fcd0267af8aed26f1b8ce60d235126b9a3baf11b53444157db054d3380373ca288a740b648b4bdfe74b508cef64201f47bd SHA512 634a4f0a1a20513688b391f51dfb6be72164a4dbc1983471100083be1e49e96b37783f75a1a2fd97865407d5e7a73ac5241b04c4585fc2470290b1e5ea9578a5
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzop/lzop-1.04.ebuild b/app-arch/lzop/lzop-1.04.ebuild
index 9bb120004aee..61d2ad39defc 100644
--- a/app-arch/lzop/lzop-1.04.ebuild
+++ b/app-arch/lzop/lzop-1.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lzop.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/lzo-2"
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index e06692dcb589..e8373f4c99d9 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,3 +1,3 @@
 DIST paxmirabilis-20201030.cpio.gz 171982 BLAKE2B cdda22bf73ff60cda7b8873ed278d1d9d7daab170084ca17760dacffc88b8edd29a0498155f860019b22641d9c84186074c5e696c67846e1997f5883267761b0 SHA512 14c913db49c05b92f3448b7ae2e11b4fdb86c2daa5f269d86e044e8779eec7ea19b41534fbd8ebfe31cffe6b50e51c0460c3994307ba2cfa07029602604882de
 EBUILD pax-20201030.ebuild 894 BLAKE2B 197e13e545e827d119a5f81d577f8922778502523c6aef90ff0b5a8ab73b4695bf8d08247c0ad7306c0ba6ee0c62bdb71b5e5aa952b4d2044dad1882785fc75e SHA512 07c175cec34ce8315e8e770cb57dc572a92a67f1e7383ff9c34b0b074668a8151f27f8b4b87268b0f18d32c14360b68491cb9fcddc42e44ce73dab16b5778fff
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-arch/pax/metadata.xml b/app-arch/pax/metadata.xml
index c5298995d2d4..7a38bb900964 100644
--- a/app-arch/pax/metadata.xml
+++ b/app-arch/pax/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index 13b7703d85e8..6b416c317b20 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 1154 BLAKE2B 3f8c3519bcb40770bfe085434349bdb5d2b0765bcf8258537d2cff8697e853a8b13f17f7a629a256bb3357e2271836d72a109370eaab973ef9d6c9f7cb479ff1 SHA512 80424d1fff60b5ec19f3c86a45bbc793f65ad24285909581b5c3aaba96bf8d63238a71626180fa54500d2d57ad500824919a92632e09bbb1d7a223bc8fc5a31e
+EBUILD pixz-1.0.7.ebuild 1161 BLAKE2B 393cf983613866e107e8741b671f9756aee325827f7b210384873106572a9a400f8e562850ce7090fc2adb53058685050a04e96d8612bace98648ccdaf3cb6ea SHA512 947c7e50f6914ec0fd6bfd0971e5018494fd27fdb11dbe2ca9c6c54bf4714016a5bbeaaf0a44254f9d921cabafa238468c4cc8611e2627a09dcbf7ec271859f3
 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 83c9e097ed89..3be55349c9ab 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -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 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index f8bc85ea2ba2..7ce8c11c5304 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -2,5 +2,5 @@ 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-r2.ebuild 1069 BLAKE2B f61c80d519df1a6eae837be805e91397a6f090cd410573966dd89b046ce4393ea25879821365191090bbe5628a6b761b9329b476a4537683f5b52e8e3de7356a SHA512 8c3ac5cc174e7fc4ef557ba5cf9246889139164de365d0d347bdbadcd67c0a9cbfe492cc09f621b61e5ce9486ac33d690b8e0f7cddd00b8d75b2583e0004a7f1
+EBUILD sharutils-4.15.2-r2.ebuild 1078 BLAKE2B 5e5de6f2c0fcfadb2a8d98f515b5715f1ab27fef9df42f60c516c1b80ac9fecb914d540afd0d2b375d9c9fd749be48ec3f01389a2d3e55f9b13d97ed2e649ac7 SHA512 9adbb1b1b47da119c7aba1d98f45bd80e7e847fddf58b7ba3db875c36af5b2d1096a2406bcf8f570d2e7c84bd8763e8e68e815a2bf3008a36d526e833d922420
 MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94
diff --git a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
index 9f77f1799941..4df30e239428 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic l10n
+inherit flag-o-matic strip-linguas
 
 MY_P="${P/_/-}"
 DESCRIPTION="Tools to deal with shar archives"
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index d7dffd3cf88c..4807f541bf1f 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -5,5 +5,5 @@ DIST upx-3.96-i386_linux.tar.xz 485836 BLAKE2B 1bbcbde3d510eec9a38876958bb127eeb
 DIST upx-3.96-mipsel_linux.tar.xz 483832 BLAKE2B c7f79ecc0e9f0b3f4ae9beaf0dc06e43e4cd747fde5bbd8d24505a008171f55c14ef411927cd112dd7fb170923679266170975e89cbeab43b17d842c20e29ff0 SHA512 252f64bb2d44d687daca645b1e0cd91665a562e86e1ce8fa95b57709134f74810f29f5792f7b8a1fe6c0517728632613a202a209465f1bd56ccbb383d9eea1ae
 DIST upx-3.96-powerpc64le_linux.tar.xz 505260 BLAKE2B 9e92e5e72436a3309c788a96a03c98bfd53bf51d3a22e85c6e58669b8c5536e107949fa860b25e1abc759b229aef76607819e62db353983f6f87f04d59395599 SHA512 8b577444366288427d6b114793b3f8fb42bf223b82bb78a391e5233c3cb3fe6906722ff7430aeaa764ef3feb77f052da469eab9d0dee90182929beefc5b1f17c
 DIST upx-3.96-powerpc_linux.tar.xz 479488 BLAKE2B 2d07dd57b742dd5a3ddcc86298618a939bd46a4af6f9bed41a3e0f12456bffb0ba7d76c866076489cb03130a9b9d84493f5401db5e76571cda4d7e9d65bef691 SHA512 a8f38f2467bc31d8cff2dc0fed191d1451aed766ab49336c7c99fe1b1a48455b08d9d45b14c78d655bc3c811c5fa2466701e1a990a5c954b0ce84499458024cb
-EBUILD upx-bin-3.96.ebuild 1254 BLAKE2B 6db503a0ba0bb34aa73a21ddd2297b88c2a33522b40425f6109ea36e25df754f822d6c37a48c0058f7a471cfa85baada0c9aaf62309596886418c812ec070d78 SHA512 b7d997412e75c06b499060d58658cbd0568be031871b6bd37d29eb8bbf8c3905a6972b47d84bb266f90c479898a61974c03c89cf218f6a82ae684aabe0a19029
+EBUILD upx-bin-3.96.ebuild 1297 BLAKE2B d7b5e92863099b0b34266b9e1b6ca0eb3e9b5d6cc9f774e01330ef229d820eccaa9b1f7212606f2bf23df85456122b4105eb369023955d67732f82f176fe9773 SHA512 b8ed79d48bd3e279c975f616b859bc733c0243e5266990301de28ddf150ff31684ed36ff0cc4190e86f840b7d1410445ef364022c0eb4022bab0ddcec38b2049
 MISC metadata.xml 478 BLAKE2B c0d96932b628c0448fbdc1756445798bb382ea120b499a2bc2c9320b392730835e5bad5785ef719f5a95d381f3768e7bf2d7f4dbce76d8993052ac9a761f422d SHA512 5bd0548fcf13bbd34c5fc97bd139a6b1398bbc99db984cd730188280fc490864cf704858c132e0154b0681eca5a26a93fa0eeb029d5760fcf17d83be2d83d51d
diff --git a/app-arch/upx-bin/upx-bin-3.96.ebuild b/app-arch/upx-bin/upx-bin-3.96.ebuild
index 7caa782afd3c..be332492449e 100644
--- a/app-arch/upx-bin/upx-bin-3.96.ebuild
+++ b/app-arch/upx-bin/upx-bin-3.96.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
@@ -23,6 +23,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 RESTRICT="strip"
 
 RDEPEND="!app-arch/upx"
+BDEPEND="app-arch/xz-utils[extra-filters]"
 
 S="${WORKDIR}"
 
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index ab45fe65b0c7..f01ca0a390f9 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,5 +1,5 @@
 AUX upx-3.96_CVE-2020-24119.patch 1371 BLAKE2B 54209c114c4a8cab51e7e7ec13cfee055a5f940df4dcbe40b7a35664378a20effdbedfef7b34e4a98510272f221540f87bf47bb439db96a68cc19177e6be71ff SHA512 9b887882e7344d77635091cd01d3c7aa9f45156f43896155988e3e1b7726d76642b4bc9b6c2db06af14710aaa9bfda16e97bc0d1127b77190b72e683d394beff
 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-r2.ebuild 914 BLAKE2B a2a5e5979b0ee73b21b456bebee59b8fd8830d4f268d27683584bc66dfa7f4cea3ef5226e2aecd9d4b5d4492918782eba2d524f54142f86a988dac087c331de2 SHA512 6cae7c01fdd6769b099c8ee70cd29609615692be8946ccb93797f48f623e787fe7f858decb8d41ab807fb4334ad14615d2c41d319056612558dca5ad91d4b9ce
+EBUILD upx-3.96-r2.ebuild 950 BLAKE2B 8d82f08655dbebcee420bb234e846a607ba5927eed16cfede97b62a4a34e7d67633e5f4721081709f621d6b1b16a81b3a9677a8d09f3deef8cb2b80a6671f09e SHA512 72816d4a1f956032cde555d93e4dacd18393f808bc1ad662c2f3fb3c43d3354bf11afb719859654ab59dac25e171c31cb6de3a20a91604f8cbadc62809987ccf
 MISC metadata.xml 478 BLAKE2B c0d96932b628c0448fbdc1756445798bb382ea120b499a2bc2c9320b392730835e5bad5785ef719f5a95d381f3768e7bf2d7f4dbce76d8993052ac9a761f422d SHA512 5bd0548fcf13bbd34c5fc97bd139a6b1398bbc99db984cd730188280fc490864cf704858c132e0154b0681eca5a26a93fa0eeb029d5760fcf17d83be2d83d51d
diff --git a/app-arch/upx/upx-3.96-r2.ebuild b/app-arch/upx/upx-3.96-r2.ebuild
index cf9f4c4f87d3..14c355bb6351 100644
--- a/app-arch/upx/upx-3.96-r2.ebuild
+++ b/app-arch/upx/upx-3.96-r2.ebuild
@@ -18,7 +18,9 @@ DEPEND=">=dev-libs/ucl-1.03
 	sys-libs/zlib"
 RDEPEND="${RDEPEND}
 	!app-arch/upx-bin"
-BDEPEND="dev-lang/perl"
+BDEPEND="
+	app-arch/xz-utils[extra-filters]
+	dev-lang/perl"
 
 S="${WORKDIR}/${P}-src"
 
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 464ef2e950ed..ef06d51a74ad 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD xarchiver-0.5.4.17.ebuild 1321 BLAKE2B e73601d3de6623693f48fd5f9066a53ae51d7818c7b8dc14fb5ca4b39fedcc0706299142099fab2fd270237b8bb3e903b88ca044be7d61294195ca6f07705c32 SHA512 be310c9b116415454862cf04d46ffa2f747a0b6dabb7f209d198589e0d190dc8153945c98a545e7bcf67b2b98b595a9655fea42ff29068e336521867a463d076
 MISC metadata.xml 447 BLAKE2B 9427d1c1f2062c7efa986b9182cefd225dac542e30a254b787470a2060fa6c3838dadcde3c3fdc9b10aa99fde66a6928286bdb2ae80437bd5590a8899e3f99fb SHA512 35841081a561194fd9ce87cf0232f727e0a7e86caf3564c6551c412ba397f1b759cba10b977fb4d9148529aaab313275e3e8066bebaa0848bc30e6c466e38a93
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
deleted file mode 100644
index d3030bf6c079..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 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}
-	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_prepare() {
-	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
-	default
-	mkdir m4 || die
-	eautoreconf
-}
-
-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/xarchiver/xarchiver-0.5.4.17.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
index 019605f89c3a..e0200e4bdb6a 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.17.ebuild
@@ -11,7 +11,7 @@ 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"
+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