gentoo resync : 03.11.2019

26 files changed, 256 insertions, 70 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 1c5235f227b0..f46bcdf12624 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index 21948262dd8b..cfd65049eec1 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,4 +1,4 @@
 DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
 EBUILD cksfv-1.3.14-r1.ebuild 653 BLAKE2B e511a0573e46fe0fe5caae51be498e759c812808c33cef34666d608d990b92048ef6f016898c0d6ea0288d60b3aafa1e27756a60be933185e0f4e6a417dd5a0a SHA512 3f28b4371abe0af78bbcc0b1a02036362bb1a6b816997529313bcfe8d59b02f8014f74fae1c0141ce2633411cfafd150b7cc9920334db073e188e7c315210207
 EBUILD cksfv-1.3.14.ebuild 724 BLAKE2B c46b08c0ffc690d752fbb4433bbf05a14b42e09d3975be5f9c70eeffae2936c975d397127389a3566d708f9813504fd24f9ca6614fe263e0a731c8f0b391a2c7 SHA512 9c99995bab6fdc31d8427cb3e49fdbe78dec883fe0afc50c08d5f35c1548a4f10c424916b027946c303b64ea2d09aff31d805f250e905b618d44f7b619ff6473
-MISC metadata.xml 301 BLAKE2B 3e0945108754a3afcc9261293790159773b42004104ae4ae6d3275aa3245965298a4334d029c3821b62434e42eb8a4feef05ac40bed9703ab845001afda4553b SHA512 e6e2beb7e4c2d47fcc52fa57bff562229554d30ec41405d0ebe920bb442154e9aeb12b9974a97ac44c086a7e0510989e3a6c8a510163483bec9370ca88c52776
+MISC metadata.xml 301 BLAKE2B bf0c52408a86e4790cfe0b17bc66819caa5727da92ac3f1604375ed77738dbd24f825a3ca264a5a118901494a3dd8a39a890d96ee6f132edd009bfa3d02af472 SHA512 a38f8d748665081d9bf4e09899e6f67f6fc48cb7d648a8a7dbdd79a086cf99cdd89997519d1e723043b1ebd050c910a3fd67da9a520417a6d8b72f3b82468278
diff --git a/app-arch/cksfv/metadata.xml b/app-arch/cksfv/metadata.xml
index d776c6cd250b..2f043d06aa49 100644
--- a/app-arch/cksfv/metadata.xml
+++ b/app-arch/cksfv/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>A Simple file verification tool to ensure that the files you recieve are the same as the originals.</longdescription>
+<longdescription>A Simple file verification tool to ensure that the files you receive are the same as the originals.</longdescription>
 </pkgmetadata>
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index cfcc903e6f90..f4786010ab87 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,5 +1,5 @@
 AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
-EBUILD dump-0.4.46-r1.ebuild 2130 BLAKE2B 4b14a0e748b2a85ebcb7a0d02b4f191a624b9691e5dc6c3494f44d064388819447b37aeb18ccfd82a0e7a77bbc2a8e2217a9d38aecab574b875d92412ae61e08 SHA512 05feb7fa8948abde6f4c0d5f2df5e08a4b01b57b502f4cab0dc82f34a4f2fd3c82f21f8fa29cd13b6d24d374bd7d37bc11ce59551203173bdca73aa885d68a0b
+EBUILD dump-0.4.46-r1.ebuild 2129 BLAKE2B 1653b4a027afb964fca99b6746577dc33f34b2be892b266225ebde219c907400ee3bbc2ce46a28ea2fb127266d0106a92ed1c3bfdd7897047486c0f875382a7e SHA512 d1ce88cdd4e92e2f1fc04b55229b421432182479c5e5593afe7f6db7caa9b7b4dde2bb2aa69a2909f0e2d70d3030391edd99d90b36dd3d31d25bcdd7f39062a5
 EBUILD dump-0.4.46.ebuild 2113 BLAKE2B 431fd8ae0fa1c3b28015f27687c28f43a8d6fcb205c97a99f3d4ee1e96d3da7683456f02e4683b85c202848ddcc9efdaac85b63f31e0a4ad5fbf2d430465a8b5 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90
 MISC metadata.xml 542 BLAKE2B beff8763f8b3848f9592dbf200cb547e9c416e7d675b4e9015f20b417861523949916da4a6a38553abf7fdf5fc839841870f74258becb4e8dbbcbca9c564e328 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d
diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
index 7040189b5061..3f2ac26507a8 100644
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
 
 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"
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 3c15f3b35b62..91800ebb7efa 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,7 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
+AUX 3.32-packages.match 645 BLAKE2B 7bb6ec28fb8150e1f1989a9db4514556d857b4dea8b8225b1515f3f53b70a1e81b6a0a1068a0d356a33086d0127993a394cb0500e2991384c404dce7faaf32a0 SHA512 3c837c18afa12c5e022a80f85ccc83e5f55fc8fdd5ee8f19f1b2222d08560ad1fd349ed8b1bb7255119f6d6101399fa0dcd79e6a1754c719c0409343c231f65b
 DIST file-roller-3.30.1.tar.xz 1443340 BLAKE2B 352b094b51d342ac71f2174b59dff262ba46b4697c21164ba18bf825d70cb609d59a35ce0efe1013e217e86754822accc11c59eb9bba7185a9f7efe5dded4def SHA512 8f3f55cd7d6769fbf8f72118bb8982775c3f83534266db1f2cc9bbfd9e8dd68545ab49baaa4e468ce22e616346dec9c99c11a0c5b4208dca2e648fac8756cea7
 DIST file-roller-3.32.2.tar.xz 850256 BLAKE2B 5e7f8fed74ff3ff87079753d3fb227cbb77c0a10b75995b84a6019e13434dd4bff16946d38c2b340c85f5dd7879692cc5edd4aa9471f30ea92d2a7fff5176296 SHA512 d1c1e08f12ce343c23c43816305f75c0f3a3f3df32316805864d7c39b5e85b5a00e04a355a0dd8001db8e01ae089daf3b72c3f38fda582795944a6be09451b2a
 EBUILD file-roller-3.30.1.ebuild 2116 BLAKE2B e74170fd5a3a89c792ea698daf5b64d189d03dbf5b63731e1c308a033ddbac6dcb0ca67429aeeefff694e01090346cc4338b06f0d6f3f4d62b38adf73e39c785 SHA512 b507d420a53a1b718fb3c967b5856590dfa46ba4ac9b58f0c3f6942cb83edbe0f66f2e72c44c38ea4d8fe89ba5f4d3169c6ec1b8251425b70b7aa5f8d958d0cd
-EBUILD file-roller-3.32.2.ebuild 2154 BLAKE2B 18c77663cb55bacf952c39835445e50a2042cd8fc0602f2db7f52fcfa9c47abb7a0db21a537c4103a638aaf75b59d42161ec162b75a5636c7776940cd4028556 SHA512 64d9d57432266fe45d9b10211b1417e7d64ddc483f266a535bb16f6e4fe9ceffdea24032acdd09459975963162051289084990f92ed22c5e210bd834927263b9
+EBUILD file-roller-3.32.2-r1.ebuild 2154 BLAKE2B f6ae6e9e9aab743769db1d3eba4aa35b0a6c6942858276b10cd11f592e5d1027b80b9307c3c9fd3737b72cd7f21c04681a45804bd8255c2e2648c05a39b3b6d3 SHA512 158bed36cb48286a5d65ba2b6edb4e112ea45c5d1621972a4b2d6150d1abbc8bcca6b900231e4c84e80e9ec51f842716c1b793d3cdded64ba8d7070d7c5637d0
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.32.2.ebuild b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
index 40854a846ced..cc5f90b30467 100644
--- a/app-arch/file-roller/file-roller-3.32.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
@@ -2,7 +2,6 @@
 # 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"
@@ -44,7 +43,7 @@ and install the relevant package. For example:
 7-zip   - app-arch/p7zip
 ace     - app-arch/unace
 arj     - app-arch/arj
-brotli	- app-arch/brotli
+brotli  - app-arch/brotli
 cpio    - app-arch/cpio
 deb     - app-arch/dpkg
 iso     - app-cdr/cdrtools
@@ -59,7 +58,7 @@ zoo     - app-arch/zoo"
 
 src_prepare() {
 	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.22-packages.match data/packages.match || die
+	cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die
 
 	xdg_src_prepare
 }
