gentoo resync : 12.03.2021

15 files changed, 91 insertions, 119 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 2c8b1362db95..325d734c98cf 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 0ebc46ea9194..ddb76fe99c70 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,4 +1,4 @@
 AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
-EBUILD alien-8.95-r1.ebuild 757 BLAKE2B 4405c7b813c6dc61473768888c500c7d6044fd119e4703e2d333f399e8fe404d171365e9020095879365ba26e597379ab8fa0ec579417961d0aa11c4d31f2fd5 SHA512 f6fc5b2d718907090c14de20501414f3e3125b9f62779f29190526222be223deed56443bd0c74c1b12cfff058efa22facf45833fff20c85913ec4c5f29d46c56
-MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
+EBUILD alien-8.95-r1.ebuild 774 BLAKE2B 0a1eec09287a4342f563a651221d05e36627c5c939fb0be7adc9c7e1200b9846bfe06fb48dc20b440ca567fdd6bdbc3263acbdbbd6393c055dd4b1f03d4c29aa SHA512 94c28767d2ab22a70eaca9a33c427fbaa2c37d21735b8b18159b0ef55ad9f661cde327456bca856de8647940e8663a2dccd335af946bb11c46c7d13cea5bcf73
+MISC metadata.xml 343 BLAKE2B a42b0c030d801fac5f47af9b5de10b4c2ab4f1f323f1c9b2cfd502830f790812e4385f508e48ff2e5815997e88f9aa5a3ac7e4b026851d116caaa278998c86cc SHA512 b7f3be5797a27652d135e590e22f44e4a004d72fa8166c1e9e6ede4d514a37520a37f68dc1d1a339ce97f900e4d0b81874942b2968f74720bf1a2b148d136d68
diff --git a/app-arch/alien/alien-8.95-r1.ebuild b/app-arch/alien/alien-8.95-r1.ebuild
index 814e3b3ce4d7..fac253c4e118 100644
--- a/app-arch/alien/alien-8.95-r1.ebuild
+++ b/app-arch/alien/alien-8.95-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
@@ -6,7 +6,7 @@ EAPI=6
 inherit perl-module
 
 DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
-HOMEPAGE="http://kitenet.net/programs/alien"
+HOMEPAGE="https://sourceforge.net/projects/alien-pkg-convert"
 SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
diff --git a/app-arch/alien/metadata.xml b/app-arch/alien/metadata.xml
index 294c350c6960..a71d1bc12f7a 100644
--- a/app-arch/alien/metadata.xml
+++ b/app-arch/alien/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-	</maintainer>
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 0b5ae83b56c1..860b8ac3b69a 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -2,5 +2,5 @@ AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78f
 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 2119 BLAKE2B 10345b6fbc51320329ecba9c26333faab979a61e9c204a385cb0d3e209298fa93e687c52f8d11a6ca44dab19253b2b425c43d60d5596f14132015cfd32f293f1 SHA512 b93f320df766fafef3deadfffdac670ba8df2088417a5b8740578b16be2e060129872dd84824d3283689397f1aded23fa2631c27105064d0fd63cd85f3d3e50f
+EBUILD file-roller-3.38.0.ebuild 2118 BLAKE2B 07c23acfdbd21a77bacc13e757bfb80ab5c45057dde0d8de5c3659e6fe87d69ab6bac8973d7705f450e3c74b8df2082ba430ec0fd6b8d0270583c5ad6665fb22 SHA512 0ddb5b99f62bcead75cd0e2c9c4bb0efff6bbaa4d33c2299e0e7dd7055a1294ad30e9ba2704b5c6cb7686975e694b7c03d66ea6b34be3114419e1d9b32bbc1c4
 MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf
diff --git a/app-arch/file-roller/file-roller-3.38.0.ebuild b/app-arch/file-roller/file-roller-3.38.0.ebuild
index aee9ff433eab..1e54bed626cc 100644
--- a/app-arch/file-roller/file-roller-3.38.0.ebuild
+++ b/app-arch/file-roller/file-roller-3.38.0.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 @@ 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"
+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
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index f361be962f90..d77d721af862 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -1,7 +1,7 @@
 AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b79906decefde76d3245e21cb711587b37750146a9a5db0221d37e7aea9259dc1ab85932463b8e94dc23e18ec7c4ac SHA512 eec9086ad4ed4a148540ef1729fc3be4e4763950a35e3f2eec981451353f9ab0358aaa754ae4675ba22d057a97f17c2478fae06c173a38e423e32338f1cf5784
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
 DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
