gentoo resync : 30.05.2020

23 files changed, 308 insertions, 70 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0e7839dede34..cc8393bf955f 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index 21366f7259ae..a6f1d4795d2c 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -1,6 +1,7 @@
 AUX arc-5.21m-darwin.patch 268 BLAKE2B f353d9a5cfecb4c434cc65303190523fdc0a8af159c0e2d8ae6b13d19597611a12a55a983723b0b54f2fde737d6a1538c7757dc4cb2aaf8a6014d4e4a05a836e SHA512 1250a494f793d899286989f6715a504f22b651f60019149ad1b4b4d423ad2d59fc948bdd317e773ea99bb4f52f79771450a9e69263c994c7cda79bd3bec5e94f
 AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685ce23fde54f6e77c34e41ab52b29db52b29883d6772f735773e04209506ff61f36909d895595a34afe35ace7aec9d SHA512 6cf269ca19d5000deec43bcf7e766d28aefa53219c5af8f65429e80f4a8b8ec557199d73cb380665b4d14517118ac567a001edcee1514691901d8192109923c0
 AUX arc-5.21o-interix.patch 341 BLAKE2B b37abfafd5d0de28ddcf0f8c5392e2e9ea6921e5a8ebfe7d0fee836fb91513964f25bd60e65f8791f642b106b614c933d607af101408872f715f93a6d89f9d5f SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8
+AUX arc-5.21p-fno-common.patch 934 BLAKE2B dc9c058a2e0053dacae271c599333cf02a262857c619c214c02e4c189a2e5f7491cea04f67950c16f840bbbb94149a15aa5417e33ab698dd983c9dc10ab349da SHA512 4f79298bc9ccc8ebf8cff50ef5d943841afb3d1281bf35581f1fe0bdf512bd8ac7edf04a0149d9d30df8a2c02e45828c38f2f97d5a918de9e6f1a1f50f245058
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 833 BLAKE2B 7adb631a3ce1a49a623c1cae337d5cc3e44f08d651769c04e28bc7958134ae2e83e054b894b0b383a2733aa802dd93328a10b50e0cbcc40ba25f4e9a66a4632c SHA512 acc11bc6ddb1775759da2ca4feb370b1c387e922802e398e3a575d86edabe8884878625ab31f6f2906e8e092625c6ce42220cd520d4cf1f58ba44a26740d70b9
+EBUILD arc-5.21p.ebuild 877 BLAKE2B d171ea2003663e9a98391587682fd1f1d49109c895a88747071450ebaa87fcdb2731a9c76a0469c171aaeae7bb9b269717b1bfc5bd79fe4e5f770574a128e2fd SHA512 9eb187ec8f47b773cd795ddcde59a88d5e3bf2e9d5b2ab183e79a800088ef738e591a21605c67372928b3e67b6afa64d29e48d7f9cf027638bd66637405625a1
 MISC metadata.xml 356 BLAKE2B 8f18c0ad0004f2b5a4ad4d35cb420a709bdeaaba374491c58e19ceadc06b6bccdb54419cb4c93985498e9b99b33417d2cecfe26db6228cc500a407e172124f2f SHA512 22f42b35b8c8ad43bac261820902eb8fc9835c2ed1a96e75a56fc97e0732060e6354e9485458f928177f201f7f6ebd9e75c7cae9a1cff4b376b997d3c3f20d18
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index 93335639d0e0..f62a74e54786 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -18,6 +18,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.21m-darwin.patch
 	"${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch
 	"${FILESDIR}"/${PN}-5.21o-interix.patch