diff --git a/app-arch/file-roller/files/3.32-packages.match b/app-arch/file-roller/files/3.32-packages.match
new file mode 100644
index 000000000000..09f1513968e3
--- /dev/null
+++ b/app-arch/file-roller/files/3.32-packages.match
@@ -0,0 +1,34 @@
+[Package Matches]
+arj=app-arch/arj
+binutils=sys-devel/binutils
+brotli=app-arch/brotli
+bzip2=app-arch/bzip2
+cpio=app-arch/cpio
+dpkg=app-arch/dpkg
+genisoimage=virtual/cdrtools
+gzip=app-arch/gzip
+lha=app-arch/lha
+lrzip=app-arch/lrzip
+lz4=app-arch/lz4
+lzip=app-arch/lzip
+lzma=app-arch/xz-utils
+lzop=app-arch/lzop
+ncompress=app-arch/ncompress
+p7zip=app-arch/p7zip
+p7zip-full=
+p7zip-rar=
+rar=app-arch/rar
+rpm=app-arch/rpm
+rzip=app-arch/rzip
+zip=app-arch/zip
+zoo=app-arch/zoo
+tar=app-arch/tar
+unace=app-arch/unace
+unalz=
+unarchiver=app-arch/unar
+unrar=app-arch/unrar
+unsquashfs=sys-fs/squashfs-tools
+unstaff=
+unzip=app-arch/unzip
+xz=app-arch/xz-utils
+
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index fc930dade780..3182e210511e 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 3669 BLAKE2B bc408f72315738ffb1e7b381d9423d5af774342dcf2ad55cc90d227c15fd16359ee6c99df4fd0fd41f87b09ce159f161ae9564d9e6237ca96429d7567b64b083 SHA512 5ad8026a8781264f45bca06ab721977e1abb6f7733015aa1e87cf871022e8595c6eaf389581783cd144bacf716032d0d020c0c690dc67dd8cc17c7368ece27c3
-MISC metadata.xml 1419 BLAKE2B e40e4f003c6b5e23f9b00889644406b5694ccdd4afa354ce4d72e5d5b4dc3550c8d6d70184a24cc247c03ad6430cc1d1e7579a829d178ca56337945dc602318c SHA512 f5ddf55a12dca3998849f8b414f9603ba6f17896e3f7f955b3c90276dfd306c12b97abad76cbc0709823b28b029427598e272418a4e0eee5c7942272674e65ed
+EBUILD libarchive-3.4.0.ebuild 3752 BLAKE2B 6e4f4c328127ee36ff014b88d97bf78df989c039c24c1167de262847465ef42c90023eab72fa5289dee7c63ea372a198ca02aaa3fecf43a2dc783a2d08de78ef SHA512 cde7a3b34a20e39cdc1e859ad1280cb8c2998876b7827fbe4d61589afb4f5f62d3e94044aa77fdacd8b416dfc560bb97c68278fd32bf95ae88dc436c1d4c67bf
+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 ded576e7b675..136aaa944c92 100644
--- a/app-arch/libarchive/libarchive-3.4.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.0.ebuild
@@ -11,10 +11,11 @@ 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"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
 	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
