gentoo resync : 15.12.2019

73 files changed, 398 insertions, 802 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index cb981f698cca..ddaf2bc00a5b 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bloscpack/Manifest b/app-arch/bloscpack/Manifest
index b98cdc4019f6..161e6c164eb6 100644
--- a/app-arch/bloscpack/Manifest
+++ b/app-arch/bloscpack/Manifest
@@ -1,7 +1,7 @@
 DIST bloscpack-0.11.0.tar.gz 89839 BLAKE2B 466a0290e9ed95f2a77320ead61014b68a3f5869aebb90ea15d3b35e6de7bd1080a0c12521fe56673ee5297509208a7e9cf43604a0045bb16c506799c67d5a0a SHA512 68e6c05a4404fbb2554acc0a5a93500c5fe3eab4d91621ba0ffc290383873509d38fbb5b9c5733640a2cc58bf3c508067a411ba16e563dbd4e485f3036a5ebc7
 DIST bloscpack-0.5.0.tar.gz 45171 BLAKE2B 1f4c2e7dc4acdde4735a59adf8cf874df74802b86e201f84fac51aaa15103d2407dad4e2ab348136d7ef8ac6899f136651305522089a5cd044cc2780280a61d1 SHA512 3a3ab351e9ab77409b8f5774c4ede533e2393bf49065d52cb60018268f448d1cef5ba2b24d0d25ec86298f6ff55bbb9075af3b302558a0e2e7343344b002b8d1
 DIST bloscpack-0.6.0.tar.gz 60571 BLAKE2B 1896cc65b605de1457153fd15075fa6774d74b40294a947dda0707adf2177f5a056d84f43f71bf15bd677a8252e661b622deb6a98a050b38d3a7870d203f9523 SHA512 cd0b6e67d90fb8e320bfd5ddb41ee5d437543826f85931eb4cf3abbcb5eb6bc9581db88c2454b82b333ce2555f18670100f8df018299ce621eccd2e7c9e7d099
-EBUILD bloscpack-0.11.0.ebuild 752 BLAKE2B 164b4160f7bdc0b8f55ddb58742b08bf2ff5a8f635aea87932c2d537996d3cb8091fe7ac6d431276aba4c8d47015cd0b3e51b3f46e1e6db7c82ee8df90fc8206 SHA512 c41668b31af3936947c707eca67bd94f41d5c570ec4aa82cc16d4852258b0d6fc980866becfb51ff7234d3664c0d1ce75cee96223f2b150dd7b55d8ebea45d03
+EBUILD bloscpack-0.11.0.ebuild 779 BLAKE2B e24a8b6a6c6f4f246e14fd1a643052c719214962460a48cd92244a29940080b263e6b1f8cf68946b0eec4eaea75aba447c62d312007ddf4699bf17c6e0a0f39a SHA512 76e82aa6aeb5a69554e8e9c77e348a880923040e09a06528c479fad612e53678f81b1e007550eb3a75de826b7e2dc5126d6d1cd26c17f3c21477af12e163229c
 EBUILD bloscpack-0.5.0.ebuild 548 BLAKE2B f0796bd61d97176ba70ca3eb9c59bfe11b4820ccd0a33c43163389b067020cea332f799ed8347594a0b1a0d08ceab3b0a7b24a527c6243e9ac8d6dd5a2b20c3c SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e
 EBUILD bloscpack-0.6.0.ebuild 548 BLAKE2B f0796bd61d97176ba70ca3eb9c59bfe11b4820ccd0a33c43163389b067020cea332f799ed8347594a0b1a0d08ceab3b0a7b24a527c6243e9ac8d6dd5a2b20c3c SHA512 ffef100de32a80f2be525c5f7794b9f64ea6bf53a12b27e8d9087c2688e1d5dd32a361c4343afc799215d6b36598f60200da24ffdbc2b190ed6c751d3d2a3e7e
 MISC metadata.xml 640 BLAKE2B ff3e980929e8a53610569e417c36c263316db560f53accfb4ded08767943145e21932c1efae243fe43641c941ee490ed1beec1bdcd66d2f7d52e398a96ce1d8e SHA512 82a640c36ad2ed771345c93c35da111589b7c57ffb9074e6da062c7ca84ae9fd76f9f5978abeb75362c8145fc1625ca0bb3f9fd8957688e75dfbb5cef6568c4f
diff --git a/app-arch/bloscpack/bloscpack-0.11.0.ebuild b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
index c82892291cdc..27cd82c51ab3 100644
--- a/app-arch/bloscpack/bloscpack-0.11.0.ebuild
+++ b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/blosc[${PYTHON_USEDEP}]
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 2e492e637cea..7cd09bbb4cd6 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,17 +1,6 @@
-AUX brotli-1.0.2-no-rpath.patch 865 BLAKE2B 2c9720427c9751586b36580be629d3820757055dfb07b37f4933eacaf78973e14a7a861b0e7eb43a1980e889ee7c6988926fae9c31af90f962f502f17be416f6 SHA512 5da97caa16a910aebd4ce85e0805809dd97b6f36cd71636c72f284e6550bcff1a5f614a902d5363c35be2b46e8986dc74beb93f3fc6158a29f719e49d68a83c0
-DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
-DIST brotli-1.0.3.tar.gz 23815300 BLAKE2B 9569267782a8159d290e0f1b524a985144d1ae68a45a732443aca973dd0407c50249ce62389848d97cbc33eba3062ba471064570418c36158b97935ae4b7fb73 SHA512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c
-DIST brotli-1.0.4.tar.gz 23819000 BLAKE2B 5c0a7ed2cb7e15722c2f08dbaaaa5e74f10a03b95961d77db285fac437a489158cf8f7d43a55fac75eb5423951286accf0285e3e3471e34e35868a69dbf42f16 SHA512 7d41ad37ca0755ba9e08e7355fb031e24a53a5f6d44ff827adee6d9712765af02142cb463ef558f92449ce3b73e559cffb52315a329ab702f4c46927f993b616
-DIST brotli-1.0.5.tar.gz 23825684 BLAKE2B b179f75f3e452bdd3fabbd74d9172bc0a00f797e7facf7a9061e5e81c52148297ea7dd8ab9954c3f596f59e2a96cb22ef057c4c02b1bba4ecf10db7b70e0711d SHA512 703cad94c7f250133d2cfe222f3183612c7649b184bba218907b805f423568046d42695f33acf7da95daf684be118c9d631cfa5706e5a195b611c716db4c839a
 DIST brotli-1.0.6.tar.gz 23827656 BLAKE2B 8d31eb1c4119de44702f2239fba9db72f1ae81801d06e51716432ff2f8aa78259c52cbd57b8fcd005c1bc14ada81b6e47a35c5d3864bb10bb02d113e30bd321b SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010
 DIST brotli-1.0.7.tar.gz 23827908 BLAKE2B b9fc554cd23c8387b648638b6f9bb2d29fa87035856d03cf284662f9281984f3bf8e40109e61155ece18673f4391bc0fff704f8ab800a2041d3ce1824478d2ae SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