+	"${FILESDIR}"/${PN}-5.21p-fno-common.patch
 )
 
 src_prepare() {
diff --git a/app-arch/arc/files/arc-5.21p-fno-common.patch b/app-arch/arc/files/arc-5.21p-fno-common.patch
new file mode 100644
index 000000000000..5de65e341c70
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21p-fno-common.patch
@@ -0,0 +1,34 @@
+--- a/arc.h
++++ b/arc.h
+@@ -129,4 +129,8 @@
+ extern u_short	olddate;	/* old archive date stamp */
+ extern u_short	oldtime;	/* old archive time stamp */
+ extern int      dosquash;	/* squash instead of crunch */
++extern long     stdlen;	/* bytes to read */
++extern u_char   *outbuf;
++extern u_char   *outend;
++extern short    crcval;	/* CRC check value */
+ #endif				/* DONT_DEFINE */
+--- a/arclzw.c
++++ b/arclzw.c
+@@ -58,8 +58,7 @@
+ 
+ extern u_char	*pinbuf;
+ u_char		*inbeg, *inend;
+-u_char          *outbuf;
+-u_char          *outbeg, *outend; 
++u_char          *outbeg;
+ 
+ static int      sp;		/* current stack pointer */
+ static int	inflag;
+--- a/arcunp.c
++++ b/arcunp.c
+@@ -39,8 +39,6 @@
+ #define NOHIST 0		/* no relevant history */
+ #define INREP 1			/* sending a repeated value */
+ 
+-short    crcval;		/* CRC check value */
+-long     stdlen;		/* bytes to read */
+ #if	!DOS
+ static int	gotcr;		/* got a carriage return? */
+ #endif
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index d8f79c53a84d..03f80ed90839 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,4 +1,3 @@
 DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
 EBUILD cksfv-1.3.14-r1.ebuild 655 BLAKE2B fa3ff03e77bf86bcbaab1f73f5a591aa476f52b9f9693e903e714633ab7ac7f0e66e88c5b5eef02ee583a08b2b59225be9e6307eec9841ce437a369dd168caca SHA512 9690dacb7bf13035006bee9dccf634f008ecdbbb1b928452e97ec579bff51f8f00f41d397a5afa09960181219008f78a3901f803cdfa7623236f0178dba16b50
-EBUILD cksfv-1.3.14.ebuild 726 BLAKE2B 41edf729c6a69b432547c3fd7c1148d042538ff207fa92b949171abfa301f3c764fd928f0170e7c01960cfcca6adb5b8b8597d17439aa03b918c13e9e57ca77e SHA512 cb0874a7f8d3cf0909da52d699513323baff037d322eca3b877b5f11bbd207549de8ded03d72e7001d1f7763a440d4c875f699fddd19ca652dba519e55b89289
 MISC metadata.xml 301 BLAKE2B bf0c52408a86e4790cfe0b17bc66819caa5727da92ac3f1604375ed77738dbd24f825a3ca264a5a118901494a3dd8a39a890d96ee6f132edd009bfa3d02af472 SHA512 a38f8d748665081d9bf4e09899e6f67f6fc48cb7d648a8a7dbdd79a086cf99cdd89997519d1e723043b1ebd050c910a3fd67da9a520417a6d8b72f3b82468278
diff --git a/app-arch/cksfv/cksfv-1.3.14.ebuild b/app-arch/cksfv/cksfv-1.3.14.ebuild
deleted file mode 100644
index ba064ccb4898..000000000000
--- a/app-arch/cksfv/cksfv-1.3.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="SFV checksum utility (simple file verification)"
-HOMEPAGE="http://zakalwe.fi/~shd/foss/cksfv/"
-SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_configure() {
-	# note: not an autoconf configure script
-	./configure \
-		--compiler="$(tc-getCC)" \
-		--prefix="${EPREFIX}"/usr \
-		--package-prefix="${D}" \
-		--bindir="${EPREFIX}"/usr/bin \
-		--mandir="${EPREFIX}"/usr/share/man || die
-}
-
-src_install() {
-	emake install
-	dodoc ChangeLog README TODO
-}
diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest
index 3f484056b0d2..1f10b9a19693 100644
--- a/app-arch/fastjar/Manifest
+++ b/app-arch/fastjar/Manifest
@@ -1,5 +1,4 @@
 AUX 0.98-traversal.patch 3010 BLAKE2B 76450d561450aa9c7d5386f53328c0037d6ce9df2d6aac79deb1e47cee7651723cf2863a0d27cb6431a58525a9d0d3c554820b4f22a3099d1fe43b2ea7bec0d1 SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311
 DIST fastjar-0.98.tar.gz 717984 BLAKE2B 1715f1917076799fc58c6c6cea8fb53fc3261a694fa2392c0dc6e30101a7d42de0c5c55cd593627b4d2d0ffa45e3d44ef220c9579caec669721c6b1b9996e43c SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903
-EBUILD fastjar-0.98-r2.ebuild 518 BLAKE2B 97f7913052525beaad3e399f9a267ad28e5501994c2820a28d0e7e592a4c57f208e4acdb8097a031099b8d6f81052c417938aa9267ac517dc0840b06e01b8da4 SHA512 7ef3b44fc6a5384666c9d5b36f38dc2f2c128b7d57f968f16f6c5d6f332ed4f9d80e98a946b4a9120993d5e89996c5e875a5d9d5cf44ed56434d896fab3693ce
-EBUILD fastjar-0.98-r3.ebuild 522 BLAKE2B 52693d318316be2939b7d4ab00c6b1b41bc5cf859c43a98d8162774cd234e4706d3637b08b517277759a90f149ba2aa5d23e651f6c93cf318705c2bb95ac3ab5 SHA512 4026aea676b408699769ade56ce8a107199429afc8d68b3de6b5d60b8552b57ca8f1098223c9f71e99bc5b66aa4a1e86859cf89518b00c3e4feb9210c5fdfc2a
+EBUILD fastjar-0.98-r3.ebuild 515 BLAKE2B dae7a41a20e0de287b9d4b4e25a7403f73c87241d1e819797b9676cdfaef8a4b01fbadd5eb294a64d297b9e20724c0cf3daee3801c07c33a951d973462e28bf5 SHA512 a7f88602931712be65b24e158805d67a5b72dd8cf0fc544f622181e43b47f48e63426dc334a61b1dcf2777d28e289c859f439159432a6f528f05933dc824eff6
 MISC metadata.xml 478 BLAKE2B 91d7ee00197567dc201739072627c34a8a7073a28b89c5761793ce628d1f62432d91b36b13a65fb95f821101249697a041af339823bb26fe132873c4a20a7b54 SHA512 3b1f8a2998d8496947b8e6c60698db4311ca1afe7ddcd0fe9d4f7ae762acf4204a87f8ebcb9e0b0677727eb82fdda22a299cf3cafcdf83bd348d98ba16ff4214
diff --git a/app-arch/fastjar/fastjar-0.98-r2.ebuild b/app-arch/fastjar/fastjar-0.98-r2.ebuild
deleted file mode 100644
index 37599ed0d5ba..000000000000
--- a/app-arch/fastjar/fastjar-0.98-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A jar program written in C"
-HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-
-IUSE=""
-
-# bug #188542
-RDEPEND="!<=dev-java/kaffe-1.1.7-r5"
-
-src_prepare() {
-	# bug #325557
-	epatch "${FILESDIR}/0.98-traversal.patch"
-}
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
index 2b71543f2a0d..34ca86e5a0bd 100644
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 
 IUSE=""
 
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index af26b8cfa60f..fcb6cb73dafd 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -2,4 +2,4 @@ AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e622
 AUX lbzip2-2.5_p20181227-fix-unaligned.patch 1061 BLAKE2B a8c11adbbf53806b09d9b0b6b724247a17e450eac6953a9d9852539ab6d50901d739b243a0d4c72cc46cd7bfaa609fd6829af659e0c6ed6987e6725c471ca201 SHA512 0ddd04a06d2cc763b454074aba588d2cb252e0ab8c83c37133deb5cef2c265261fc38f6b32f8aed5ddbbc8aafdcb29e96df1b61f2f2cfd2e1b93818efd69114e
 DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
 EBUILD lbzip2-2.5_p20181227-r1.ebuild 850 BLAKE2B 84e382732bde42229ba5d22ecd2c4c95ee7fdb0b3b7ad2a52e6b59ee781cab68ca258034db12765992b79887c64b9c13aaea2f1ed8d51d2c4759cbeba860006e SHA512 1bfb5eb652ec2fb5271a5d439348af8707b9f27a1cd462af48aa5803de8ff88a434ef4b767db721210263ebd2705dadc131a726d455f2711a878feb47c8498e1
-MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
+MISC metadata.xml 652 BLAKE2B d44ba0b1387022f4fff2ec24e78c041a50e58f336abdcf8d31c3e2f9e429cde183000c6775eb81dbd50e9598508dcbadff5b3999dd6ee69d15214e8d22165a54 SHA512 64391d7d185471ef1b02e71a877adbebaafdb4d7bc95432d980d3559440dc199c4f68b275e98b8c0a2d10bfebbaff3544a9fa5d4bd34349404836468a0ee41a2
diff --git a/app-arch/lbzip2/metadata.xml b/app-arch/lbzip2/metadata.xml
index d0fababc8bb3..f6621e00952f 100644
--- a/app-arch/lbzip2/metadata.xml
+++ b/app-arch/lbzip2/metadata.xml
@@ -10,6 +10,9 @@
 		input-bound splitter even when decompressing .bz2 files created by standard
 		bzip2
 	</longdescription>
+	<use>
+		<flag name="symlink">Install symlinks which override <pkg>app-arch/bzip2</pkg> implementation</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">kjn/lbzip2</remote-id>
 	</upstream>
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index a4a8a0effd7c..424c4eaa07e4 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,6 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
 DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
+DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
 EBUILD libarchive-3.4.2.ebuild 3682 BLAKE2B e933888d38791470063f370bc550105f96a9305d26ae2188f546f57605943658314c6bcfab52f4cde877f9e1eefd0c64c92e19a47502455533e13000b9100017 SHA512 fcca418f5d06b6b0460a69ea26eab3d3792ba7bca0f25d0c700e434664eaed29de81dc9b570e4694cea6570e6c7abda41258a300dd07d3dccac38a287af17c73
+EBUILD libarchive-3.4.3.ebuild 3770 BLAKE2B 4807869b7b89b14b1c97218ce92a316de81c806580049e134ebe39688d678462f0e8a4ee790c364ff0a3ec2879840990f6c337b5541e5db3e4f06ac91a133f1b SHA512 2aaa032adff8441721e42e6fe4de0787eaa9602f71f2e60735c6a0fbd388a0137f82e8058b1b635287d790774663575c673cfa5ba2a75a3f9940e81e903c2c00
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.4.3.ebuild b/app-arch/libarchive/libarchive-3.4.3.ebuild
new file mode 100644
index 000000000000..dde837017a82
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.4.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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="
+	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}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(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)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
new file mode 100644
index 000000000000..d804fa1364e5
--- /dev/null
+++ b/app-arch/lxqt-archiver/Manifest
@@ -0,0 +1,3 @@
+DIST lxqt-archiver-0.2.0.tar.xz 155912 BLAKE2B e5c92d5939d3e6d42a79804596e9acc67b007126b630cd9317df7d0d07bb8f3e27cf9ecf6e16eef3289d31ef3627b4fa870cdb5eb52a36489df1080b03509acd SHA512 478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7
+EBUILD lxqt-archiver-0.2.0.ebuild 1175 BLAKE2B c33ba638b93d35bdb74f5a4c6b0a7bb9b62991520576415d070c885a7649c82241a8e83e8d1755b556477ae3817e396666b00480db654a93d548e43cfebfbf0e SHA512 aabd95530d60416584382ceaa728989cec84af6751c7ce50312b93f5d379d0b23e3c5616828f00742511c9ffd6ba554cb07aefefd7f9305c705b222474f82898
+MISC metadata.xml 329 BLAKE2B a6082a9d0185aaa5f233d41d9de505901392c80159cbf4cf769e1a38008aaa06793e2283c974df743f2141488bdb2cc087e7990953b16b752092f31de7840c83 SHA512 42d4c3e67fbc3a84a79ed73710e8322f4a30ae6565e1aa2cbf122661e6864a8e102e67ab973942953fb2358754303b3f2d2963f3ebf15188bc23fd8ca31f5e60
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
new file mode 100644
index 000000000000..dd4a15a89c32
--- /dev/null
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI File Archiver"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+"
+DEPEND="
+	dev-libs/json-glib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=x11-libs/libfm-qt-0.15.0
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Please note that this is only a graphical front-end, and additional"
+	elog "packages are needed to have support for specific file formats."
+	elog "For example, to be able to work with the 7-Zip format, the"
+	elog "'app-arch/p7zip' package may be used."
+	elog "For the full list of supported formats, see the 'README.md' file:"
+	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-arch/lxqt-archiver/metadata.xml b/app-arch/lxqt-archiver/metadata.xml
new file mode 100644
index 000000000000..19d4de86f7b1
--- /dev/null
+++ b/app-arch/lxqt-archiver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>lxqt@gentoo.org</email>
+    <name>LXQt</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lxqt/lxqt-archiver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index fc437a048152..583e71d1a384 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,3 +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 1011 BLAKE2B d3d3c3c01ecde62a039b622d54a28fbc1fe28d73be0a77ffc944252dcad90d821082cfe65daeccc93ed068672c42f0e2734218e2bed108d691981128ad9cc4f3 SHA512 2516f46777a11dc8b00a4a4ff69bb091f2da95ac676373cd2283bc3f7abd7ecb1613dc744a8ae54673ba9b649f97373274a59a338790b9ebc96bc0fcc7d5d0b0
 EBUILD lzma-9.20-r1.ebuild 902 BLAKE2B 768a2f1db8ffa970a91e108e9666a1ce3fb2d7061bd8f79c678333ee2c7f864391e0d605d4255bf73934288f3b2afbd84bb0ae4385a49b3cb763851602a6fb08 SHA512 c472806e0b31156679c40ef8ae60e6a6b4b079e49c721a8879683b5991dfae9630550663c983289bf3533dc5eda47eb6eae92c0b5830dd84c545ba0d073afdac
