gentoo resync : 18.11.2019

26 files changed, 92 insertions, 151 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 4ccb73cedbe7..cb981f698cca 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/atool/Manifest b/app-arch/atool/Manifest
index 8c7f7a55e4c9..e8e9f02cb1e3 100644
--- a/app-arch/atool/Manifest
+++ b/app-arch/atool/Manifest
@@ -1,4 +1,3 @@
 DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
 EBUILD atool-0.39.0-r1.ebuild 397 BLAKE2B 2f135263b9377ca21f8405695607667edcc7973155bf7417a1a389590b6e0259d40b3e664ece0fb3329cd83b06183bef09e0e0a6cc4eb4cfb99aa037b09865ff SHA512 4fedacf094bd90bb79cc0731eac449867fa6c59a8fdf6e7f42d15937a508136b1d1411f9a2508087fb9955f586616d4cb79a4c4ecd7c146639c55e07e294bf91
-EBUILD atool-0.39.0.ebuild 409 BLAKE2B e6d40c0322d1e7819fcbf9a4f0873306a97d07edbd6f00bbfb3b0fd107ffdda62d5fcf23069e73b93da7508dbd9db9ffa416aa40060bf13749fba7de79fa022c SHA512 ecf7cc68e9c5f3946b7e456c3223827f50a65c4ce4782e06bab6e0a8f28c9ad3bb88aeca4d1c2aecb8cf1fd2afe749f1991a45605172f501e71b24fea59917e3
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/atool/atool-0.39.0.ebuild b/app-arch/atool/atool-0.39.0.ebuild
deleted file mode 100644
index a6badc7cca4b..000000000000
--- a/app-arch/atool/atool-0.39.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="a script for managing file archives of various types"
-HOMEPAGE="https://www.nongnu.org/atool/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!app-text/adiff"
diff --git a/app-arch/atool/metadata.xml b/app-arch/atool/metadata.xml
index 78e64a5cf1ad..6f49eba8f496 100644
--- a/app-arch/atool/metadata.xml
+++ b/app-arch/atool/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 2d6247df9819..9d2c5cf1c376 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -3,5 +3,5 @@ AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11
 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 837 BLAKE2B 70ea1ca2821538eef1d18bafffbade45ed9a93f6eec98a637e3fdf4d74bfb2f24bf50ef1e53160f5c03ad155875dbb0c4c3ddbb69fb7d4fd9a3f7e27e6b2c875 SHA512 fa86a064698a57a600cf60856e3690059006e96c45632a9910c025223e8bab2b4ead4031458374a8f9ed0ee2ef587e4de84f8e4fe2c175ba17bdb15049297c5c
-EBUILD cpio-2.13.ebuild 793 BLAKE2B 82b1c95ce460bf36f99b70e8171189dcb383085fecc36996659d1a962a58b0e5fde79989449315023e181699cdb6c9b82c606dfb185cc6760d64009b39876b6e SHA512 7dbcb73fbb31a1b2e18ca08079b33c503533cad5a4033608a646e2da26dd3a6673677dedd60ea1bc57081d350d0504f210ddd98e0b8b6ce7bd48fbb4ec485e3b
+EBUILD cpio-2.13.ebuild 792 BLAKE2B f137dc225e1a4ad4efcdc8b515f0352c97648984c6492d2c62ccf8802e8bad94fc090696f26103bd82bedd26a1084f5a0b062a5f2ce5ca0a4421bb69df7ce6dc SHA512 5558aada96cb7c975e0739150341376ec036d6416b13d820875ca13c6c9bf641bd19d4e1c23cb01d7d9d5a572cabfc48420adcd8813e2f4ba1742527eefd9bd2
 MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