-DIST lrzip-0.640.tar.gz 262860 BLAKE2B 21e7e6f566ae238c85e89382a000b210621773b00cb2c509dc2e1b89dfa591a1cca954c0105ef624ed97af43f8904d67d570a0e3734dda7823f809a496cff5aa SHA512 efcf7d5cbb7c2a2a117ec815f87edf37e5500f2294a16aaa16cfe10b3db77e3cc2eb4118def4936da03323ca3ee961000e98f49ca0c18eec6ba935eac412cc8b
+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.640.ebuild 1113 BLAKE2B 4b5324400567699433108c4032a1d43b2212f5b36e324bb7f4404f36c5bb0ab65a8578b55ad6fbcb5a16134bccfda2d05a3371f0cc7b3f135703f47e2c75b6ba SHA512 9e4edd36636df3cb03ae32ac9cc88efb4ce2b99f0ed974059dee79c7e8e0e4474f696cddd2cb6f9452b3b3d3b7b09b90fab3ad4cbf7b83b48d15e9fd526b460e
+EBUILD lrzip-0.641.ebuild 1113 BLAKE2B 4b5324400567699433108c4032a1d43b2212f5b36e324bb7f4404f36c5bb0ab65a8578b55ad6fbcb5a16134bccfda2d05a3371f0cc7b3f135703f47e2c75b6ba SHA512 9e4edd36636df3cb03ae32ac9cc88efb4ce2b99f0ed974059dee79c7e8e0e4474f696cddd2cb6f9452b3b3d3b7b09b90fab3ad4cbf7b83b48d15e9fd526b460e
 MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/lrzip-0.640.ebuild b/app-arch/lrzip/lrzip-0.641.ebuild
index a5c7f90aa0c6..a5c7f90aa0c6 100644
--- a/app-arch/lrzip/lrzip-0.640.ebuild
+++ b/app-arch/lrzip/lrzip-0.641.ebuild
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index 2f9c9d1171fc..f878c91de566 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 1018 BLAKE2B 62862764dc66afc8f40877a135f69de5646452f8ab317e4ed090689858c540015a917f1746fb4fb98a85387d2eff3e74b07892e088417a86a1eccd6cc3c6622a SHA512 3a1fd36a6d5fdb5026b6c85bd72d868fb4a2644e833a84a0c475d50efa9b5091ba715fb9e15171b89615f980cf39de25030ec48a1f7f18425702d885f32d36eb
+EBUILD lzma-19.00.ebuild 1016 BLAKE2B f7a8bbf8cd6ad30b7293542bfe71f432058246b71f35f2a1821bd5e02b26d922a3ca65badc629410a6f69541a4edbaa1c41b0e2435242bf743dfb3deb0b93afd SHA512 98dd034ee65a39f9085d7829ce141d4c36d39b8cd5a42a83706c8296fe29784974f1f14387da24fd1127ff9bea3a480406c9552715ca499b374cd0f2d198f118
 EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 768a2f1db8ffa970a91e108e9666a1ce3fb2d7061bd8f79c678333ee2c7f864391e0d605d4255bf73934288f3b2afbd84bb0ae4385a49b3cb763851602a6fb08 SHA512 c472806e0b31156679c40ef8ae60e6a6b4b079e49c721a8879683b5991dfae9630550663c983289bf3533dc5eda47eb6eae92c0b5830dd84c545ba0d073afdac
 MISC metadata.xml 444 BLAKE2B aec04279877865b9a1cea3f7feb010894c28ac21f120a9d90749a9a625b9fb8b8ef70b141031cd85e10d648deb217dbfb808b8a14566b4c130ae9623a80e919a SHA512 81f32c3de736c2adc84c87340765e18e12a7a3868b135a4e585fe91f646767698208c18aebfc6a772eace180cbbb65ada2dcc8b88ba603cdc3337077dcdf6029
diff --git a/app-arch/lzma/lzma-19.00.ebuild b/app-arch/lzma/lzma-19.00.ebuild
index 96ca5df0f656..5059cbe5ea03 100644
--- a/app-arch/lzma/lzma-19.00.ebuild
+++ b/app-arch/lzma/lzma-19.00.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
@@ -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/pax/Manifest b/app-arch/pax/Manifest
index ae38287f29f4..e06692dcb589 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1,6 +1,3 @@
-AUX pax-20160306-glibc-to-linux.patch 852 BLAKE2B ebca2d148954e511d3a4f79ef96cadad0eb93c35e9959a2fe6833c8371aa8c2d20f2a471ef3e8e19efbebd2f15ae1ff66ab976191166603998cf4b4ccbc705ce SHA512 f6ee4abbc2f9a422a735fc6a09098a6bec9b855211bcdce088cc7362cb88def65ec574d91ad7cc48ee055e0438d481ed1e4b6ff650419ce3c7c09449ab82b69a
-DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
 DIST paxmirabilis-20201030.cpio.gz 171982 BLAKE2B cdda22bf73ff60cda7b8873ed278d1d9d7daab170084ca17760dacffc88b8edd29a0498155f860019b22641d9c84186074c5e696c67846e1997f5883267761b0 SHA512 14c913db49c05b92f3448b7ae2e11b4fdb86c2daa5f269d86e044e8779eec7ea19b41534fbd8ebfe31cffe6b50e51c0460c3994307ba2cfa07029602604882de