-MISC metadata.xml 250 BLAKE2B e05a373f0ea02a1a107bb27632d2f6b87bb754d82a7a7c6f56b7bb6041a92a0bea6ef1a6353cd535f5f9d992b10cb68e402c4efa3189d7f65d2c9fc904a4610a SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb
+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
new file mode 100644
index 000000000000..491acc885393
--- /dev/null
+++ b/app-arch/lzma/lzma-19.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="LZMA Stream Compressor from the SDK"
+HOMEPAGE="https://www.7-zip.org/sdk.html"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+BDEPEND="app-arch/p7zip"
+
+S=${WORKDIR}
+
+src_compile() {
+	cd CPP/7zip/Bundles/LzmaCon || die
+	emake -f makefile.gcc \
+		CXX="$(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS}" \
+		CXX_C="$(tc-getCC) ${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon
+	dodoc DOC/lzma.txt DOC/lzma-history.txt
+	use doc && dodoc DOC/7zC.txt \
+		DOC/7zFormat.txt \
+		DOC/Methods.txt  \
+		DOC/lzma-sdk.txt \
+		DOC/lzma-specification.txt
+}
+
+pkg_postinst() {
+	einfo "The lzma binary is now 'lzmacon' to avoid xz-utils conflicts #218459"
+}
diff --git a/app-arch/lzma/metadata.xml b/app-arch/lzma/metadata.xml
index 86f4ac1ea62b..3a5f1e16e766 100644
--- a/app-arch/lzma/metadata.xml
+++ b/app-arch/lzma/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">sevenzip</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>hfern@fernhout.info</email>
+		<name>Hans Fernhout</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer> 
+	<upstream>
+		<remote-id type="sourceforge">sevenzip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 042d02f556a8..a65a2c43cd9b 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -5,5 +5,5 @@ DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444e
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 EBUILD rpm-4.14.1-r1.ebuild 3360 BLAKE2B a15c7083a196c9a18f2da366fd102b06d25f5bdb586c48799c87c6a61ed6af65746f2efc69553b565a6197a3e08d4ba4b5dc249e160a943799cf3e92d23e87be SHA512 6fdbd4ab36d436021171bf44f0ec2c8c545d721559ea47b8ae42e705b0664f344b3a36c89239983a9456c513ae551a7e2252762ce8a367ca0c28bcb01c94c4f5
 EBUILD rpm-4.14.1.ebuild 3275 BLAKE2B 5c7c3854de61096015e5d420832ab282133ff901f78189905968591ba9e3c10bb7f4dc7001d48490dc48c16eb1ccc67034734d25af0a8990d3f53e2ac0dd084b SHA512 a1c6235c6b504694ecd03ebc558dca834521238af0f8235abeacb2f9e2f92b72f42f7d878b808537cdea2d347ac0b3e327943ad357c9a576a673e87ea5737969