index d953e62ac0b1..30557dbd0433 100644
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ b/app-arch/cpio/cpio-2.13.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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 PATCHES=(
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index e3c67e1a6f34..8a5b11d26755 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,7 +1,5 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 AUX lha-114i-fix-getopt_long-declaration.patch 263 BLAKE2B d5b53f0624a9b039167289f32369ba2b2905e8a223201404ba8d9a63d1a2fd9cb73f7e5d40fc2a14bcb510a4e49905545947bb21cfd38871e80c92591ba0007b SHA512 0216d24e001b7dc0db179d8e809fa838fd1d1d965e7d3f4ead79b9b276c39ee2666d6268fd835f9ce35664452d662aaadeeab00cb121f3485765db4c6be9d145
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
-EBUILD lha-114i-r7.ebuild 969 BLAKE2B cce714e5920a9d180578fa69914b319ab316f98cbca1c62530d806339a5cad4a195a1b9abd239a2169a1c704905d9025eb17031e5cedf554a0ff4a30497c63be SHA512 4b780963a85cd2edd4d9bf186282aefee42c1f975ccb1c5887ad1a7c004f7eb46ef9fddbd289f959639ca0dc5962798c7bfb9a269c3b46fd6b64a57fb7e37a8d
-EBUILD lha-114i-r8.ebuild 1125 BLAKE2B b46fd93323dbbc981dc9ac6ee4871c1754474b436ec6ad14aca5e1001d0f4b881e3046c52f182e3b3616ed5436ca987a51594587d248adf63a4836408d53a05c SHA512 a5373c91988716b09053285c1df68df582d554e0dc8524f0c8e8cb4ebe7f75afa9df7f4e0d2f58b09c0fb12b42ea71a2c4d2b7558736608ac3f86ed9fdacac06
-EBUILD lha-114i-r9.ebuild 1123 BLAKE2B a5cf91cc14d5900823203b1f6cf12c4830bab5baa573488ab8e7561df3c3473c3515bcb0f89c26b96998ba7df30f6e0839e00a586804131d3b531431a8462a32 SHA512 c76ceab5bac6e63ac6574702dd6801a339b365de7c9a43e1d0309ca61b4ff92e40ab147e737fa3cb6ca13d29de0207900c7017bf4e5549cf04d1a65c66a8feb9
+EBUILD lha-114i-r9.ebuild 1111 BLAKE2B d9468c381e81f6ad2b43921ebb14d4c8a936817b151c3e9a6146285cdb03be18c44d7009564eaf1e5eabe34f58162f2a64cd5519781b81f114947feea621aad2 SHA512 16419845140e3406a06a67c79040676ca7737ad356ecdeb730400fef31631d8063c16aca459355adb4f5b9947a3d54d2ffdff5aefbed2e9dac5fe648d89928b3
 MISC metadata.xml 534 BLAKE2B 861f00b0b2b6c547ba122d9dbc9da0d9b84bd49b553a2c8f2d2fa5dd7ef7dcd86caca75292a825dccb74becd7ad8c34a4f9cbe71cd5096ba7617953c4f612c7c SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f
diff --git a/app-arch/lha/lha-114i-r7.ebuild b/app-arch/lha/lha-114i-r7.ebuild
deleted file mode 100644
index dcf54bbf5ae1..000000000000
--- a/app-arch/lha/lha-114i-r7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-MY_P=${PN}-1.14i-ac20050924p1
-
-DESCRIPTION="Utility for creating and opening lzh archives"
-HOMEPAGE="http://lha.sourceforge.jp"
-SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
-
-LICENSE="lha"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-file-list-from-stdin.patch
-
-	sed -i -e '/^AM_C_PROTOTYPES/d' configure.ac || die #423125
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DPROTOTYPES #423125
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		export ac_cv_header_inttypes_h=no
-		export ac_cv_func_iconv=no
-	fi
-
-	econf
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		mandir="${EPREFIX}"/usr/share/man/ja \
-		install
-
-	dodoc ChangeLog Hacking_of_LHa
-}
diff --git a/app-arch/lha/lha-114i-r8.ebuild b/app-arch/lha/lha-114i-r8.ebuild
deleted file mode 100644
index b9e27d7fb4fb..000000000000
--- a/app-arch/lha/lha-114i-r8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-MY_P=${PN}-1.14i-ac20050924p1
-
-DESCRIPTION="Utility for creating and opening lzh archives"
-HOMEPAGE="http://lha.sourceforge.jp"
-SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
-LICENSE="lha"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-file-list-from-stdin.patch
-	"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed -e '/^AM_C_PROTOTYPES/d' \
-		-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		-i configure.ac || die #423125, 467544
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DPROTOTYPES #423125
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		export ac_cv_header_inttypes_h=no
-		export ac_cv_func_iconv=no
-	fi
-
-	econf
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		mandir="${EPREFIX}"/usr/share/man/ja \
-		install
-
-	dodoc ChangeLog Hacking_of_LHa
-}
diff --git a/app-arch/lha/lha-114i-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
index 4c171bb8e04d..b7fba3466366 100644
--- a/app-arch/lha/lha-114i-r9.ebuild
+++ b/app-arch/lha/lha-114i-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 1ae1fd4afbe3..1f6678ec0c07 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -3,5 +3,5 @@ AUX libarchive-3.4.0-without_zlib_build_fix.patch 4850 BLAKE2B 2f4a670afa2ca1ec2
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
 DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
 EBUILD libarchive-3.3.3.ebuild 3603 BLAKE2B 01906589b7af8002258dd85ea51c46588b3c070d20d1480a5b892224c97b428ccd89c0690da086ab0adb30d0da134fed23912a2b83da28cb99c9a1c09e79ad68 SHA512 4393279fb4a17caede13888365798253954a0275812a444586d06ca34ea640321e6d3df06a0e0f4d27f6ee8bde5be6be15c719a1e0a931a122bc868dd9b338c5