-EBUILD brotli-1.0.2.ebuild 1423 BLAKE2B 157d67255ffd120485ad22dddce9d5f953055b76999f6083d752519d813c025127aef64feeb250ae080bec4b086489bdbedd7670a1f1932ce5280c9c156475df SHA512 b5dae36637da86d3cee40152046a3a6f2132f006ff94e252526f5b9e05dc42e7bcccb83df88f19d9ab255af43f718289215c08637fb1ff2f04957bf001a51f13
-EBUILD brotli-1.0.3-r1.ebuild 1404 BLAKE2B 0e81b622f2d3a26656495c6bd15256ac7018be5df75e604dac83e69289c21e72b629cf2cde33c698525112a7aa5b80ee99532ceebcf5a1965acf57725ed85e15 SHA512 c237c57e402ea513ac89f5718eb310e9ce9407232d874360fc2f4d96935008f8ab63bb4fc233cc7c9aa56880dd59ef529d007e32054d26e014624bd549703229
-EBUILD brotli-1.0.3.ebuild 1381 BLAKE2B 97949d011621730e439c507db91f448a8774befad0bd81bc5d5b457e1c4d89320c69598edfbc4e5f921050b1b1a6cb63f30c66298126bad4f102996e95134b85 SHA512 77342e8262ebc38e0d250b61b843045c5b6ebea59b188ce77f99c1bd7d1559184140c9202e9c39ba538ab1188413929894af643061426edf8991ba3c4cbc3a63
-EBUILD brotli-1.0.4.ebuild 1404 BLAKE2B 0e81b622f2d3a26656495c6bd15256ac7018be5df75e604dac83e69289c21e72b629cf2cde33c698525112a7aa5b80ee99532ceebcf5a1965acf57725ed85e15 SHA512 c237c57e402ea513ac89f5718eb310e9ce9407232d874360fc2f4d96935008f8ab63bb4fc233cc7c9aa56880dd59ef529d007e32054d26e014624bd549703229
-EBUILD brotli-1.0.5.ebuild 1441 BLAKE2B 3959d6c39a5cfa11346037ab5046e6e1bbe4f35faa355bb37cb76516bc43b97c18182434831430583587bd9cb69be98d827d38ed387e46ee9f0ee01ba0240d61 SHA512 f4338362630a60b985612ee9e638a419aadd22b70c3923c5c99b6f183f60a1bbc94270e9c80027ed005213ba4a440e6fab528d3942886384e23711074ea6c087
-EBUILD brotli-1.0.6-r1.ebuild 1672 BLAKE2B d032591b026b3383fba68a6efabc1b0858fef80f8a81fde190fe4d0a16be5b0d931b562ce72a96182983d7a54ab5ef00202ee84c2884341d117b3e0a26ab6e1e SHA512 c045f9ae276818af6f9a30676091850c7290dc1ce4b8530026941995e6abf79f9b27fa0bcef89e9353f6b756ea6d75a7f1967ab87150b04b5dee7f44bf010a77
-EBUILD brotli-1.0.6.ebuild 1441 BLAKE2B 3959d6c39a5cfa11346037ab5046e6e1bbe4f35faa355bb37cb76516bc43b97c18182434831430583587bd9cb69be98d827d38ed387e46ee9f0ee01ba0240d61 SHA512 f4338362630a60b985612ee9e638a419aadd22b70c3923c5c99b6f183f60a1bbc94270e9c80027ed005213ba4a440e6fab528d3942886384e23711074ea6c087
-EBUILD brotli-1.0.7.ebuild 1632 BLAKE2B 25e95466563e4ef2f13779899227c61b8587ab8adbf6b81b9b99dcc5b611857e88aa3185a17c3b81052fefb86eaf63ce2145bfe9508c389069dffe2827cf535e SHA512 3389d89a59ba1064a78b2cd4779dfbe7f7122d93b21b773dcd2a3512071d597032b4003f879a2fd270a882d74486298f146d9f032d0b6b3379daaeba9378bdfe
-EBUILD brotli-9999.ebuild 1642 BLAKE2B 25cdbd35511a0510d39cb7595e0170f4193dc461cbec35742cace8c64ea73b7097c1346b462a2297f547a34584ef6c5592265e5a2eb0cd6052ddd37d5eca3182 SHA512 4472e08448f55df189aef470a98157a09d3672fdbcf673952de2abb6f07001047762fd5e7f69c2500b4e9eba58b0dd6134ba6a0d11dfe87780e8f012cac1ebc3
+EBUILD brotli-1.0.6-r1.ebuild 1700 BLAKE2B ff375b31be3dd1bfaf4996cf173f53713b878372f3a7bf0b742aa6b8fa040d6321cb407792fbe5da9094aa177f4b2f182b3ccb5058fe075b2ee544be516bb517 SHA512 f3eedd6caa9e39b5736e35234a63473acad952cd46501adbe2a5004755a1107892cb74e2cefab9d87fec110124f725e95508627d5a3deac1c7f585408e348635
+EBUILD brotli-1.0.7.ebuild 1660 BLAKE2B 13598f31539839e5a10a15d774b056018980f2adc2e600104525dbf7c7ceff187a41cb95d023b5c59fb9922b04a00aeb6639bf9e1a161264331373f94bb496c2 SHA512 855c566586299b280fc7fbbbff662d78f3fd833c29228eb7e4c4fc2097c71b49d05095e8f33a17551101b1d5af585e2c7e6e900f3ef6d6aa0b22c10c6107800d
+EBUILD brotli-9999.ebuild 1670 BLAKE2B 66e5f50cce64a27c39c5b5117baad307110b6224cab831924013065f0514d9b9e000bf0d572854931a33e0556af32614a7c475a01c09fb2c2757397a66e7f063 SHA512 c70b1d476124f04b4ffdebc41826c0b05859890364e93dd27c4f7978f8e5b49ede1d4612c283c1b22cad30e6d435646a5c93b8ccf14402e0c4dfa0c7873fbcc4
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.2.ebuild b/app-arch/brotli/brotli-1.0.2.ebuild
deleted file mode 100644
index 682a6dc71dcb..000000000000
--- a/app-arch/brotli/brotli-1.0.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-DISTUTILS_OPTIONAL="1"
-
-inherit cmake-utils distutils-r1
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/${PV}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test(){
-	esetup.py test || die
-}
-
-src_test() {
-	cmake-utils_src_test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.3-r1.ebuild b/app-arch/brotli/brotli-1.0.3-r1.ebuild
deleted file mode 100644
index 7ac46e91346c..000000000000
--- a/app-arch/brotli/brotli-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-DISTUTILS_OPTIONAL="1"
-
-inherit cmake-utils distutils-r1 eapi7-ver
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/$(ver_cut 1)"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test(){
-	esetup.py test || die
-}
-
-src_test() {
-	cmake-utils_src_test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.3.ebuild b/app-arch/brotli/brotli-1.0.3.ebuild
deleted file mode 100644
index 9a2753bcfaf9..000000000000
--- a/app-arch/brotli/brotli-1.0.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-DISTUTILS_OPTIONAL="1"
-
-inherit cmake-utils distutils-r1
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/${PV}"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test(){
-	esetup.py test || die
-}
-
-src_test() {
-	cmake-utils_src_test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.4.ebuild b/app-arch/brotli/brotli-1.0.4.ebuild
deleted file mode 100644
index 7ac46e91346c..000000000000
--- a/app-arch/brotli/brotli-1.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-DISTUTILS_OPTIONAL="1"
-
-inherit cmake-utils distutils-r1 eapi7-ver
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/$(ver_cut 1)"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test(){
-	esetup.py test || die
-}
-
-src_test() {
-	cmake-utils_src_test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.5.ebuild b/app-arch/brotli/brotli-1.0.5.ebuild
deleted file mode 100644
index 3aa5160498cc..000000000000
--- a/app-arch/brotli/brotli-1.0.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-DISTUTILS_OPTIONAL="1"
-
-inherit cmake-utils distutils-r1 eapi7-ver
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/$(ver_cut 1)"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test(){
-	esetup.py test || die
-}
-
-src_test() {
-	cmake-utils_src_test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
index ee1416438b4a..00d5a73827a1 100644
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -33,6 +33,8 @@ else
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	use python && distutils-r1_src_prepare
 	cmake-utils_src_prepare
diff --git a/app-arch/brotli/brotli-1.0.6.ebuild b/app-arch/brotli/brotli-1.0.6.ebuild
deleted file mode 100644
index 3aa5160498cc..000000000000
--- a/app-arch/brotli/brotli-1.0.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-DISTUTILS_OPTIONAL="1"
-
-inherit cmake-utils distutils-r1 eapi7-ver
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/$(ver_cut 1)"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test(){
-	esetup.py test || die
-}
-
-src_test() {
-	cmake-utils_src_test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
index ae46ff731e1b..29e0dde0f378 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -33,6 +33,8 @@ else
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	use python && distutils-r1_src_prepare
 	cmake-utils_src_prepare
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index dbbad99aea23..f71b9e53de55 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -33,6 +33,8 @@ else
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	use python && distutils-r1_src_prepare
 	cmake-utils_src_prepare
diff --git a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
deleted file mode 100644
index 779b5e66bd98..000000000000
--- a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac55f6b3..2dc7232c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE)
- 
- include(GNUInstallDirs)
- 
--# When building shared libraries it is important to set the correct rpath.
--# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH
--set(CMAKE_SKIP_BUILD_RPATH FALSE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir)
--if ("${isSystemDir}" STREQUAL "-1")
--  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
--endif()
--
- # Parse version information from common/version.h. Normally we would
- # define these values here and write them out to configuration file(s)
- # (i.e., config.h), but in this case we parse them from
diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
index 2f603dd09b0a..26d1a77fe8d8 100644
--- a/app-arch/deltarpm/Manifest
+++ b/app-arch/deltarpm/Manifest
@@ -1,3 +1,3 @@
 DIST deltarpm-3.6.tar.bz2 500420 BLAKE2B 650193ef0bff9b534a9ff60f4bd4d9b81533a62f70e95a2cca1b96cd73f7d8b374def3300b2b079aee4ea2a1a839a79c40fe2bcfbced111414047b8b701b4314 SHA512 0ef89d8d3e7c9d3d9da06542f293b434e42d95e18616aae1de95a66a77a5937142060ff405356869454cbcf8a7bb52f64c462641e52af0fad985105af07351d9
 EBUILD deltarpm-3.6.ebuild 1135 BLAKE2B f421861770bb6a9c48b494e4928c1377a741f87996084d38b788b4208dfcf28e3183631d4ba8e802f3da8d8b22c886450850583c92508b69a216f1907fe4cdcf SHA512 0fa50f84c7765cacd52642d5cb8127253eea4a33a1cceacc456f640f52251a4f189ea6cc1588c44ca6013fa4da86e7a6713baee2d70a6f80597b5b1f71cb66cd
-MISC metadata.xml 486 BLAKE2B d8a27415f4df4637fa079d20452949fa3ec34dca25fc3fd243d1599deb42acf59a9c89703866e00ce8da24655e5ef1e8e159c34d8f7aaa09e5ca993fe8787705 SHA512 8a0639d669a83a3a33f58c2bcb0ef57a73e315a01353732fa70060d6a0d7de608d60010f42b9d18b8c9fef8d5c62d89d416a5192578842a0067227ee4917e246
+MISC metadata.xml 399 BLAKE2B 8851f133a5e6c5baae011e6c9245c53146b27eadacc80637c906d2ad5e7d22be2917849af8df4ad436f6ce2d97c91e39926a638d24bcda7fd30d7937816a51a3 SHA512 1d1d36249ac2ebae92a94364bb2aa25159f25081896be631dd29bb2fd10c0210cc889c81c6cf7d52df8fce49696cac84c9f7d96c98f88945ed2c670943da4c27
diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index 8845ef2eb6c2..b1f9256af634 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/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>alonbl@gentoo.org</email>
-      <name>Alon Bar-Lev</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>A tool to create and apply deltarpms.</longdescription>
   <use>
     <flag name="system-zlib">
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index ca40b8a19252..e928cf8c1e79 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -4,7 +4,7 @@ AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919
 DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
 DIST dpkg_1.19.6.tar.xz 4802832 BLAKE2B e35a805942e2b26a90cec80493a14697461cfb1c1352fa7fadce7171c8cca88785ff2590d34b8f0bd4763642cb21ee7bf449df86b01eef223554daba4604d1b1 SHA512 71981079835ea4bd5c4a381ca8702cf489c788034e29c129899eb288cfaf4ec55eb58c0aea13145dcde99f15a47d2de71fba7b5e7eb8e6b1b1d6f016de8a919d
 DIST dpkg_1.19.7.tar.xz 4716724 BLAKE2B d65200fc5da986db8b66e31e1ea45b9757b87e0fa15f7fc0579f1c1c63de78829c1a10bbc72726fe3b75bf6c11cbe1fe3c9b62f8374c796f990835f9f0e79dd2 SHA512 9ca441dc265baf5359c71617aef1c57504a7097c26ea57108b88dadc511bfa9918fcc765d8c67cec9def9916c5df92d6cabe508446dbc7223a29b45260445e81