@@ -57,6 +58,7 @@ multilib_src_configure() {
 		$(use_enable acl)
 		$(use_enable static-libs static)
 		$(use_enable xattr)
+		$(use_with blake2 libb2)
 		$(use_with bzip2 bz2lib)
 		$(use_with expat)
 		$(use_with !expat xml2)
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index 1da101e8d49f..82253c34ca0f 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -9,6 +9,9 @@
 		C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats.
 	</longdescription>
 	<use>
+		<flag name="blake2">
+			Enable Blake2 hash support via <pkg>app-crypt/libb2</pkg>.
+		</flag>
 		<flag name="bzip2">
 			Allow accessing bzip2-compressed archives through libbz2 (which
 			comes with <pkg>app-arch/bzip2</pkg>). This only affects
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index e7bd363f5f62..feb57271345c 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -2,6 +2,8 @@ AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b799
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
 DIST lrzip-0.621.tar.bz2 503286 BLAKE2B 3fb80f72f0bb81340d4e83b996ad2cd94fc0067b8e67599defb535e86614ad4a2436d8e6ab00bae24e4c9799a01aef267a7078cc6745d68acf868d0f1dbd606a SHA512 be94f54c3d84c93e3c1ab7b08ca6d2a02bc343983785be4884f42521520d2babc31db3abbec4b77dc9f710d18648adcc3d24b203289d8d4728afb3ef0fb90c0a
 DIST lrzip-0.631.tar.bz2 522158 BLAKE2B d0ffe63e1bdd21304d6d7a7dc969d4e79770fed105cf03ea9d504f890cda35178566afa5f88e13beadcc1095f052a014deada3b3f102247eadb8c746d989d119 SHA512 6420cd465ccd4581066408482335a82089f84f0aca1b05249b9fc6039b7e67df94457a7c871859e363206df3a40e93cfde576388785113f6c99b31d34c00a307
+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 1178 BLAKE2B 61776ba8e03f31127efbccb1b3db5d21268b2223a8545b084a8eea46b6803964f288e635ef3f7854d3fdbdbb017975ba7dfcb805289d5ffc4a278c7e41f345fb SHA512 e088315a6daaad291215cd00577300c1aa44a42fddc9232be3d7179f7f79c72b4e81ee9b9ba88e053388c8319039ce20db6d0e55d8b0287b53a058d1248ae308
 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
new file mode 100644
index 000000000000..b7daf42db132
--- /dev/null
+++ b/app-arch/lrzip/lrzip-0.631_p20190619.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_COMMIT="b9220181288c5c9920ff00f00005b31a9e40e387"
+
+DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
+HOMEPAGE="https://github.com/ckolivas/lrzip"
+SRC_URI="https://github.com/ckolivas/lrzip/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+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"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/lzo
+	 app-arch/bzip2
+	 sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	virtual/perl-Pod-Parser"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-missing-stdarg_h.patch
+	"${FILESDIR}"/${PN}-0.631-solaris.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	# Don't collide with net-dialup/lrzsz and /usr/bin/lrz, bug #588206
+	rm -f "${ED}"/usr/bin/lrz
+	rm -f "${ED}"/usr/share/man/man1/lrz.*
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 8eaa098af727..7ceb23c3d6b8 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 1017 BLAKE2B e9181a6a89bd62c3433c71008d182fcbdd2960e29542539f9ef5a48eff15347968a8a1a2d362633056f27df0a5ea84a5a721afcc375335295cb7c0cdd9267790 SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
-EBUILD snappy-1.1.7.ebuild 1924 BLAKE2B b0b0103fb1d2b715664852d517cfd02b078952a3565d79531769afde7c601da6e1d39d243c1299967739e00bc38590ff4f2c5b20dd53a5ff93db5bf9ebc7ce6d SHA512 2cc9e19f38bfb7285833fa229223c47d9a596d0200510e2d80715e01a73dfa083a911963853d236c961cb5f83874ed83993ed33880676b6a93902b31b070955c
+EBUILD snappy-1.1.7.ebuild 1951 BLAKE2B 450d8931399eb14a660e807b7e71418431b75f6ba2724418441a179432060d0d237b502b334f666adfaca2ce858e3a192006b55db524fc92d384c1021255e1d6 SHA512 1a91ef07b8ad4a69a0ebbb42384364e3f736e1a1bfc0ad072ad8f4216171219c82fb8440d704785ee4dd48b06fcd53506134572a2f64de8ddb95cee16b24b2de
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index 188a906e8ae6..48f378ba3da8 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0/${PV%%.*}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 # upstream killed static lib support with build system update
 # (and we have packages depending on the flag)
 REQUIRED_USE="!static-libs"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 4c5d41f694eb..c15b986c3d44 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,9 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e2e20ef2c15817fffb7dc275fd326fd96b089257a8044982c0ae130ca3dc42126356d973ee6a8afd43e28df0 SHA512 101a21a20d8e30ca2cccc1605e332579064d362feacb36e9d4a7cd5218585298dcb48ec2805ff9523ae9b25e8e3d3e7557b73ea457702c6cb6d8c50d324ea1f4
 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
 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
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.8.3.ebuild b/app-arch/unrar/unrar-5.8.3.ebuild
new file mode 100644
index 000000000000..7fce116316f4
--- /dev/null
+++ b/app-arch/unrar/unrar-5.8.3.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 48da51c0a098..a9e4bb609daf 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 2584 BLAKE2B beb5c1f8e1157dde938b8bd9d09b2a585b66687194cb9bbe0af10d7b6055944f94b6407dfdb5ca8a1f637f1c8952614b6330d8f59fdfd60024099e24d0d7ff8d SHA512 55a3f1737ff01c8cefdd1f88161ed55e01176823c3cb92d260102471d206d124d8473d7bb50a4d38ec21d5a45a3acb9602cf5189b3c00359246777d68f162222
+EBUILD unzip-6.0_p25.ebuild 2582 BLAKE2B 2fae358bb6d65dcb6b9493b116c89049df9899b0b1e09fc90c45c4046c80cae1ae70f579a144fad757bdef3f538944cd968c1a46e7c890a0a74ff0213f51933b SHA512 45ffbf021ed252d00698dcaa961d7ea7c84d6b64c5c97a038dd1055310c52b6cd644952f3c9dc0496593342040ba55bbfe51209749e44218b50a8518beb9cf7f
 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 544d9c12d314..a89ad32ce715 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 )
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index c466e0258119..b4c3c9593bf5 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,6 +1,6 @@
 AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
 DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
 DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb
-EBUILD wimlib-1.12.0.ebuild 1454 BLAKE2B 67e5bc2760f9a0aaae9de8d761ab2eb5eac2888cd5d84c1bb65c0725d3e19e28a1b547e2fb9daacfdce740a8a8bc5028c9c4f7e5f45b208518a86d0ccf18a7e8 SHA512 1c4d848b98c34678efe2479efa1deec3365fc210b3c7c53dbfbdc43a52aeb21cb9de38104e0b47accd999a61fd886c3dc41c704fdfa3cb22809c60da608d456c
-EBUILD wimlib-1.13.0.ebuild 1454 BLAKE2B 60a51c4acbaefd3a2e626ed17c0c1b8808ef8eedd28c14e25a48d2ed7bfd6e7f54121fac41415843f7c34a99f2d35e22fc2dc05a9fea968ca18852342a40c4e7 SHA512 1bec01f388af7f97506572f1df2007c50e420ad37d745ca896015c43bb27850a65a5201c82864a9f29cd5bf2f7aec77f5a75c971ecb8cb14c16839708fc130e1
+EBUILD wimlib-1.12.0.ebuild 1431 BLAKE2B 90f047761bbdd8c4de42637580932681f6a47f2ac1db41f254e4b1322ad6ff092553c8132205d542aa37b841a601a6e41026863fbc329d7ff121d6132d64c0d2 SHA512 f6f1a36527280a6d251782a2e864e522fe050dbf3ce43e69dec56dbed39d9399d050b8f280ca131f364fecb9e8725a400a61f75fdb52ac52d8c20a1f7d6fd98f
+EBUILD wimlib-1.13.0.ebuild 1431 BLAKE2B 90f047761bbdd8c4de42637580932681f6a47f2ac1db41f254e4b1322ad6ff092553c8132205d542aa37b841a601a6e41026863fbc329d7ff121d6132d64c0d2 SHA512 f6f1a36527280a6d251782a2e864e522fe050dbf3ce43e69dec56dbed39d9399d050b8f280ca131f364fecb9e8725a400a61f75fdb52ac52d8c20a1f7d6fd98f
 MISC metadata.xml 684 BLAKE2B bc45d2b67f015842912d4fa5043bf31f2eb2ae59b29a9104987c6041282730491470fefd065be7ab49de230ea26dc10f64d4fd85591a1df6aec5a6ab408752dd SHA512 999d8b7bd11c22193d1e87e73b70fd750404e92c26b7916a4405c0bdd930a103ef8b809259e0c3ddfb73281f2622b284bd20ea73dff409cc8063406cf41a7724
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
index 77b9c95e2751..c8a393c40055 100644
--- a/app-arch/wimlib/wimlib-1.12.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.12.0.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=6
@@ -12,7 +12,6 @@ else
 	MY_PV="${PV/_/-}"
 	MY_PV="${MY_PV^^}"
 	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	RESTRICT="primaryuri"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild
index 9db9ef57d01a..c8a393c40055 100644
--- a/app-arch/wimlib/wimlib-1.13.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.0.ebuild
@@ -12,7 +12,6 @@ else
 	MY_PV="${PV/_/-}"
 	MY_PV="${MY_PV^^}"
 	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	RESTRICT="primaryuri"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 6a54facd0d30..3827d9f6b9bf 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -3,6 +3,7 @@ AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047
 AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
-EBUILD xar-1.8-r1.ebuild 1193 BLAKE2B a19751f073b99f3d24f01a49252bb07954f21fe53616a3fb632d1a3f6cedd25d427e21f473579d1aa7355ce384685886a8afc9caae178bed9b2560da909f5d16 SHA512 af10895611f19ed52b691f4fca0a2aa06895daa49e02a3067e77e69641eaf9746577f0798fbf6da39bd072a750c8a24f33cfff26b1ef9319e1ff6845b560eaa5
-EBUILD xar-1.8-r2.ebuild 1444 BLAKE2B b7d6a945190c5e8b1ba45b40d23e6baa1e569bf8ba2f18fef79edfd4bc19c3da1d6d3a7be741fb1f56f4f09e68cf9ef9548ff7de100cc27339da3143dfaa9e29 SHA512 7244df1c6dfc828582a1ae71f21abbab8278bd61c6bfc1dd13fd8811e18c156cb83140882fcca50368289ade0a528bebc16b58e510610c62e79fd4ca6c21fd84
+DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
+EBUILD xar-1.8-r2.ebuild 1456 BLAKE2B e92704dbcc169f5835cf94ce00990d9ab253fbbcbd5941c956fe12ee1d87222f0fb7151146dd58ceb6c1271ddbb0d40aa238a3d9b0b0b7ff8a9f646492526fb5 SHA512 118f460be2983419829c050119ce0b2f4c10c18574d5f074af209386e1c079d3001a05681fbcd347a5a97a5d688ec04c71e71e6b21a2b25a1ef3f8f52ae3e8f6
+EBUILD xar-1.8-r3.ebuild 2001 BLAKE2B 3dab7ee32ea82cc9e495437b12fd3938a91b9892723af22f96a73eda4a9dfa06d9f8b35f96996dff63ae17416f442fd034d6bd4dfc53d6e0eb7dc3d00dcab621 SHA512 243ba1c4497bd3148b55719a2fcf28a82c84140241663721d7886d9736332e9e3a6c4188209b6cfddb8699e7f7fc33915b660856e0c812eb715540bd65428e16
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r1.ebuild b/app-arch/xar/xar-1.8-r1.ebuild
deleted file mode 100644
index a9d20e9f4226..000000000000
--- a/app-arch/xar/xar-1.8-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib-minimal ltprune
-
-APPLE_PV=400
-DESCRIPTION="An easily extensible archive format"
-HOMEPAGE="https://opensource.apple.com/source/xar/"
-SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libressl kernel_Darwin"
-
-DEPEND="
-	!kernel_Darwin? (
-		virtual/acl
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
-	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
-	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
-)
-
-S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
-
-multilib_src_configure() {
-	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static
-}
-
-multilib_src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index 4a33df6ca299..e0a73c431287 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 ltprune
+inherit flag-o-matic multilib-minimal
 
 APPLE_PV=400
 DESCRIPTION="An easily extensible archive format"
@@ -48,5 +48,5 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild
new file mode 100644
index 000000000000..2b1ae6a93b9c
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib-minimal multilib
+
+APPLE_PV=417.1
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl kernel_Darwin"
+
+DEPEND="
+	!kernel_Darwin? (
+		!kernel_SunOS? ( virtual/acl )
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+	"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+src_prepare() {
+	default
+
+	# make lib headers available (without installing first?)
+	cd "${S}"/include || die
+	mv ../lib/*.h . || die
+
+	# strip RPATH pointing to ED
+	cd "${S}"/src || die
+	sed -i -e 's/@RPATH@//' Makefile.inc.in || die
+
+	# avoid GNU make (bug?) behaviour of removing xar.o as intermediate
+	# file, this doesn't happen outside portage, but it does from the
+	# ebuild env, causing the install phase to re-compile xar.o and link
+	# the executable
+	echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+}
+
+multilib_src_configure() {
+	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static
+	# botched check, fix it up
+	if use kernel_SunOS ; then
+		sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}