-EBUILD libarchive-3.4.0.ebuild 3747 BLAKE2B 8b0a2f7fca65d271da0f716882f6a6255aa180e6b30d4f22085cb5a30af7117b12175a86bc09ac3657cfa2da4e0b73acccbf93c7d35929e02c37b69e3e1dda66 SHA512 2baad3197dc23df2e80bc95f9b3bed0a7d04a7e4f57e67975bec7d1da5b74c22d36dc2694b1978efafb073ca778bc62508b1009ac0ddc818b67dd76615fa2af5
+EBUILD libarchive-3.4.0.ebuild 3743 BLAKE2B ad53026271c50eb521b135a54a16645e9e58b594f94af7c10818379b16a141df9babcc410c0082dcc08a5d0d5bb0d8bbe2b8bcc4281d91faecdbc8b3a0f4b3f7 SHA512 8b19c6166dfe2b8b921396bcd771ff53fa2e58cedab0b77182c76b7a5bd97cf6a4374fb3cd184eaddd23b4858ec531af3545f150049463142484dd5b7aea5338
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.4.0.ebuild b/app-arch/libarchive/libarchive-3.4.0.ebuild
index 3a7e173da1b5..0c7029be909e 100644
--- a/app-arch/libarchive/libarchive-3.4.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.0.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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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/libpar2/Manifest b/app-arch/libpar2/Manifest
index 4e86ecc99a5a..697036c207c9 100644
--- a/app-arch/libpar2/Manifest
+++ b/app-arch/libpar2/Manifest
@@ -1,3 +1,3 @@
 DIST libpar2-0.4.tar.gz 516613 BLAKE2B d5102ca9b9a25c77bc63524c04b0cb25ad3dd44e63dc0fd92ac7744d00b0044b79df4737428350ff2ea4f65acb212bac8f983d299bb5a934fc7f916994b61a98 SHA512 36d6f91bb3ea94dca1c4c45be41d37662a928bed39edace1a38ae0ad167804308d252a9fe49c2babb194b297fa4671654532add3758b7d7d528161cdceb278e6
 EBUILD libpar2-0.4.ebuild 673 BLAKE2B 2c57135fe1ccb2d1668b4c502c853c01f07cecd7821b11df2839eabe652ae1235306d711f03c52aa4491e7ad94afa6aade5e0ab22334ab154a479b478214e52a SHA512 756949f83e667ca42be78185128ceb7183c9dd1010f1efc37d7faccdfac9872acfbcff1bf606e0aa80d319a66dc725734dfbe78371e515f1117fe89455fd741b