-EBUILD dpkg-1.19.0.5.ebuild 1845 BLAKE2B b6320665601e48f808499ad616aec40b0c7be70673561120eb963065e87a05f1f2e8e0f1fccedcd80fdcc98ff7239a07e7f9ee75396288058521099af94189f6 SHA512 54b06dd32e8a95fffb89a3f8e160d4156002fa51d02fb8648966eadfdc9e43d999dfb6d42c4eabc68f4b8c64b73c171221c1de3154b06e1ce180739a35e66f13
-EBUILD dpkg-1.19.6.ebuild 1989 BLAKE2B 4b0233a469f6be8d1e19e00603bdef347749b6578495832873842761e4e930aba416f3db665dde4835f54d207696f597e2fa16ca220586a02bcac80ab8693cfc SHA512 d14d29b5cea16e2d87eac15334d541422f7892b590acd52ab2496fcf80d568a996d592d2fa30a793f8eca103c5a6efeee4df939031d1e7cd4e59afb40d028406
-EBUILD dpkg-1.19.7.ebuild 1989 BLAKE2B 4b0233a469f6be8d1e19e00603bdef347749b6578495832873842761e4e930aba416f3db665dde4835f54d207696f597e2fa16ca220586a02bcac80ab8693cfc SHA512 d14d29b5cea16e2d87eac15334d541422f7892b590acd52ab2496fcf80d568a996d592d2fa30a793f8eca103c5a6efeee4df939031d1e7cd4e59afb40d028406
+EBUILD dpkg-1.19.0.5.ebuild 1869 BLAKE2B f522c648d73287c244d8bfc9463ca5be1644c40dbb2fdb81ce47082c2e7ffcbcb53187e046ca84bdca600e8bb6e9faaa8726fcdb37ff6c32d51b6a8d8575cfa1 SHA512 04af6b2984fd0b6f654314a1d3242a33c1046b3c338fb15a007ab3bb4c0aac41d3b7feb42c9b9b3dc89ee67c9f06e28c9efbd95298cd6379a66c577671b7efc8
+EBUILD dpkg-1.19.6.ebuild 2016 BLAKE2B ab27a59f7a1f9e5bdbe1a13e844df906672c1c65c414a3561af0f51a098f1a9867b067fefde213bfce3928c3124092e23bc01fbdad744680465468a9a29121ab SHA512 992a142329aaff8b402e5284c1f20de985473f08fa27b1631c56e6b0a783aa02211624991a9a074c2c28e0b9d6e54b35dfb443e50a56874855dd46f8ee64743d
+EBUILD dpkg-1.19.7.ebuild 2016 BLAKE2B ab27a59f7a1f9e5bdbe1a13e844df906672c1c65c414a3561af0f51a098f1a9867b067fefde213bfce3928c3124092e23bc01fbdad744680465468a9a29121ab SHA512 992a142329aaff8b402e5284c1f20de985473f08fa27b1631c56e6b0a783aa02211624991a9a074c2c28e0b9d6e54b35dfb443e50a56874855dd46f8ee64743d
 MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
index c269dcbcc850..d35226261a7a 100644
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/perl-5.14.2:=
diff --git a/app-arch/dpkg/dpkg-1.19.6.ebuild b/app-arch/dpkg/dpkg-1.19.6.ebuild
index dce613b7e3f3..2a5d34a120d6 100644
--- a/app-arch/dpkg/dpkg-1.19.6.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.6.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/perl-5.14.2:=
diff --git a/app-arch/dpkg/dpkg-1.19.7.ebuild b/app-arch/dpkg/dpkg-1.19.7.ebuild
index dce613b7e3f3..2a5d34a120d6 100644
--- a/app-arch/dpkg/dpkg-1.19.7.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.7.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/perl-5.14.2:=
diff --git a/app-arch/duff/Manifest b/app-arch/duff/Manifest
index 409cfe2c619e..dfab3013737a 100644
--- a/app-arch/duff/Manifest
+++ b/app-arch/duff/Manifest
@@ -1,3 +1,3 @@
 DIST duff-0.5.2.tar.bz2 174545 BLAKE2B 1e2b75a4999333f062a8b25c750f35e785038a5d3ec0264112352fae20af25b8990727287f446d7523c699701b963fdca658241288bd0e79b27751e3be3c4ea3 SHA512 5f64c28ab86523dd4dffaf26dac67d10bea71bd5cf7b4eaa3dfa27309cf8e7cf37a74ee62b5f3df3cb0114a847711b3147a083cbdd72ab8e4b5f9a45c908f333
-EBUILD duff-0.5.2.ebuild 501 BLAKE2B 2c84ea6a5c37857a688dbfafa998f38fed170eee08092ebe10638f2c6cd5d7c5de553b4fa6720a6a2e2b104a026eacb3b3d35047e9923a193a22cbeecea56667 SHA512 34a8d2e93dee9f133d516910045381f4172a67ae2e65eb0917482ebe89dfa75171d94bb517d873bb6868c26ea30ba228e1c3be487f11d1e56e71d8e189f0141c
+EBUILD duff-0.5.2.ebuild 471 BLAKE2B 8db09774fbddc8f075e59de29e6413b7db9f0a931d2cc5d3fbc34a3f6cccd0e83cb526803638daa9441796db949b95b4751d2d02c3df9476c210773d1836f6d3 SHA512 7203ff06088031130c2dc5cfb5b92f3dbc490ccc5a9b272c4f23a7f4de6c1a975e9c761146f2ea87620aef220db21fa28d0b0774db67671fbdcdc1578815837e
 MISC metadata.xml 300 BLAKE2B d478e17714747688bca890580e4b0332e301bde95ffd03939e979a3e5a80b6f721b175686b69f6e9add4105ca3953f2905085a62dc0b7be1dfbedcb9f4c537cf SHA512 ef8d27bfa12bb1eb3a821a400c6fc897b5e387d0b99b4c4d5d03d472ca9ad3ed02a13657a9cd627cdd87a01fb7b709640238c223fb7123d5781dae7e48e9fa2e
diff --git a/app-arch/duff/duff-0.5.2.ebuild b/app-arch/duff/duff-0.5.2.ebuild
index ee113c8fa508..94522ba771dd 100644
--- a/app-arch/duff/duff-0.5.2.ebuild
+++ b/app-arch/duff/duff-0.5.2.ebuild
@@ -14,6 +14,6 @@ DEPEND=""
 RDEPEND=""
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed emake install"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog HACKING NEWS README* TODO
 }
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index f4786010ab87..0d9e45f36293 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 2129 BLAKE2B 1653b4a027afb964fca99b6746577dc33f34b2be892b266225ebde219c907400ee3bbc2ce46a28ea2fb127266d0106a92ed1c3bfdd7897047486c0f875382a7e SHA512 d1ce88cdd4e92e2f1fc04b55229b421432182479c5e5593afe7f6db7caa9b7b4dde2bb2aa69a2909f0e2d70d3030391edd99d90b36dd3d31d25bcdd7f39062a5
-EBUILD dump-0.4.46.ebuild 2113 BLAKE2B 431fd8ae0fa1c3b28015f27687c28f43a8d6fcb205c97a99f3d4ee1e96d3da7683456f02e4683b85c202848ddcc9efdaac85b63f31e0a4ad5fbf2d430465a8b5 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90
+EBUILD dump-0.4.46-r1.ebuild 2156 BLAKE2B 0b770545667baff0209f8ae80c55784933eebadf45728ad07f2a88f46a842782a3ee8de047fd9286af543081ffa47c131d92ea19674dffd5389431c3b4b6073c SHA512 11ff1d54555148157320e20ed72da5f4298a745c77cf4264bd3766d7e839417d83305a7167748e4c337ed112110c3b159d005639f34d6c0ff367484d862a0c22
+EBUILD dump-0.4.46.ebuild 2137 BLAKE2B 897855746ced0c9d2c292e6de93fca3c3f6cf397c64a83faf076a7cf149f281087d8eec4557fe2bf5e2f9f7094eaa1f57e5864a04db1b562fff1474c7d16a232 SHA512 9948e2cb9ad7baec76d5efbf791c6e9af2584bb93d83eb7baf67e4611ec7ba0b439915e3b2e898cb1f48b255b1a1b43e44da49b497419a561b95b8cf92f716e2
 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 3f2ac26507a8..04f67e84ac4f 100644
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@@ -15,6 +15,7 @@ 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"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	ermt? ( ssl )
 	ssl? ( zlib )
diff --git a/app-arch/dump/dump-0.4.46.ebuild b/app-arch/dump/dump-0.4.46.ebuild
index 90a9eac37dea..fae457dbc978 100644
--- a/app-arch/dump/dump-0.4.46.ebuild
+++ b/app-arch/dump/dump-0.4.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,6 +17,7 @@ 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"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	ermt? ( ssl )
 	ssl? ( zlib )
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 91800ebb7efa..2a1a10106dd1 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,7 +1,6 @@
-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-r1.ebuild 2154 BLAKE2B f6ae6e9e9aab743769db1d3eba4aa35b0a6c6942858276b10cd11f592e5d1027b80b9307c3c9fd3737b72cd7f21c04681a45804bd8255c2e2648c05a39b3b6d3 SHA512 158bed36cb48286a5d65ba2b6edb4e112ea45c5d1621972a4b2d6150d1abbc8bcca6b900231e4c84e80e9ec51f842716c1b793d3cdded64ba8d7070d7c5637d0
+DIST file-roller-3.32.3.tar.xz 852808 BLAKE2B 939b931d7b179cc45ca3766dd122e2242e4de22b8c15f0942c31b5f9b5e8eed9d636122445d265539f9368f86d2efc10af161aaa046b3de6be05072d2b53004b SHA512 8256995f776524772936c6d60777c6c2668a610a672788a51ed83de1ae1c131b12373d2a918658f64f004757bb8c71b03edbf0c89776fcad6d64b4fc7fdb8e49
+EBUILD file-roller-3.32.2-r1.ebuild 2152 BLAKE2B 5e2ef2ad707c1e287b5d22f24631382ad5d9eb70fbbfebc9e08cf98c0ea2fdda16985c39606115209f6e02dd077b822490b00b56dbcd5b452064e6b3f6459ba1 SHA512 8bbf1dd616fb50468752db1ded2364322ec65fd41e66aab2de48693aae10ae6b5efecc3cdec3a0a840c95492aa5287bcc07df5237dc00b1b12a93eab6b42b326
+EBUILD file-roller-3.32.3.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-r1.ebuild b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
index cc5f90b30467..6b9ff1f80b9f 100644
--- a/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/file-roller/file-roller-3.30.1.ebuild b/app-arch/file-roller/file-roller-3.32.3.ebuild
index 0f65e25672a1..cc5f90b30467 100644
--- a/app-arch/file-roller/file-roller-3.30.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.3.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
 
 DESCRIPTION="Archive manager for GNOME"
@@ -11,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
@@ -28,7 +27,8 @@ RDEPEND="
 	nautilus? ( >=gnome-base/nautilus-2.22.2 )
 	packagekit? ( app-admin/packagekit-base )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
@@ -43,6 +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
 cpio    - app-arch/cpio
 deb     - app-arch/dpkg
 iso     - app-cdr/cdrtools
@@ -57,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.22-packages.match b/app-arch/file-roller/files/3.22-packages.match
deleted file mode 100644
index 68f6e30a17cf..000000000000
--- a/app-arch/file-roller/files/3.22-packages.match
+++ /dev/null
@@ -1,32 +0,0 @@
-[Package Matches]
-arj=app-arch/arj
-binutils=sys-devel/binutils
-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
-unstaff=
-unzip=app-arch/unzip
-xz=app-arch/xz-utils
-
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index ec4b4ce4e907..b276178cf5c7 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -4,5 +4,5 @@ DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668d
 DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
 EBUILD gcab-1.2.ebuild 1144 BLAKE2B 6a3c33843b194eb03b929478472d139e35152f80dd466b95b320b6c4089a81b4e0d8e1b99c1ba8a9dbb3d76e792ed60925bde29e0742cc4ee37ac90a525a8c88 SHA512 28030c1f3dad612c89c732657a2b2345cfe0f888c366c8ec814f528abaadbe9365f892cc5b62c41a78040b4e11d5a9a51d0b6d475a6efcc5a1d25038cd9fec79
-EBUILD gcab-1.3.ebuild 1121 BLAKE2B fc70039d0b905a76d306843e2afb824007bceb312ce4d2a70632f2116cbb834cb9e5a0ae470f1e0588a5b95947ee9a6c8748c1b86cfa18ad26ddfe20eac9be4d SHA512 e383c7ff542f5638ec36219b87534c8004ae7a3b31594e9e4416ec96f1d4bc1f64f36b64d501a388badd7efc9fd6589e9f1569cc2028d2840f986408e3dda4ee
+EBUILD gcab-1.3.ebuild 1113 BLAKE2B 233e23a35d44ed1352350fe25f7e0bc96ada38c8f163f3d2cc2338e885ffac7000f7d1887dda0fdf457579ad465b6df72185a94ac673078ea06ade21a733ddf3 SHA512 47f802fad4e2823819f312d2208c9cc4c24606b79679e3a4a3d5b1a710c113a961138ed5946a57479792b8ea395e911c687bbe07b81ba9079c265d2e635c1391
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.3.ebuild b/app-arch/gcab/gcab-1.3.ebuild
index cde2e418f9fb..f5d43164ec2d 100644
--- a/app-arch/gcab/gcab-1.3.ebuild
+++ b/app-arch/gcab/gcab-1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 7a5918f0d3e7..2c6c2388ca93 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97 SHA512 f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc
+DIST gnome-autoar-0.2.4.tar.xz 294956 BLAKE2B 20e2054f996443f7c3d84d91c41705c8c63df8aea626cb54c17a9cb0c20c7109dc1dba99ad9489d8870674b0a3bbdef23da6ef07684f9c01870d421873d5bed1 SHA512 66750ae30bf9f59820f06653898eb33ac4edbb63976a02d15417118a068abd9292350220713813ddfdd1f2e77db7b3a8f8980f0c70a93d1bb87a9405e013de19
 EBUILD gnome-autoar-0.2.3.ebuild 950 BLAKE2B e23df91c9242ce1dc880c39dbbcba5173cc4d7fea114d89685b0eaa50225cdab3de9c5ec4057ec583398bc82e33e0e90fa68febbcc1fac26ccbe102731c71db6 SHA512 cf2cf302e5a97b8c97e34c29fa0bc0a6d695ad243095620b83cd8c278247de70f9c8a209de9bba93937e56ae0fc39822f17a09142e964218515efc1a39bec98f
+EBUILD gnome-autoar-0.2.4.ebuild 928 BLAKE2B 2b7c0490cc2909a3638eec2e69e1bd20b7eb5199d603e600dab4a4f8de5ebeeabf59c166892d0f0f839cdf1aaef1aa05ec797b421594af316725956a310b3e17 SHA512 9f0c273a13e09e5ab068b2f92f7931c163859bf5a5ac66572926a8c20f2bf58f4a44a8feabbd48e9047f8476eda3e8155a85b3207ad4f09a551f2ed161433c2e
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
new file mode 100644
index 000000000000..e5958a97ac09
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Automatic archives creating and extracting library"
+HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=app-arch/libarchive-3.2.0
+	>=dev-libs/glib-2.35.6:2
+	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable gtk)
+}
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 1f6678ec0c07..5e7ff7e1b51f 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 3743 BLAKE2B ad53026271c50eb521b135a54a16645e9e58b594f94af7c10818379b16a141df9babcc410c0082dcc08a5d0d5bb0d8bbe2b8bcc4281d91faecdbc8b3a0f4b3f7 SHA512 8b19c6166dfe2b8b921396bcd771ff53fa2e58cedab0b77182c76b7a5bd97cf6a4374fb3cd184eaddd23b4858ec531af3545f150049463142484dd5b7aea5338
+EBUILD libarchive-3.4.0.ebuild 3740 BLAKE2B 04ab8c8883d737e487a7958126f67ce33fee85fe718a1d96f3ecd2973bce9cf88a5b63ae7a2cd92855829e5b7ded008810d19099a1b84103c504be291214ea4a SHA512 3c01e29150aaf15a326bf8e88357520964dc5f171640c2ffe35517bbfee74669345e55f2e3bd399407866fc14042260d121d720a5bf9751da211f27614f069b3
 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 0c7029be909e..1c960f7b3326 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/lzma/Manifest b/app-arch/lzma/Manifest
index 3e0de361c3e9..ed1079a79250 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,3 +1,3 @@
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-9.20-r1.ebuild 887 BLAKE2B 32ce4e9ca1d660403802f8d5275656acbcfc2e2ca9ff645ac24a00c09f55bf1df1f9dd164b7ac87de77dbf721141b32c3362797667196b944e2781c63c5303a9 SHA512 72bdd25f10cbf4944cf20aef08f5c19d7c16d65179ee99703138bc71524d6e38a64f1aad0443b298919299e1e4acbd1e7fd41cde0c9255ab11e871ba2859b0f4
+EBUILD lzma-9.20-r1.ebuild 880 BLAKE2B 6b08c339e5a1a2b6c3712df866c4fdc4e77a1a135e3a1b91613e14ae718a60695198b92642d3a0c425bdc4d4c5cab72252c61ad2aa51e9565bf23a457c5785eb SHA512 7e4ddfb3d4e99c937cad7c1c8512b1e97c73ec4d2872977e198574242858bea91716dc48aa3f7bf20faaee5ac51e55ae24340e8f874b3cf7716644e3f8ec2517
 MISC metadata.xml 250 BLAKE2B e05a373f0ea02a1a107bb27632d2f6b87bb754d82a7a7c6f56b7bb6041a92a0bea6ef1a6353cd535f5f9d992b10cb68e402c4efa3189d7f65d2c9fc904a4610a SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
index 80cac224e6b3..3be4cdb989e9 100644
--- a/app-arch/lzma/lzma-9.20-r1.ebuild
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -25,7 +25,7 @@ src_compile() {
 }
 
 src_install() {
-	newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon || die
+	newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon
 	dodoc lzma.txt history.txt
 	use doc && dodoc 7zC.txt 7zFormat.txt Methods.txt
 }
diff --git a/app-arch/mscompress/Manifest b/app-arch/mscompress/Manifest
index a841b22140c0..f8337a733b30 100644
--- a/app-arch/mscompress/Manifest
+++ b/app-arch/mscompress/Manifest
@@ -1,5 +1,5 @@
 AUX mscompress-0.3-amd64.patch 613 BLAKE2B 310ad5f0b5f068dfaefe3916d44560a7b29a3ba41a81a87b0db65cf3210a55ec4b7ca4ff1d9c15c282e6d60fa7d5101d65489865276e4e81e784dbb68cfa23d5 SHA512 94d17fa87a0ba7029569da65e8f22af834b557db1c0a4715afe3afcfc6cee63e7bb604bc37f700729c2efe08b38b46a940b4ee8fd426e293747fb4003d7f53db
 AUX mscompress-0.3-makefile.patch 467 BLAKE2B bb5c6f88194ab577e167b0c0ab4f0e8174674d82bd3337e8c618532084811bc0ac8521b2a3950d5cb73d164c620a6ea3a5c22d93682cf75298934be8864495ed SHA512 d633867a102ba099576c6671967c802bca293a81896ba6ecd5486ad025dfa66220dec9ecc4615c97db22deea914183d8dbedf5ab75221abeb5a65e0c7e949669
 DIST mscompress-0.3.tar.bz2 40989 BLAKE2B b8aeca23fb62a6b4b779da4d4155ba835085e79fea0d69d4da2e65ececb856531d43ee45b44c24415d5827c749c3dc7ceff9de3043fc6174244939a3f75b4c68 SHA512 e69a95e9c12979e852227553028b578f324ec38472ead11f9c0cce85b77bc817ea39d5ecf74599c7935c692eaac537456ebefe110400514a3c834b12597dde14
-EBUILD mscompress-0.3-r1.ebuild 789 BLAKE2B c3ea5b73c1631735fd9fea44e7e5a741bbd2d143ddf8aed6112ae763f96a140cc20b96d3dd234a6e3666535f99a8d0f373d1548f1567911a4c60bfcfd08bd261 SHA512 c23d1f7b6b3c18add2795bcde20068a30a385c2dfea8e9d7c852cade54a1b3deb6971413300acf90c6fd800ecc2214cef55b65e3e3615137d600e8a77094e3be
+EBUILD mscompress-0.3-r1.ebuild 782 BLAKE2B 00827b7416c90a23d21f40b4f3138d17f254ece62b1b7d5117941690b28424b4d11f4b091d8c283c502eb8c800b8fbf41871d864d7d5f730671af8ec064c63a8 SHA512 cb8e5f33bc1ccb79e60ad4558d9da2ad342fb084e95dfb6942a44577cbe283ae6219f96c827e891a738c51a196664d14528fef77498307e3491415aa983640a7
 MISC metadata.xml 368 BLAKE2B 7e47a9f9006d136b7482be3211b16fdcaaa9b4f0795fbd155d39dfe1c9b6c53113f5558ec9f93b78ef4832fedf0438c593f62e8aa89fd0598f9b7a12e2370174 SHA512 4e24e69033ec97407b9b9f7a496762b76a54ed9e9135f71c34d5575c8b604c20054fe34d189a54172af48c5f2ab26f167ac1b7b3852a481e70aafbe2d2298f20
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
index 76d6e64551e5..23ab7db21192 100644
--- a/app-arch/mscompress/mscompress-0.3-r1.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -27,7 +27,7 @@ src_configure() {
 }
 
 src_install() {
-	dobin mscompress msexpand || die
+	dobin mscompress msexpand
 	doman mscompress.1 msexpand.1
 	dodoc README ChangeLog
 }
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
index b417b3fcfec0..7eee5bf46a0b 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -1,4 +1,4 @@
 DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
 EBUILD mt-st-1.3.ebuild 570 BLAKE2B 643ee3126a258b136974f5d582e7f20a93480438ddba1f14af47942bce0848d100c28f31487403997cb42cf0eeff7a7f6c1600522166d41dfd414a3489ad7498 SHA512 81bbac5ef51b24e1ff4675d47959bc02f9e7d7c3cb28b16b550451b299ac27327d87ff394a03250eecb517ad8a47391a551baade7ce91c0f09a7920f206ec172
-EBUILD mt-st-9999.ebuild 504 BLAKE2B 2d69178b0c8017e89b955d53b3588f6b5666626414608ec13d235f3b4b92abfddb8491d60bc0f0ad36cb118d7ff5815ad72e0e8e3f37fcd1060ae4018ae52f62 SHA512 19cd995be404408fbc7494c15e2ab29ac50f84b99c14f5293ecf806eb2b179e7277538365d2549de80dbbf5fe5a3c89499c5b82e04892824819999880e967dbb
+EBUILD mt-st-9999.ebuild 453 BLAKE2B 92c6e6718a621bdec7e78722c742ad1deb91da0192f20115b0d941194c4f7bb5ef0f95cb22484815999eb1d44b658498b6584cd0d71c412ffccf404b21910720 SHA512 a1241b5d9bebc4b7bd4e10d939f2f6305b1d166a4d12270484b5533c28894dd361e347b74cbc477b50e00e154c3ddee060a9b46bcef5a4d6bfcaca080d4aa416
 MISC metadata.xml 321 BLAKE2B 3f2c57ecada60ab514926a4ddfe2fc0bdc11148a50bdeed1d336f13863e735f83056d4e647e80995c90fba92466252c2ec202e2fa9e3c667ba5a8ae6acbcece1 SHA512 79dc941553281909153cdda8422d4ac5da172a6d782936986b581a1300dcf4b4781704bb7c730f48905f0dc487f5ce781bd96abde16691d67bf5da220eb94471
diff --git a/app-arch/mt-st/mt-st-9999.ebuild b/app-arch/mt-st/mt-st-9999.ebuild
index 0ec674f2d8b3..6201e07af279 100644
--- a/app-arch/mt-st/mt-st-9999.ebuild
+++ b/app-arch/mt-st/mt-st-9999.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit eutils git-r3 toolchain-funcs
+EAPI=7
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="control magnetic tape drive operation"
 HOMEPAGE="https://github.com/iustin/mt-st"
-EGIT_REPO_URI="https://github.com/iustin/mt-st.git"
+EGIT_REPO_URI="https://github.com/iustin/mt-st"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 226560973733..084aba0b3f63 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,5 +1,3 @@
-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 716 BLAKE2B 1e180fd841b7ff5bbe2bdd0cc9b08c126a090e584dee5589500922927a89f069c389187c93cfff1ce7314574a6a4cf23a3abe834c2dd28443ab59bb9d900278f SHA512 7d97921fe9a236b43814f413fa503169f8c5cede193bd26ffdf5f785aa14223177493b956a26f8deb268bba47392f64e2afa0d889e3bfffec82725428d7306b6
+EBUILD ncompress-4.2.4.5.ebuild 712 BLAKE2B bb5a5564ead615608773aaf8563784876eb9f226809b4a9a9dee6151d299a7333cbdf574098f69d77145f0044c9dc9b4a321d41eef92f7eeb8089c8fffd3b791 SHA512 be373ab7a6177b8436addc4cee127928d8dfd6f746339ed83f79cb09ccee1c0bf75c78a2f1b6f8632301d31add2e5bab03e078f594cd1da169455104e52d331b
 MISC metadata.xml 392 BLAKE2B 1e59934b640d08d7728f15bd88534fb4e72e0c8cc6c39cf4fa5f5a188c4443bfaacf081a8284d2c508806b7c11553d1ea5c18cc477db48fa733875d2d4535cd8 SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13
diff --git a/app-arch/ncompress/ncompress-4.2.4.4.ebuild b/app-arch/ncompress/ncompress-4.2.4.4.ebuild
deleted file mode 100644
index a7820bb9aa6c..000000000000
--- a/app-arch/ncompress/ncompress-4.2.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Another uncompressor for compatibility"
-HOMEPAGE="https://github.com/vapier/ncompress"
-SRC_URI="mirror://sourceforge/ncompress/${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"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin compress
-	dosym compress /usr/bin/uncompress
-	doman compress.1
-	echo '.so compress.1' > "${ED}"/usr/share/man/man1/uncompress.1
-	dodoc Acknowleds Changes LZW.INFO README
-}
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
index 6019ac2140b8..a2a58e9ecf90 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 b385342985ae..48fe3f82d175 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -3,5 +3,5 @@ DIST par2cmdline-0.7.4.tar.bz2 3129835 BLAKE2B 5cdc03a71d3db04928eb818037f66e4d6
 DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276ccdff8bc23d7cc8f7c8aab03f9dc992777fd0d67e39b877ed94b77cca679f5c9d2824c778f6481e71c7120a90b45cc0 SHA512 af91024dc80a4af0935c2fc0b867e57a8d3879d93146f52ab62d8bb105f2c637abe46c762302515417691d12144818446932c970d1018d2f10c0d4e1fa455020
 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
+EBUILD par2cmdline-0.8.0.ebuild 779 BLAKE2B 7d5457b09708c2b9997f43bb17f9374fef1cef3d446440c75708ff9b4086415a1fd1de36b783483458a574332e3179e7fab584ee4d78146fb7ff72a3c7d8e93b SHA512 0210c2e698e549f01fae662fc2733d4ca6396f955580e47353df245521f841ba02e79a9298ce54624690296e3e314651b483b99cf2c6f2ad5b262eaf32cdf0b9
 MISC metadata.xml 312 BLAKE2B 866807207b8dcb08229ab359bf221a77d9ea691eadf983bb99c2852b1b56fb43eac8a34eaa5776e96debc394f8eaa99ac6d215a730def6d2a5d1f672c74e7237 SHA512 575b9efb72218bc82100ef9d466711207c1e24b6ca81f9d31414cb90456d5161b0ffcefbbef16371f3095968463e0fe6528879d1f782b6c7336d16e29d1f9e77
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
index 5dfb2290f555..67f4910edf79 100644
--- a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="openmp"
 
 DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 745ed8437bb1..7a2e0d04beca 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 498 BLAKE2B 62b7fd9b866476001b4b80641fc27d0fe9eb3ed850a45a8f5a16c30d331152ea88613befe155e9287350ed1670d7d01956e012fd501d8d73ffe58580de43e428 SHA512 23391f9aa3e4fc611e28210e725d9a83be068f006e1f7d9efad6eb5105d13cb2f91711627490a78e1b163f3a36850f799bc7350fb00f347c8e898e1a957712b5
+MISC metadata.xml 582 BLAKE2B 8eda723dcedcc22db1de0108f5df5d2c17e2be1a699a27c98f8d59e7af5e5392db29d60a1a5c269341924dfcdaaf48d2679ebfd59fcef9dcc200d35451ec7d04 SHA512 f0484c020eb5fd92997e667764389c25f8dc35f3406a4e1f624ed7a59a30aa0e5b75cb356e85b405a8faf04a7f7a7b2c97ad8c4463051d219cf652049d0c8e60
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 646d5eede948..185deaf2583e 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<longdescription lang="en">
 		A parallel implementation of gzip for modern
 		multi-processor, multi-core machines.
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index cfa9a1c5432b..e5aa1fa9b20e 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,5 +1,9 @@
 DIST rarlinux-5.7.1_p20190427.tar.gz 559019 BLAKE2B 34da59809bbd846ea8a4fc90daed48e18efacafecf4b254e5b40b549ea172f7a399e5dd038d84427430d35392b8c3713921496f46bb9d9ea2e603938cac543c5 SHA512 9819e31cbc016aafdbb6b127b3a9ce427ead65bb0ac685ca0ede5fe1e27626054c2f0e3188b22fb9e4235780bac67f5b514178137891ecd3688ccab58e97ed6b
+DIST rarlinux-5.8.0_p20191205.tar.gz 564176 BLAKE2B 78251a10d995c47766d2d6f0b553aaf1230e3d47b0098a7f137d499d3e182bbebd3d1c35551032f5c88166c646037733f9be8833b05a1aef136918cf2b29b556 SHA512 0b8d2347a4b14e26285dd99add5fdf9c2f1a9d9e1bf7524e7b31052d9aac6337e592da02ed5dc4dc9ab9020587bf89de865b53a5632ac76097c9410ec7cf916a
 DIST rarlinux-x64-5.7.1_p20190427.tar.gz 546592 BLAKE2B 7ca3fcda8d4cba2595c82f6b14845427228904a0ba19e1cad6b812de3941b34f24a575e426198ff49db029f50420f68d693640a6e9fc71f01ccd78478a7e5b4a SHA512 818307bcfb6ed5879c505d085a0430a4b3d07aa2fa9c1f3e04964832e363ac6d2116511aa0cda20cb0d499358a819d1ed03b7db01ff68749da2764fa3487da4b
+DIST rarlinux-x64-5.8.0_p20191205.tar.gz 551942 BLAKE2B 57fb02ee14571e508515b107adbce2055998cfc05c1c0b5d297fdb021c418c59c9e9cf594cdaa919c205193c7f4454af59d68c98559f85e3e8c3b00e7fec1c0b SHA512 625138adc3c9fb0ceca54c72ee53a0c260e9c9ca53df5c192386884474482dab34477b0efeba760366fd31c5c59cdb2baf6516977b5c61927606bbde146ee350
 DIST winrar-x64-5.7.1_p20190427.exe 3145336 BLAKE2B 2f0a70c789d0d3cb97513c712c8179952841752dea7fe0af68bae518cbf74c51ccb9c8d1fb02f56d1f5a43823b53609a3c3bbc42ca6833923988af851874bd84 SHA512 d23d47b66770af4e13a04265d9e4a46d5e62b93361d45b2ad6720b89d638a3e4d59eced1fd8f86d7711708a4158cd5487cf2509c2feb3e32cee368ab113afe91
-EBUILD rar-5.7.1_p20190427.ebuild 2274 BLAKE2B 5e31f7f6facc378c08aeb73459ca7ec2c5159849a8c7aecc93d0fcf042ac79e685d48f0667ac0584cc78b49c50b4c2a08f0e5fdcdf7ed35c12bd85bccc26960a SHA512 cf018d79b31479a649e25279d89c13daa24b00fe9202806bde8ee20f4e076e68fcccc74f9c8ba5c488b594e8c9dc11223571a28f3888946a096c65ffcd525909
+DIST winrar-x64-5.8.0_p20191205.exe 3214504 BLAKE2B 41b23a157c0af9d024bbf404c134bad5d026d5668eb18c7bc21b9627b5b82ea2dcfd81cbbcae8a7150a5f3cf1b7982477e23eeed3640dc0dbf29ccb190176a6a SHA512 7b55ab2daaa9a11e32b9d7ff3df1c76de6786d415a8d3650cfae9b5cd27003b53b67336c8916ed138ccb996797392f9dbd2f49aeea9ba5cef04f6331a82c0e0b
+EBUILD rar-5.7.1_p20190427.ebuild 2232 BLAKE2B 6a64615a5e321272e4517c42268f4503b0756e0c8cee81e9b16123c542e568fb8ee5504c66d14059d209c2f3fb1806867146e0405ff603ce2970f61f5452c177 SHA512 2ef3262db0c9f9d862f2da94fb72a0e513e5f04bf74f51656aecb08b5e786ccdc9abd04d15ff555fe41e5d01cc7b01ef920b58254a52a097b8f5001fba58c29f
+EBUILD rar-5.8.0_p20191205.ebuild 2234 BLAKE2B e7c50034b0cb906be278cdddad45bd171110cbff63b08341f750c09515d7f0f37869b19f66923883841f4271712633057886e1ba1e1e07198a942d939502828a SHA512 435cdfba3707a6d4518172e36226792e88a27439ffc83fa41595659bf60ea8c185a190c6a56e6fc692cd3df691f371a82b8ab99eba064679beceabd15ef80df2
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.7.1_p20190427.ebuild b/app-arch/rar/rar-5.7.1_p20190427.ebuild
index 4e7e71caf696..e7514ff5be78 100644
--- a/app-arch/rar/rar-5.7.1_p20190427.ebuild
+++ b/app-arch/rar/rar-5.7.1_p20190427.ebuild
@@ -92,18 +92,18 @@ src_compile() { :; }
 
 src_install() {
 	exeinto /opt/rar
-	doexe rar unrar || die
+	doexe rar unrar
 
 	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar || die
-	dosym ../rar/unrar /opt/bin/unrar || die
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
 
 	insinto /opt/rar
 	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
 	else
-		doins default.sfx || die
+		doins default.sfx
 	fi
-	doins rarfiles.lst || die
+	doins rarfiles.lst
 	dodoc *.txt
 }
diff --git a/app-arch/rar/rar-5.8.0_p20191205.ebuild b/app-arch/rar/rar-5.8.0_p20191205.ebuild
new file mode 100644
index 000000000000..2c97cb3f6b5b
--- /dev/null
+++ b/app-arch/rar/rar-5.8.0_p20191205.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
+	else
+		doins default.sfx
+	fi
+	doins rarfiles.lst
+	dodoc *.txt
+}
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index f3321392726b..dad198a7f659 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -1,4 +1,3 @@
-AUX sharutils-4.14-popen-rb.patch 791 BLAKE2B 3708a7b94ec238957a94ba8105a13543438d7239fe8d3aa75c970c106b5d9096f65814a53d880324f2ed4fe847dd3db9005b5e667c0a8d5d0fb596440bdb4dd9 SHA512 96b7aa7b594cf2d31b6a0d85c7d4ff0901c66776bf83328651a6717f633d9fd3f0ce1e3185b110aecfb8c59009087b0853cbef3736eaf9aa25a08a11500d4833
 AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b605f0072a15af174f8462f1983833d1314eb3b7dc7763af60f32e6baa054ad00abf4ca4a10a7ae88b59415ab8ea9de3cb674ccf67 SHA512 6415da74c4f6f203bc4ad617bd05fa6ac86e1079538236148763e0b5e81ca8ea4004ea58e9e4755ba371246a7c469ef1e421576260494043d3ce3fc80e73cf69
 AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf
 DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
diff --git a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
deleted file mode 100644
index c502a623c1f6..000000000000
--- a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-delete the run time test which dies on cross-compiles.
-we know the answer already, so hardcode it to true.
-
---- a/configure
-+++ b/configure
-@@ -30745,25 +30745,8 @@
-   CATALOGS="$new_CATALOGS"
- fi
- 
--if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--    FILE * fp = popen ("date", "rb");
--    exit (fp == NULL);
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if false; then
-+if true; then
- 
- $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
- 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index bcf291fda2b8..65c1717d194d 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,4 +1,6 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
+DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
+EBUILD tar-1.32.90.ebuild 2241 BLAKE2B 7278283c24c652daf44dc8b4c9f3874f16d9dd1c951ccb3e3282f0152d2e8d15b8473838fec99214186d0b2f697c001139a1dcea7d2d07f8850e7a0cc43f5e0a SHA512 7ddff2e4d12bbff96553a3b546868fd724b120372c7f3c96393aeb82d26f65699080969896fe2347e0c6e502e11484cc0a216da318e837272dc4327f20ffb327
 EBUILD tar-1.32.ebuild 2184 BLAKE2B 1ac7fc363aca970d2d32adb6194576356a170c866c0065c347fafce0659e343e23f03f2f096fdbaf134e44f16bac9816c785c4788f266986dbaea3c4ec2121a2 SHA512 f5b9bb2b88904a5945b086d6531fa96089b2da890db0a4d16602fa3bea997208d8bfaa7a80ca9b6d22be7c9d0d62a87e5166ad5ab534d76f48a24fb1fffc777e
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32.90.ebuild b/app-arch/tar/tar-1.32.90.ebuild
new file mode 100644
index 000000000000..64746b702785
--- /dev/null
+++ b/app-arch/tar/tar-1.32.90.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.xz
+	mirror://gnu-alpha/tar/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	static? ( ${LIB_DEPEND} )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
+
+src_prepare() {
+	default
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(usex userland_GNU "" "--program-prefix=g")
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+	)
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index d52d24dadd32..49ea6a263698 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,3 +1,3 @@
 DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
 EBUILD unar-1.10.1.ebuild 1182 BLAKE2B 19606fe1687ab46d2080b7441eed97febdba4d99b738e2b2251007d66d94a1d46c5f628ae8c4ef2ec8fdec2e44fefe26c6acc30135fd57af52ce3d00b3821e4e SHA512 2ecbd3d4d8061c2ac9f1f8e3bc0deb978442ebe38d0f9adf35670619f322b754583b292c095a775f0a3e22260a7ca02857e99c6bf1286dac4e6628ef6f07f567
-MISC metadata.xml 299 BLAKE2B e4ba80605afa425e3affada863a2816f561e3ac3a7eba58e6392df43b9772dbc8de406a660688c556a4ebcd48647722bbb1139b2016596901a34712b9a8d4a31 SHA512 6b3bfdb09755e678dc609356ff3819f66574af5718870ff7f2ca29a6f1a1c85e1cc781d713bd27ebc8ae2d44171efabd3a69202f3b1c75323c4f410136c2850f
+MISC metadata.xml 248 BLAKE2B 599a4f7a35f351c2eff3a57bc358edd8d6b6f67d5e4449f7d7490f0c099895c4a9a0e9d1a032ba616e97f2ba0961f1e96216f65bce98a9af5ad316f252db4a6e SHA512 86371924ebb7220e7570148b5592414c4f2d34d2f93067943f00cccd9d4b9866b3cbe13a674526e61f929d9a004237fb1ff80c59da2e6a798b2b42393e7f87d5
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index 0cdd2da33f04..a7710862b88e 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="google-code">theunarchiver</remote-id>
+		<remote-id type="github">MacPaw/XADMaster</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
index a35d6b223189..7bc0bae59978 100644
--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@@ -1,4 +1,4 @@
 AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 BLAKE2B 9d060bc629bfbd669f0effde2d31d7571ad71041a49a66da003c49a383fc119013a3aeac5c39c1ebfce0e9c0642d5c394d823cf9837b31c1d4172818ff403111 SHA512 c5e683398572889e4c09d3dfccf8847566421be5e3a56d086217ebbb70c17c4ca23c124cfe5d146e7e5b71e0ecce914575c1c50bdbc8438d3f00a6282790edca
 DIST unp_2.0~pre7+nmu1.tar.bz2 17537 BLAKE2B 7ef6cfcc524daf95c7cd9dc41ba690cb8db1b1983cd45709c8764591af36d6d00631975bfef0359ac633aae1c11b73efe827e367931f73fe7c5fcc8832b0fe84 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362
-EBUILD unp-2.0_pre7_p1-r1.ebuild 1230 BLAKE2B 9f89106a462a6e5ac713f7a5b31e8cbd394318642f8e11f73f10d64e1654705045c2c382d96bd59f24656ba09f66a469b84fa1179945dff36a92aa9714c38fb0 SHA512 afeb1d792d4a30a9b4db076080d44c201bd85217350f211db0ea22db428070a73cd7473b225b9461128bb652d3fdb14742a09ebba202a7e740ef7fcaabca434b
+EBUILD unp-2.0_pre7_p1-r1.ebuild 1186 BLAKE2B b848b83c759df2f5b75266e0cd364c19b348d19343df3876f35cac50e0ffcda4b9594afc783049facb662b5922f01f61712e4ce09098d9a9cd9e4873c95fa6c0 SHA512 24a67fab5f587b547d9e44331fbafb9c80824cf3610b8f62c84c9c3974a29aa908810e7d3640dad955c682ae1db13cfbc996bdfd7377613e9dd8890d0c1d75c2
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
index cfaff187f34c..cd6ef967dc03 100644
--- a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
+++ b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
@@ -36,9 +36,9 @@ src_compile() {
 }
 
 src_install() {
-	dobin unp || die "dobin failed"
+	dobin unp
 	dosym unp /usr/bin/ucat
-	doman debian/unp.1 || die "doman failed"
+	doman debian/unp.1
 	dodoc debian/changelog debian/README.Debian
 	dobashcomp bash_completion.d/unp
 
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index d55d0213bb2a..a5914015091e 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,13 +1,11 @@
 AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 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
 DIST unrar-5.8.4.tar.gz 229618 BLAKE2B 3b163a7d3a13dd5864ae729eef6c6bc171e45b0db4e716660b24a14ecf035572fdd1dc44a9c59d07d9fde87255b941f45d5b2e0aeffac3a53b021dc1cbd4b0f1 SHA512 dd3502662b443f05c7bd01a50806b9e3443f9bbba7d88ee8fe9ca0d671d93b0db8956b822ec25b9d827941313ef2ec5608f15934bab91cecbab1ccea9ae8129e
+DIST unrar-5.8.5.tar.gz 229641 BLAKE2B 132453d2e2ddb1b1b2151be15bd092dc06fe7ab96d8fa640db95dc1acdee90f6b259a5d04c1da959a398e3a9beb22862a14db9b41b19055771373e00d89e958b SHA512 bacd36c78c6bab2720b13796b73b376bd0ae693916b8130637cc4e6bbd76f6bd103347d9033d2d6cf6301587ba62449ec88b3aa4c18c8557ad5ace3475b41a7c
 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
+EBUILD unrar-5.8.5.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.8.2.ebuild b/app-arch/unrar/unrar-5.8.2.ebuild
deleted file mode 100644
index 7fce116316f4..000000000000
--- a/app-arch/unrar/unrar-5.8.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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/unrar/unrar-5.8.1.ebuild b/app-arch/unrar/unrar-5.8.5.ebuild
index 7fce116316f4..7fce116316f4 100644
--- a/app-arch/unrar/unrar-5.8.1.ebuild
+++ b/app-arch/unrar/unrar-5.8.5.ebuild
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 236ac9efc8a9..6567e4c88853 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 2577 BLAKE2B ba24476ac3ac14cf4c1fcc592a8bb29615f118c24b9e6f5dc033a48baee25c6be851066dd7507b983cfb39bea65df92454fb26bfb1cb7990120825b8def2916a SHA512 37e76360536a3a0f10aeb59efa1b268239696a8c0bbb49588dd6de872ea0d827a7670299364c918b48121b91180770990dfec93fe368dc4326ce8e5f240341af
+EBUILD unzip-6.0_p25.ebuild 2576 BLAKE2B 11b47f68f793109966ac9b13251ed127e4f24b1a71c995368fd6f3f6ebbd3ff2820af37d64ab14d74d41f54bf3261901f9c4325e0f93a53f0f7caf8b3f275d60 SHA512 f2ba479e63b05b3d10ffcd14da1de4e73f4afc8c4702dc013a95d61880791a9880d92e2518e75e975b26c730559f48bd6bb35b7680c2e53b252527f9aab2bcc9
 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 cbe2fef00066..4bd9d56efc02 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/zopfli/Manifest b/app-arch/zopfli/Manifest
index 7b00c42470fa..eb7fa3de26a9 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,4 +1,4 @@
 AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
-EBUILD zopfli-1.0.2.ebuild 954 BLAKE2B 938ebe7b1edb90d019328e84827732f831b97e08fb6f3597c83caa7353fdc3dd9428661b870a58d00c12a67e8447a315f47487db21a2a3e3405687a4b17ac248 SHA512 156ae12f2cd0eca35efc8fa2b2b51bbb4b5316ddfb9fc846034ca29c2417525427895ed96a7223043d3a2b52811c4cda930e845b24ff19e42ae69b96ebdb3dab
+EBUILD zopfli-1.0.2.ebuild 965 BLAKE2B ff6941ea265827655b96a6412c8033f0ae7f79528c0c86e8d88d83b837100e92c2d76dfcbfe44088f7688ce280600cf097036d9e0f89a4805811af6dbcbf1471 SHA512 1dd684366221ee2dbee96460779dae8325784881769d7c9ca408ed6bffd76ec3497ad34f1c945b520655fa9a03f448507d6dc870dde2093b73d4c97401d6753d
 MISC metadata.xml 384 BLAKE2B 0ea1ed6757cfd935a4e46b926d33891d99b5c943cd3145e9587b1e3d905d27c3756820f6d530afc329a552777ef19c6f4b4c54ae67798fd813b20363133a75f0 SHA512 f096a21a2f292028e07d029df22a40c252809879acc4b40c31c1bcf157c5ce28da0dc9d7466bfe6a6f13f0e61ac2d0e46e7a082135d7ae5fd945faad4837104a
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
index a64e65d0663c..cdc6ce05d9eb 100644
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )
 
diff --git a/app-arch/zpaq-extras/Manifest b/app-arch/zpaq-extras/Manifest
index 9d076c82cf5c..71efee32bd8c 100644
--- a/app-arch/zpaq-extras/Manifest
+++ b/app-arch/zpaq-extras/Manifest
@@ -10,5 +10,5 @@ DIST min.zip 9560 BLAKE2B 45eb51bfbfbc65506df34b0967068e318f1f1834504d2b3df9d3af
 DIST zpaq-fast.cfg 359 BLAKE2B b441461e367f6d7e49da9ed6a23dfe8d4bd8d75f516cd47a8c46c04835267026558fec5890f46b0fc04c2bfcfc1c16ebe4c0e5a21fa0e3b671290b68185c812a SHA512 3f1118bdb61bea4c8df4e7a88a9ae079aecbe9f1dfc2aa7935334d330d374a248ab2327da9524857ca9c2b214ac32f3d2dad6ad420f0688b65384c2263147e57
 DIST zpaq-max.cfg 1754 BLAKE2B 5d522fc6afdfa3376d971fb57b94d1f2e916ffaf93cc7900472650ff928feb2c55e30fb92ff6e12b47266d17f47804fb4a223d57726c95740b9f636ae64b0326 SHA512 12758ea633cb37619c26753f8a4f368a1adc1b682a3ec738e36b8f39bff06f81dd9b37f9b58839ad43488d9b821690a9cb43e276da88f36d1b20f842cbcab70e
 DIST zpaq-mid.cfg 786 BLAKE2B 4f12176d42628eb85424490219509c0c272258ed260cecd34e772a4f42961af51a31ed8e9bd47cc8b0622673f5d3463742ac4d4f888b33af7f06e05bc38ea415 SHA512 ef08f70b5541396a690b7df630ddbb9fb3093b7617acb26394e9f7da40d5191343500bb0b6f0e66ed73fc840b7d5666cbc47a74f7eabba6abbe3743de7db7235
-EBUILD zpaq-extras-3.ebuild 1527 BLAKE2B 6815d1b6978320e47b4404b03d42f304b3c79283e1767cce68c77310794b68260266ffd71ee7614b96792af3190ae4a1e8ee42c6f44c268a805f50d5b392366e SHA512 5284467d1e4c8b9642b34f4230ed909999c719d0c58a7029666677044dbfc13ebfe062dd8241168b392d037a8d26b19d6996c170dac0714417809f2a3d2b9b86
+EBUILD zpaq-extras-3.ebuild 1506 BLAKE2B 046476d3c09ef2c681ddc01ae09b07ecdcc1ca0b48184d13acb402dad9804980c259c708e8125a2bd81d17bae58886355687e472622a0f01a740f680e09f4181 SHA512 1ae8b9e27e706fef21467907e1a3ef84743c9261ed6d62f5184bead0b98aa4303aa3775a5a58363dde8059476a5b6c9e33874e68fb95993ec3e2ae159fa47a40
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/zpaq-extras/zpaq-extras-3.ebuild b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
index 7c98489f1949..b09605d9151f 100644
--- a/app-arch/zpaq-extras/zpaq-extras-3.ebuild
+++ b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
@@ -54,13 +54,13 @@ src_configure() {
 
 src_compile() {
 	tc-export CXX
-	emake ${progs} || die
+	emake ${progs}
 }
 
 src_install() {
 	exeinto /usr/lib/zpaq
-	doexe ${progs} || die
+	doexe ${progs}
 
 	insinto /usr/share/zpaq
-	doins *.cfg || die
+	doins *.cfg
 }
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index ea2338b1277c..9b540e02018a 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,9 +1,6 @@
+AUX zstd-1.4.4-pkgconfig_fix.patch 2371 BLAKE2B 534be17dbd9886687b6d86a5bf808d674fda79492f59e1371147c1bbc2c102f98870c17bf451702edec7a7d4c01cba5ed975f0f1f03b1673ce0f108f5b6d353e SHA512 b7a9f10a878d52de87c599817e990d8dadf8fa7847ffc79c667842bf4d80c83c0a4e59d6321427aabe9ba02e93a58b1e86b49033dffb38dfba477997ad96ac59
 DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e578d70d9fbb1678cba314c90a60339697232a5515990505e3c889aac92c3c2c4c3fc48e0d434b4dfd6cac9df1 SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738
-DIST zstd-1.3.8.tar.gz 1875233 BLAKE2B c9775b0e33e61d2c064df60a266246f6b9b65b70ba2cc529633cf700b5dcac795e13ec0e20bd51bdd02ee5fddbc7f2fc030902ee37a5a433c2d7828c285b3c23 SHA512 834f7b6477c1e7d70f71105ea52be15c33866b48b93b7a3c6dff4f10c761e5ad35f3903899516317690a4b768051f6eedf7c030292f57cea5613d4017fab9466
-DIST zstd-1.4.2.tar.gz 1909790 BLAKE2B 7b420caf91bd2e9739a26e5ea61c0c5b7d9d6d8e6630612fd66fec24203bc38ae7ab527587318c09997e1e577210b748576d8cb40a0d8dd366fafc306b28c0fa SHA512 5473502093332401c83b02e4ac66b2e05f32f710121d371daf164d8b002be9c06c51578bf9fed0ffb70bb67a0c64457b0e7a02f0d1ba5d36b1f3b6dde93ff907
-DIST zstd-1.4.3.tar.gz 1911868 BLAKE2B da4c4b4f6afc36a23a13a9582874891ad206b01dc805f9e79879cb833b47c0bb18ec1b3bb5c0b99f4e8707d21659ca0b7446a84d15f513a3fcab206bc7f49539 SHA512 ccda90c7437635f92d0db39dfba3604e256f1f08284c35c042763a54b0ead45dca8e7fa3e5cf8032292d1dd9eefc1369e23f78a80d9335d69170563090677d5f
+DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
 EBUILD zstd-1.3.7-r1.ebuild 1345 BLAKE2B a6162c4b43128fd005ee2ef916dbaa1b2193e5e62ac745c29a05b88b272921b8557af64cb56185d58657a9d58ad156ea9cd6ded9d2bec5938b1b749755f5278a SHA512 5209f66e534b09c1de77db8f320c8ec2878051de5a500a671d164441ec89334406c5177e18d0f0385bb734bf9052057c1d63aba461c6008811479b420f15597e
-EBUILD zstd-1.3.8.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
-EBUILD zstd-1.4.2.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
-EBUILD zstd-1.4.3.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
+EBUILD zstd-1.4.4-r2.ebuild 1443 BLAKE2B a3551c159df6a6aeca641aab738a796a225e4346d2f1e716508bb3244bf37120b6b16b391939a80394e1d4550d5672b79131226e58f6b21be38bbb2b6c765841 SHA512 3f39c47f535388a2c7e2c4abd7b366e6c7c2b1a26b6dac12d4f5139ad9a040b09518b7c17228d0e42487bac8ebcc077e835b5068ae1ec16447681191bed0512c
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch
new file mode 100644
index 000000000000..2fab9804c139
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.4.4-pkgconfig_fix.patch
@@ -0,0 +1,67 @@
+From a025c46969b76a10ce1618df4dbb11a09563c413 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 20 Nov 2019 16:41:18 +0100
+Subject: [PATCH] Revert "In pkg-config File, Derive Lib and Include Dir from
+ Prefix at Use-Time"
+
+This reverts commit 74bd76c3ffb3837a3fefc055edbc347620447236.
+
+This breaks systems that use lib32 and/or lib64 instead of lib
+See https://github.com/facebook/zstd/issues/1900
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ build/cmake/lib/CMakeLists.txt | 3 ++-
+ lib/Makefile                   | 2 ++
+ lib/libzstd.pc.in              | 5 ++---
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
+index 7adca875..77b389ca 100644
+--- a/build/cmake/lib/CMakeLists.txt
++++ b/build/cmake/lib/CMakeLists.txt
+@@ -134,10 +134,11 @@ if (UNIX)
+     # pkg-config
+     set(PREFIX "${CMAKE_INSTALL_PREFIX}")
+     set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++    set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+     set(VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}")
+     add_custom_target(libzstd.pc ALL
+             ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc"
+-            -DPREFIX="${PREFIX}" -DVERSION="${VERSION}"
++            -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}"
+             -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake"
+             COMMENT "Creating pkg-config file")
+ 
+diff --git a/lib/Makefile b/lib/Makefile
+index fd1710cf..97375ad2 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -244,6 +244,8 @@ libzstd.pc:
+ libzstd.pc: libzstd.pc.in
+ 	@echo creating pkgconfig
+ 	@sed -e 's|@PREFIX@|$(PREFIX)|' \
++             -e 's|@LIBDIR@|$(LIBDIR)|' \
++             -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
+              -e 's|@VERSION@|$(VERSION)|' \
+              $< >$@
+ 
+diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in
+index e7880be4..1d07b91f 100644
+--- a/lib/libzstd.pc.in
++++ b/lib/libzstd.pc.in
+@@ -3,9 +3,8 @@
+ #   BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+ 
+ prefix=@PREFIX@
+-exec_prefix=${prefix}
+-includedir=${prefix}/include
+-libdir=${exec_prefix}/lib
++libdir=@LIBDIR@
++includedir=@INCLUDEDIR@
+ 
+ Name: zstd
+ Description: fast lossless compression algorithm library
+-- 
+2.24.0
+
diff --git a/app-arch/zstd/zstd-1.4.2.ebuild b/app-arch/zstd/zstd-1.4.2.ebuild
deleted file mode 100644
index 2704ae6a18f3..000000000000
--- a/app-arch/zstd/zstd-1.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="lz4 static-libs"
-
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${@}"
-}
-
-multilib_src_compile() {
-	mymake -C lib libzstd libzstd.a libzstd.pc
-
-	if multilib_is_native_abi ; then
-		mymake zstd
-
-		mymake -C contrib/pzstd
-	fi
-}
-
-multilib_src_install() {
-	mymake -C lib DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		mymake -C programs DESTDIR="${D}" install
-
-		mymake -C contrib/pzstd DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.4.3.ebuild b/app-arch/zstd/zstd-1.4.3.ebuild
deleted file mode 100644
index 2704ae6a18f3..000000000000
--- a/app-arch/zstd/zstd-1.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="lz4 static-libs"
-
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${@}"
-}
-
-multilib_src_compile() {
-	mymake -C lib libzstd libzstd.a libzstd.pc
-
-	if multilib_is_native_abi ; then
-		mymake zstd
-
-		mymake -C contrib/pzstd
-	fi
-}
-
-multilib_src_install() {
-	mymake -C lib DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		mymake -C programs DESTDIR="${D}" install
-
-		mymake -C contrib/pzstd DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.3.8.ebuild b/app-arch/zstd/zstd-1.4.4-r2.ebuild
index 2704ae6a18f3..4af98aeb8cd8 100644
--- a/app-arch/zstd/zstd-1.3.8.ebuild
+++ b/app-arch/zstd/zstd-1.4.4-r2.ebuild
@@ -18,6 +18,10 @@ RDEPEND="app-arch/xz-utils
 	lz4? ( app-arch/lz4 )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.4-pkgconfig_fix.patch" #700780
+)
+
 src_prepare() {
 	default
 	multilib_copy_sources
@@ -37,7 +41,7 @@ multilib_src_compile() {
 	mymake -C lib libzstd libzstd.a libzstd.pc
 
 	if multilib_is_native_abi ; then
-		mymake zstd
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
 
 		mymake -C contrib/pzstd
 	fi