-EBUILD rpm-4.14.2.1-r1.ebuild 3457 BLAKE2B 2536174f36d6e33f3028c8d815697377b37ccd2a432c8c777c205daf6e99247313d33cc5cdb68a2e6a4324d6186b08f2e5d683b7441e66af8fa9feadf1b560a8 SHA512 46e98de6e14d374acb0543bb0939642bb951e8d7d77910d8b66148c9f3fd8fbd72bc6edda9378d1f0f67f8b7ee61e950e36547467ab55d35b0ae0cfc6c8fe770
+EBUILD rpm-4.14.2.1-r1.ebuild 3459 BLAKE2B 92bb8f100bfe33ec9631860e28978793365d14ef41665e5066c4626111ec5b5b7787c332f688ba107042cdec210c3fda7a5440befcd5a39b434f45d3aff06248 SHA512 9ded8bca98b34dee3012f96a4b85c52ed9a8a1d003914d7c517f26dd729669c294c2f5e6b61e648333a931553c78e4715502893374afd671628de026a005a2a7
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index cf860b516a0c..c1b09818389d 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index 057d0b4e44e4..93e5ea2b4d10 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,4 +1,4 @@
 DIST XADMaster-1.10.7.tar.gz 2064770 BLAKE2B f6119dfb46f3d617fafb5847f41d6c0f3e5e87c8cd0763cd8e5986fae1d5b1c6e6761e9e7e4fa84125003979151b2b34d35ff47dc9be3271107cf53f1be22644 SHA512 3447b6d8f3f4fa5eea93c6628a1633017da6ff09c580d5ce4fd422027b3b79acbf38d6e41a059806d1e60eb25a9d66889938b32599168dc2c0ca648e1c1976b1
 DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5
-EBUILD unar-1.10.7.ebuild 1381 BLAKE2B b232260fbde8c11de8772e2d17e9cfe2baf8a2fb0b78e32658fa11bf00238b3d3c81dd1e04128828781352683c8a5366ff0461178b7db21c9821d8adbcd46fbc SHA512 543643d1fbd3932a7b092ee19b65b131f0a8a92e7d532b438f63846f639843d75b1a61400e593d1f291430e39d5b68678a0da0970b047038e81bd7dcb5a768a6
+EBUILD unar-1.10.7.ebuild 1383 BLAKE2B 78fa169605a3c793396bbbb9066f8d33bd4a9e1f982abf77ee7d47f760f7a3ea468018b0ccef0c1f50d204049c2f5bfad9621418ff2cbf19999cb6dd55116182 SHA512 8a133b1416dd1c6b450417d28c60495756b659dddaa9f03458c03a8bc64fe5da800b3bc6d2fc4d5cc16ca01675fd99032945ea5fb6bce156cbe39eb9119f276c
 MISC metadata.xml 505 BLAKE2B 4b5721fddcc32af07444295a978b4f03b472988afc3b81512a27fba3965a37a0a78ba79bac297706261b8da826241d62a515911ccabd4b6ff307bfb400ea7d27 SHA512 ecf113d90b08e777d9afce3652dee4af5412af9929336eb55b06bb680e60d6a3a0f25285d7dc67653909a743c5c7040b3b036b57c612e089a1e4d6bb710429eb
diff --git a/app-arch/unar/unar-1.10.7.ebuild b/app-arch/unar/unar-1.10.7.ebuild
index 47614f3e18da..8e9518d4b8e6 100644
--- a/app-arch/unar/unar-1.10.7.ebuild
+++ b/app-arch/unar/unar-1.10.7.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
 RDEPEND="
 	app-arch/bzip2:=
 	dev-libs/icu:=
-	gnustep-base/gnustep-base
+	gnustep-base/gnustep-base:=
 	media-sound/wavpack
 	sys-libs/zlib
 "