-MISC metadata.xml 331 BLAKE2B 0a33f3aec55ef11330ecae9aa5e55fca141fe1cd07f100f846be7d8b6ff29da81caae4df35e9ae995683633b5de8c225628d084958a799ff6cefe62d0a790a59 SHA512 4f615121ef89e72ea1c0a9a38e197ffef0edcd9603ec716e56c933acb24e5958f574a911319d389d94b4faba8fb4815aae7dbe46979f9d922cb71e2352162191
+MISC metadata.xml 247 BLAKE2B f36ba7172ecfbb46f1f1a1f6c6015e300c067f625c1b0592ccc92d7337d8d4776448ae2cb804d418d1b06386ac73783ec50ef3270073515183404d3da22112c7 SHA512 e2f319264d0fe33bad3c55c2acb1173279825f3f03bb37b605fba2aed087fe288edce6f6eff7562349123a9a4c6d319961c702c708f2f35a1f3f0342301d6cae
diff --git a/app-arch/libpar2/metadata.xml b/app-arch/libpar2/metadata.xml
index 1cb3032538b0..679fb9b86733 100644
--- a/app-arch/libpar2/metadata.xml
+++ b/app-arch/libpar2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="launchpad">libpar2</remote-id>
   </upstream>
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index d469cdcc1d22..967cd250d3e7 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -5,5 +5,5 @@ DIST lrzip-0.631.tar.bz2 522158 BLAKE2B d0ffe63e1bdd21304d6d7a7dc969d4e79770fed1
 DIST lrzip-0.631_p20190619.tar.gz 259195 BLAKE2B d0bedfe02485011e48fa07240b1eef68560d8d61f5d28dae25bd9fcb1c41c1b8bc1b552acb06a49d853b70a0912371cec9caebb2bf7905ef528c2408d2153297 SHA512 f366c31c84a52f6ccfba56e8b11c0bcd270482d9d120e07783fbe310d7a62dddfa60ecd310a7630e7c98cfb961f57fc9e6b843d3857d0c90d36c580074528298
 EBUILD lrzip-0.621.ebuild 745 BLAKE2B 12ef6b7b498e7978b590dab5ea4842bb2378235a0b2348eeed8645d12d4ed4db1b4d717f801d87f15028ef0c9e32cd9d0b72e666f4c56dc57247573ed6d734e2 SHA512 65d3dcaca49a97b840f271ab93b1ab0ff9a64dcce99907f6d6bda28c6db0e9a467c00a0731bc0462d7cee4ce1a045bcdb2ea01ec05b2ab9803ab35c183cc7bff
 EBUILD lrzip-0.631-r1.ebuild 993 BLAKE2B 0921eb7f050fb6e8b36c969b88cea2a25224c03297c43dd560c39d2b85e5fc9167c628d4082016f95241c813d99c18c25ad3fc0493915a08570e9641b8427ba6 SHA512 ceff4787d87829524566ca225564fdb7ff573efd797b88d9bc482b8413d6276dfaf18262dffa5698d6562d266fee817d076ff75289b86c6fcb194b4b8455ea37