-EBUILD pax-20161104.ebuild 1457 BLAKE2B e35c5025b585d700f6770f7ebbefa27473b819cd35bdc2631ac5351d62011c60b27ea6856dd13a83cb592b7cb6a8c86f411b369d499f234b48492c9af2c12575 SHA512 68867a75d0108f3528750275179cf4e1ac2ff5243aa56270fbfd5ec9651e7a96fb10d881171f4272588d619bb86b09449e4d24ad913852ec34d515d7189cf7f5
 EBUILD pax-20201030.ebuild 894 BLAKE2B 197e13e545e827d119a5f81d577f8922778502523c6aef90ff0b5a8ab73b4695bf8d08247c0ad7306c0ba6ee0c62bdb71b5e5aa952b4d2044dad1882785fc75e SHA512 07c175cec34ce8315e8e770cb57dc572a92a67f1e7383ff9c34b0b074668a8151f27f8b4b87268b0f18d32c14360b68491cb9fcddc42e44ce73dab16b5778fff
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
deleted file mode 100644
index eec6624eedc2..000000000000
--- a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/cache.c
-+++ b/cache.c
-@@ -195,7 +195,7 @@
- 	 * No entry for this uid, we will add it
- 	 */
- 	if (!pwopn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- 		setpwent();
- #elif !defined(__INTERIX)
- 		setpassent(1);
-@@ -265,7 +265,7 @@
- 	 * No entry for this gid, we will add it
- 	 */
- 	if (!gropn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- 		setgrent();
- #elif !defined(__INTERIX) && !defined(__CYGWIN__)
- 		setgroupent(1);
-@@ -336,7 +336,7 @@
- 	}
- 
- 	if (!pwopn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- 		setpwent();
- #elif !defined(__INTERIX)
- 		setpassent(1);
-@@ -403,7 +403,7 @@
- 	}
- 
- 	if (!gropn) {
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__linux__)
- 		setgrent();
- #elif !defined(__INTERIX) && !defined(__CYGWIN__)
- 		setgroupent(1);
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
deleted file mode 100644
index 3ce22473dcb5..000000000000
--- a/app-arch/pax/pax-20161104.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit unpacker toolchain-funcs flag-o-matic
-
-DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
-HOMEPAGE="https://www.mirbsd.org/pax.htm"
-SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	dev-libs/libbsd
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="
-	${RDEPEND}
-	$(unpacker_src_uri_depends)
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-20160306-glibc-to-linux.patch"
-)
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Newer C libraries omit this include from sys/types.h.
-	sed -i '1i#include <sys/sysmacros.h>' extern.h || die
-	default
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	use elibc_musl && append-cflags "-lfts"
-
-	# We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support.
-	set -- \
-		${CC} ${CPPFLAGS} ${CFLAGS} \
-		-DPAX_SAFE_PATH=\"/bin:/usr/bin\" \
-		-DHAVE_STRLCPY -DHAVE_VIS -DHAVE_STRMODE \
-		-DLONG_OFF_T -DHAVE_LINKAT \
-		$(${PKG_CONFIG} --cflags libbsd-overlay) \
-		-Wall ${LDFLAGS} *.c -o ${PN} \
-		$(${PKG_CONFIG} --libs libbsd-overlay)
-	echo "$@"
-	"$@" || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-
-	dosym pax /usr/bin/paxcpio
-	newman cpio.1 paxcpio.1
-
-	dosym pax /usr/bin/paxtar
-	newman tar.1 paxtar.1
-}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 8ffeeb90d186..e77d25d41cc1 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,5 +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
diff --git a/app-arch/unrar/unrar-6.0.4.ebuild b/app-arch/unrar/unrar-6.0.4.ebuild
new file mode 100644
index 000000000000..4715611272fb
--- /dev/null
+++ b/app-arch/unrar/unrar-6.0.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S="${WORKDIR}/unrar"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}