-EBUILD lrzip-0.631_p20190619.ebuild 1177 BLAKE2B 8d6be7bfe92b2f706ffe259ed9a01f027fb499c9da0bd5e01fb5cd7ad9a744ce3aaad51cea4847941dc10c5d72805cc6811f5ae0246832b3381bc816b7ba72a9 SHA512 55f5caf84c1f1f7b5a0bf5a18bc1619fe135c8bd9486da8458d3f67706b56a11bff8a3ec26b4f73859b43f6d23b80419577fb6c958d2e4dc82cc9facb90d7683
+EBUILD lrzip-0.631_p20190619.ebuild 1175 BLAKE2B 6e5b73b7f65bfe3ed7b905d39c46463c75b794461cb7fc651287a069b31f1b99a3544bf0d9fd96fb871f737e5673fa148a27dd82bab5043ab2e11e5c0bccbc20 SHA512 a554850ce0dfebb661aae18d76d74d24c611c1d0e7382b675e3b3fe5e42d4c9e7aeab4aebaddd9333cb200525c4f72ef17b6307b09b3d21f3a5c7743abe24624
 MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild b/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
index 7c166baf6b8a..6280be25f105 100644
--- a/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
+++ b/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/${MY_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/lzo
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index ed5689ad5194..226560973733 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,5 +1,5 @@
 DIST ncompress-4.2.4.4.tar.gz 32571 BLAKE2B 6b404b350e46635856f7329a1e5eefcf38ce1f16137c35ca2226ab8add12ff4d94a289642b0a3f2ff59cc584c2f54bc330756df63f41fd34c958eb173b8eccba SHA512 abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be
 DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3
 EBUILD ncompress-4.2.4.4.ebuild 717 BLAKE2B e7674f1828c2887ebbd0e19df0511055f318eda353a379d7d5e695c9e54b88024cd1e7a1edc20dcfa5d6f3473622d446fde1680901e732d27b799d2e72a8de13 SHA512 b7190ac40d5e63ee28697cc49f9678195e189efc1f23fefe088230b82b314bfba274dea7fe2149b84f87fedf7f04e38676f1f9293690e358682fbc002227201d
-EBUILD ncompress-4.2.4.5.ebuild 724 BLAKE2B 190a5b57b092f2199c1bfe5cd813d5e5098cf00f567f7a116027009f0f20021f9e27d081cf5226d8f27e44e398f6420d323f6339e23fb1b741d99133704a2010 SHA512 d08ef2165cbf1ad31d98614eb81bd6b3ce3956c6084af6e9876a9a39c236ca96cddc8d83e3af40063f18dc72fef09a73cc51d80721fc0c56d3abf5d261b13648
+EBUILD ncompress-4.2.4.5.ebuild 716 BLAKE2B 1e180fd841b7ff5bbe2bdd0cc9b08c126a090e584dee5589500922927a89f069c389187c93cfff1ce7314574a6a4cf23a3abe834c2dd28443ab59bb9d900278f SHA512 7d97921fe9a236b43814f413fa503169f8c5cede193bd26ffdf5f785aa14223177493b956a26f8deb268bba47392f64e2afa0d889e3bfffec82725428d7306b6
 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 de976b6d53b8..6019ac2140b8 100644
--- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.5.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_compile() {
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index b68caf9eb0ed..b385342985ae 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -4,4 +4,4 @@ DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276
 EBUILD par2cmdline-0.7.3.ebuild 782 BLAKE2B e47827829b2b16d5c92913d1408fba4732a398e34fe5e6eb2735a9254919a3de757568ca02af751e17bab4b23eb4e3bb984169da9d96eee84be0d7b57f3d7e67 SHA512 ab03cd0dbac07acbdb43e2a0d681c6e73469ea137ff9bf1f9340f3c85d1823a3ad3e15312682bde3cec2f5f4eadb1605e1a91544e69c809d6f46814d3a4731e6
 EBUILD par2cmdline-0.7.4.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
 EBUILD par2cmdline-0.8.0.ebuild 785 BLAKE2B 92834207bde26e84c76a7c15a880d6fbf65e7625f45d67ab5dc36e4a6061caa2dc06fc4541a000ba23e4fcce9b10ae7343e8e1d8d029a7a6f96abd3ddb893694 SHA512 7322846cdb5868f49a37de0c117466cc38497cf7e130112fc8a28dce8e6450798148179b55c5755a2542aa66674b38c2edbb893d15b8417ebe5c0474520232e8
-MISC metadata.xml 425 BLAKE2B f0f51687772e2555fb17f45d60b41cf8350fb6598c35c544ee9e110e8dcfdf89288fb3fd506080f678a25d98e7dc1e8fdc891efbc81a5bad1ee8bdc89466e233 SHA512 9813ec014f97b8c9ead9021596d60d724e5f4427ed266ab430535b172cc50636d623d44648af1d05c532b38299aab49de91d03c6658a937ed724b161f629da8f
+MISC metadata.xml 312 BLAKE2B 866807207b8dcb08229ab359bf221a77d9ea691eadf983bb99c2852b1b56fb43eac8a34eaa5776e96debc394f8eaa99ac6d215a730def6d2a5d1f672c74e7237 SHA512 575b9efb72218bc82100ef9d466711207c1e24b6ca81f9d31414cb90456d5161b0ffcefbbef16371f3095968463e0fe6528879d1f782b6c7336d16e29d1f9e77
diff --git a/app-arch/par2cmdline/metadata.xml b/app-arch/par2cmdline/metadata.xml
index 39157a67ffd1..09a2860b01fe 100644
--- a/app-arch/par2cmdline/metadata.xml
+++ b/app-arch/par2cmdline/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="person">
     <email>swegener@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">Parchive/par2cmdline</remote-id>
   </upstream>
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 1256deb6abfc..745ed8437bb1 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
 EBUILD pigz-2.4.ebuild 960 BLAKE2B 9e3186757ee7fbde628e318a721dda2388242db71755ee9852f3c1d5cb5755e7ae2154e70a0fa6446c76cadd637dfdbc02b7311dea860f203b90749620f9d08f SHA512 a6c4239dce45de1f74acff365def819c3537dba716e4fd76be1d08ddf8cbf9717d9d9d37c2cb8a778dfcaaa76c98bbd9e3c6c2896e0e12515f8624e741ba2c4c
-MISC metadata.xml 577 BLAKE2B 00e7995f3a4724227abc66b81ff56b83dd41b3ed173e80267b6d739f7db140f19b31c81420177e430ded0f9f38cf8c7cc527bf092d438ce5cb3ab867da1b6695 SHA512 5f825b9a9b0570d7687f2296e36f8dae325755e2d5895701cf621f2c01ec8db892932811f4b151231dab547380d96d234f715537a911887ce9bf144b7cf54532
+MISC metadata.xml 498 BLAKE2B 62b7fd9b866476001b4b80641fc27d0fe9eb3ed850a45a8f5a16c30d331152ea88613befe155e9287350ed1670d7d01956e012fd501d8d73ffe58580de43e428 SHA512 23391f9aa3e4fc611e28210e725d9a83be068f006e1f7d9efad6eb5105d13cb2f91711627490a78e1b163f3a36850f799bc7350fb00f347c8e898e1a957712b5
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 09caf7efa571..646d5eede948 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		A parallel implementation of gzip for modern
 		multi-processor, multi-core machines.
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index c15b986c3d44..d55d0213bb2a 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -4,8 +4,10 @@ DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e
 DIST unrar-5.8.1.tar.gz 228917 BLAKE2B 4b34fd35a371ea2784af0968a95270b04afbefd4968c74c44e88d7b79598fe05b01c331ce730cbfd2535d5a713049e7f4dfbd38d28266e957ae9995cf8ce54b3 SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612
 DIST unrar-5.8.2.tar.gz 229116 BLAKE2B 88bcc90e36d231dd35b066495967a116571ce25b6cc6ee73e84ded5a56fd74662e0c9da10a7e7025d2cecbdd1e47d84f303207b6a466c1488168f523e7fb23fd SHA512 09f12f141925aa99d74d4a0a0f3bacdd5b53d174473346de317cf95c1f560ef4bad445f14d81d313f8a34e8400df6a76709d068b9cd23433d1f638935185ab0d
 DIST unrar-5.8.3.tar.gz 229162 BLAKE2B 1515af301fdcbbe02d1ebf487b1a0ab7849919e0065f223ec78e69cf5fb9436778f184c9cdead927c37d41ddf779bc7c539259cc60b1e9db19225762af17ed27 SHA512 32ab5cd9135d968f2e908975e72e716f5aa8911ee53fbcade6cf9783eb22330dc0114baf5db148c223015498d28fa4c60446e0ccd8108856c6d089117a147669
+DIST unrar-5.8.4.tar.gz 229618 BLAKE2B 3b163a7d3a13dd5864ae729eef6c6bc171e45b0db4e716660b24a14ecf035572fdd1dc44a9c59d07d9fde87255b941f45d5b2e0aeffac3a53b021dc1cbd4b0f1 SHA512 dd3502662b443f05c7bd01a50806b9e3443f9bbba7d88ee8fe9ca0d671d93b0db8956b822ec25b9d827941313ef2ec5608f15934bab91cecbab1ccea9ae8129e
 EBUILD unrar-5.7.5.ebuild 1860 BLAKE2B 4f15915fc48ee749a8c2b488fac6377446007354b1f5cf32c3ef277c8ad7618520bb49c266da733a850262bab18ccb98eadf4f3718808021a44682eb6775b996 SHA512 8a369ec848020f91ff1bd6f11a01b4d0970620f7927ad85b17140d2c30a4e656d0d1967ed7eca56071e109911d3ef1c438cce0dacbce64fcd3da2edcad76cc45
 EBUILD unrar-5.8.1.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
 EBUILD unrar-5.8.2.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
 EBUILD unrar-5.8.3.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
+EBUILD unrar-5.8.4.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.8.4.ebuild b/app-arch/unrar/unrar-5.8.4.ebuild
new file mode 100644
index 000000000000..7fce116316f4
--- /dev/null
+++ b/app-arch/unrar/unrar-5.8.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 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/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S="${WORKDIR}/unrar"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-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}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 866ff7860d5d..236ac9efc8a9 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,5 +5,5 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 EBUILD unzip-6.0_p21-r2.ebuild 2571 BLAKE2B a10a7394f991d18575d2d801eca38d9661a38b9e54646eb8aec7e529fdd7a7d42ff240601b4a39eb09af9ca8dced1492dcc7309a052050bda2dc2f5d616f4dfc SHA512 4d0573f3b198a40107186da5ef5091b3c4b330aaabea49a6b2a8567f8cf0d079949f9ac8c884335824e0979f18277dd398d2cf310e0c80723cf9238a0e521d8d
-EBUILD unzip-6.0_p25.ebuild 2579 BLAKE2B c77fe7821110239ec01175c45e80e066811f145b31b7b81e4c58ce6b5b820a347a1a62896f28437a8d7b9cb345496569d49499f80610876141b555e0ee918916 SHA512 c622d7595ae4b343a760b28ad621ab4a73712e84c532623cc961f35adbdc2461293a595a40a0112a58573aa5b4b2a1ee27fc43e737b6ea63162fa4cf540557e1
+EBUILD unzip-6.0_p25.ebuild 2577 BLAKE2B ba24476ac3ac14cf4c1fcc592a8bb29615f118c24b9e6f5dc033a48baee25c6be851066dd7507b983cfb39bea65df92454fb26bfb1cb7990120825b8def2916a SHA512 37e76360536a3a0f10aeb59efa1b268239696a8c0bbb49588dd6de872ea0d827a7670299364c918b48121b91180770990dfec93fe368dc4326ce8e5f240341af
 MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild
index 95f32b88ca59..cbe2fef00066 100644
--- a/app-arch/unzip/unzip-6.0_p25.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25.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 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )