gentoo resync : 09.03.2018

34 files changed, 181 insertions, 66 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f8059ca9f9f3..00e8f8360971 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 6be6925adbdf..82401e66332c 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,5 +1,8 @@
 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
-EBUILD brotli-1.0.2.ebuild 1436 BLAKE2B 78bec30959050bcccb6c08b7e35155bfd22cf28b593a3e956e4a6dd04e80636cfc60b986996496d259db46e86d126704c9d90b64dae94a1c79fc32840073c607 SHA512 403d5d3646b43b4276178a48737b5b11f046b72a1f00586283f5681eb1f3a3f1a00372ccb2514c970badbca5326bb6d86ee7cc3d064e9799c78733d6952685d3
-EBUILD brotli-9999.ebuild 1336 BLAKE2B 920c9159f284dcbf0246e52d28048aad22c4803c0950a101093afeabf45bc7b109216ac8bd54676a27ec579cfa49e4ed791cb944c7a9d4ce9e376e85f22cdebc SHA512 2686041468cf95c7dafa9571c6c4997f5ddc9440593e35f6d8526af7df8a2cd249af9e5b0ddf04a272cc8f6497db5de77c628641d2867e47cce6b099e3b187af
+DIST brotli-1.0.3.tar.gz 23815300 BLAKE2B 9569267782a8159d290e0f1b524a985144d1ae68a45a732443aca973dd0407c50249ce62389848d97cbc33eba3062ba471064570418c36158b97935ae4b7fb73 SHA512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c
+EBUILD brotli-1.0.2.ebuild 1435 BLAKE2B 25faab9a59c69f9e88c5ffc5a3d72d91bc286b3299461965d1a87c92a04faa6c0a86e62f30a11f3d188362a0d0c7bfc115a6de62e7e3b4597d0b7595e522276e SHA512 ffb4d312fc88722cbb76da80da6884202bf5253129eb761c6f7fcefdc3be69289f2e4b4ad2e09da98514a171509ac1ac31d5f866487982fcf6447ce43422f0dc
+EBUILD brotli-1.0.3-r1.ebuild 1415 BLAKE2B 74aac94ceb91bcad66b6d0a40e517c65a21372769350059b4db5a76983489d815afda83aee3c59a25fa76fe6efe03e024a820c0030640df48e28a9d53eacb2fe SHA512 6b5ca88ade200e2af7b1b0f93799ec051af5294bdce5a12651fa72ea429b9232776abc49521829251690177728b5b3a01ac9486d915040b242f8c92ee57773d8
+EBUILD brotli-1.0.3.ebuild 1398 BLAKE2B 7cce4fc14efb56d134eea51714e12c1dde687a5d57daa2d27a94d39358a26633dfb0a380872bc9a32e32c4d772fa8602eacd5f857c85f4dd5e096c4783b63e93 SHA512 8210643e246c6172946577112adb0bd721f2a4810461db192ec2b2e2bb7ca917b5dde061ce760aedfc7d908a5944ec4dc89ace253adf79b0337b0bb2b0f2cbef
+EBUILD brotli-9999.ebuild 1415 BLAKE2B 74aac94ceb91bcad66b6d0a40e517c65a21372769350059b4db5a76983489d815afda83aee3c59a25fa76fe6efe03e024a820c0030640df48e28a9d53eacb2fe SHA512 6b5ca88ade200e2af7b1b0f93799ec051af5294bdce5a12651fa72ea429b9232776abc49521829251690177728b5b3a01ac9486d915040b242f8c92ee57773d8
 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
index c1b84d415710..55bd8261dd7f 100644
--- a/app-arch/brotli/brotli-1.0.2.ebuild
+++ b/app-arch/brotli/brotli-1.0.2.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.3-r1.ebuild b/app-arch/brotli/brotli-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..98869f75b246
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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
new file mode 100644
index 000000000000..f437159d3521
--- /dev/null
+++ b/app-arch/brotli/brotli-1.0.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,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-fbsd ~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-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 5b876796ed3c..98869f75b246 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -6,12 +6,12 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 DISTUTILS_OPTIONAL="1"
 
-inherit cmake-utils distutils-r1
+inherit cmake-utils distutils-r1 eapi7-ver
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
 HOMEPAGE="https://github.com/google/brotli"
 
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1)"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
@@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index eb1a20ec0e5d..5ca119f1fde3 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,3 +1,3 @@
 DIST cabextract-1.6.tar.gz 241731 BLAKE2B 49a94b1b0d8a6c9f61cd51280a035e3fedb8d7a2d097b132bc56114c6003a558647a7f8c47b8d08fcac1999e68bea5303adb2b03c8e6dd010995e8b0c6dcd442 SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8
-EBUILD cabextract-1.6.ebuild 1113 BLAKE2B b6eb355a7a1a490554e78f09eb368ff57a754f9a9a3d573c1475aa8d2a34d06d419d1a82456d177f6a63f5cec7de15c134829439c393d720500a2e596fe30197 SHA512 663e8abefed38e1a9b7b2b4ec27a95f0269ff0ef2591c0acf8bd04414a5248ade8dbb7600089bec0c0ff1c99f4b22bdb954a90d12b1441e7c2e14fc71eef0702
+EBUILD cabextract-1.6.ebuild 1115 BLAKE2B d6898fc1ef97920e8c7a54d3f79963a59f93b90b0c432f3cf088efaa202a4eb37b1385cdae1c2f91b97f3252938216f55192851291824c33c79ec02df6f7a08e SHA512 10c82fad424f0e5093816ebab945c37e88180618431be7b1068c847534ceb83e3e9ee0379862ec3dc312b65b01cfc2954d3300dd98d36455421d6814840df534
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.6.ebuild b/app-arch/cabextract/cabextract-1.6.ebuild
index 42b906cd2bf7..da02381ab494 100644
--- a/app-arch/cabextract/cabextract-1.6.ebuild
+++ b/app-arch/cabextract/cabextract-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="Extracts files from Microsoft cabinet archive files"
-HOMEPAGE="http://www.cabextract.org.uk/"
-SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"
+HOMEPAGE="https://www.cabextract.org.uk/"
+SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 55e7943be225..224c2726d20c 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -10,5 +10,5 @@ DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a71
 EBUILD dpkg-1.17.26.ebuild 2370 BLAKE2B da683d7db12e5f67733ad3c2c7436d3582629e8468f37afa883c9ec018691dd7548654611c11cc673a6f8bdd6641131e1b45d0844215344c27b308b211480445 SHA512 5799c29b185f008856ce1480bbb06ba350159562f6de042c7660723f02c60c2ce40d7223bcc6dd45fe11486423cab16c7ff34b5758a4e60bb32dc757d63992ae
 EBUILD dpkg-1.18.18.ebuild 1846 BLAKE2B dee5063b678be9ac8e5d4d0978a2c6658b19a2f0f4d2c49770b11c0af6f47655c90cd4b7f52f6888255c2604c3f0c6ae6155a7f0e2d9caa79ff1f5be9808081f SHA512 54440e27a9079754b2667a3321c3828596be222bf43d829accad90b0c48424349d1644f188efe7e83b0f199e9fe1e783738306f9373e032b06d3f1c4fcaee15f
 EBUILD dpkg-1.19.0.4.ebuild 1854 BLAKE2B 819c4a7e9c03b9f36dcc6c5e61635ae5a6e35824bc10a678ea653844d00bf9b4bb3bf25dfbcaec6dbefc77d592d200d822f59e7b050c2ddbb9da27c6ec68e617 SHA512 8e33864cf024978a2c1dd44e9e3cdb8ef24d75a0e13e74964737ffc788555f8ad0d51cbeec91be2b2ce1f11c329d7d9355899119133d47e930a5156cd4aa4492
-EBUILD dpkg-1.19.0.5.ebuild 1849 BLAKE2B 9e1095d839a545543f3272ad9be205a4ebc9fc1c3772de6ab5a2c83220162f0e00774d1616f1796d9830ec79ce9422a373371c9057ab242786a317cba13ce048 SHA512 d910e255f407a3540e1b35140195321280cec30bdd6ae389a33827a81225d2bf40bb967334b2c1b1c4347d51197d2eca3aa4160669ba907d9a7cbe56ee9187f7
+EBUILD dpkg-1.19.0.5.ebuild 1848 BLAKE2B 026c0ff169ba380a54605279182de77b13269c3293fa8d51e5d0f854e7220504953833d6658d86f03d435619af823406e0f8c7cbcac5241fcc039e7073ddef76 SHA512 bfe3c353e72084ba8829741496bdbd58467bee72b2147b769c9edfdaf5d8136f771280a81d4a433a55631c241f13f9c8e353bea05df65cad301680c84fd7e906
 MISC metadata.xml 339 BLAKE2B e4de06c58c3013dcb9ca8065c85811113f04df7c75283e405ea8670c8323eda1488d662b8281a4afed93795ee038ec6c4a4b5eb08316d4472913e08a67a03060 SHA512 c3fbabc925c3e99f26c6441cdea9626dc93520f2a8d3c5e45bfa7e51d42095295624f0f82377240f0c11580a9eccc5b5b15bf149ce6cfa36960e52f8c77aa61b
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
index 31de9294713f..8bb605e25c5b 100644
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 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"
+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"
 
 RDEPEND="
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 108ef4c4ae7c..8ab58f3131a3 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-autoar-0.2.2.tar.xz 295488 BLAKE2B 33f614846547921b208239f7756cab3561ec417f2030e3196bece43c47af2a6496fef82838d90fa3ddcf8742023b525bc4e8cbdfbf3fc925c92c74a8a6918c3b SHA512 78faf8f82eeab4cb5f1f364d6e9caa4d24f21f9b81a79ebde4404253f3e7ae120f44600f236612859810afc6fc6f1a8c6f2e065db98be79103255642139c10a2
-EBUILD gnome-autoar-0.2.2.ebuild 947 BLAKE2B 79e1c67356f9359918c0eff408c71ef25ca8531e51a551bb2a8db7fc34f5c12b29371cd85f8cc97923276d2ec015292d555cdeba48620b4914182379236dbdf8 SHA512 af414338b33c8e851d4cc3ba1d453a72b4c72bd114c1635841b6bdb8e78b70b98de1459ca6d07a2ed77e224690bbf43d26de11ed6ad8d1b4a46a0ad6ba23b393
+EBUILD gnome-autoar-0.2.2.ebuild 954 BLAKE2B a0de53e098a86a73d9407ccd80efefbe1680d0f4fd674fa48ce8ffd14efe859e4212044ab671824cd7b56b7854754288e786a1ddc44a8db67fcf6993441ad5d4 SHA512 d90f8ac96987ebf8f2083c1885475d08432eede009d32713558bea7d9ff725d371008b88b1a77a0a84624346cfeac09cc5812d1fdf136a05021d22d4dc691960
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
index 5943841eaf9d..ee8ace2a9598 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.2.0
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 7555e8587bd7..858d0190d5eb 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,6 @@
 AUX libarchive-3.3.1-libressl.patch 825 BLAKE2B 63babd383dce64f836a84db3c336c865d1740f30df45838a7cba178499f110aae1883dc52189694ce52f8c7966dbe1af043a8043586a2476395168935713c3e7 SHA512 2418a281562ee5f0e4f54ca181c68265f6b72a80786d17f45547222a3fde83597a17d88075e5f9c5d52a2688d8890006f592a129ddc634397a9160d16724a12c
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
-EBUILD libarchive-3.3.1.ebuild 3288 BLAKE2B 7d8faae5223363c4bae7aaaac3d2abe41c527e78a2ba0556cf4c3bd07f0d7083708e8301692294acde86a67f0a0078c8cb0b5b8ac28794ca0bc4b4841696cb4a SHA512 17016296510689034c17deeb7959ad16bb616fc74322bc7c8d35292c5b643d5ff3372be6bbaff875b766424d650f6c9dfd8e46abc0d9962681d11ecdff57fb73
-EBUILD libarchive-3.3.2.ebuild 3302 BLAKE2B 31643b957883b0adda19097444010d8816635f439c7286485d42a6d7a28cdeb89f2101df0bb09486e12d5839de5450e972a9c280d6b26ce7b83fc6ba150b9d8a SHA512 d6c9ddf2639c28824e3456ed07814bcbc502050a261bcb1af2d890b60d4c489c5b658e2b23496c143e3ccbdab8535f28032381af3da08ee9e35ceecf4a7f848e
+EBUILD libarchive-3.3.1.ebuild 3422 BLAKE2B a22e236feb74e439b4eedab79813daebda1e39515ef943d5d34d2b20175fd1c443cfab11ff48f0bfcfadd3563297dbe4209e85b9a236cf753f8bfe8f037f2928 SHA512 a0a518a04f80992d5be71f637e90fda490444f0830d05621a914b78fda80fe7f17a9673c6059476394c5089bb79abc75e6d0cb92f6706bd0f0985bee74fbae3d
+EBUILD libarchive-3.3.2.ebuild 3437 BLAKE2B 97f69b52e9771389f33139b9515d71570bde74ac851eda944d625952c07887b3d8213ed18c078d7564b25a4706609cd93ffc6d95619383858a4c83fa487d3cbc SHA512 adfbd80e2ecbeccfe90b0533b4b7453e8c9963da68f92d22b6733e07cc5516bf6f16a863e85d629442dfb88fc0d966e528793dcaae5fb8d4321e1bd28c99c481
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild
index 6a9a79b303a4..7df8e69150bd 100644
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://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 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
 
 RDEPEND="
@@ -39,6 +39,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.1-libressl.patch
 )
 
+# Various test problems, starting with the fact that sandbox
+# explodes on long paths. https://bugs.gentoo.org/598806
+RESTRICT="test"
+
 src_prepare() {
 	default
 	elibtoolize  # is required for Solaris sol2_ld linker fix
diff --git a/app-arch/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild
index 2d3909ef1f42..f68b736c9464 100644
--- a/app-arch/libarchive/libarchive-3.3.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.2.ebuild
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 		e2fsprogs? ( sys-fs/e2fsprogs )
 	)"
 
+# Various test problems, starting with the fact that sandbox
+# explodes on long paths. https://bugs.gentoo.org/598806
+RESTRICT="test"
+
 src_prepare() {
 	default
 	elibtoolize  # is required for Solaris sol2_ld linker fix
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 867b1e82d761..5a5cdf62bc63 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -4,7 +4,7 @@ DIST lz4-1.8.1.2.tar.gz 228640 BLAKE2B e5e7176dcce5319e2dcb1f6d69c47749976fd7e8c
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
-EBUILD lz4-1.8.0.ebuild 1061 BLAKE2B 9f913ea9bfbc7a4e522ae7ccc15d347899e11c5caa1d6bfb11549d2180f191eeeac042f11d87b20b02a65bf42a2351131462b104b281d21ab04c753a4090109e SHA512 a52c515f3e29342155b2769c49bca21ae2c455eed9765aafba616ed2785ce6b26764a6d41309f912f06cd2a8b64fe13b47ec761eee951c70367f1cafd07ed05a
+EBUILD lz4-1.8.0.ebuild 1060 BLAKE2B 3a74f8d31587e286b82713dfe35a1b13be7e0f2349d973b17717e5795062e9fda1ae5e13f704a91a9680234ae4c96aec88bc2b7345f0600779ddd1ede3f2e16b SHA512 62852a2db1320f5d0ba3a23757c11f32e76d059537842d5138c253388ce7fd9dfc00fdb7865f39f75da871d4cbaee98f014ffdab031e0ab35c46479d75a6d121
 EBUILD lz4-1.8.1.2.ebuild 1068 BLAKE2B c29f13447c24f824d19816f9c8bd97e5be475a39ca4fc94c3dbabcf476779d1ce7177ebdf3cf97ec7ff899b7bb27b6867793ec5852b95b57093bafbad07d9a56 SHA512 e300a60ac5575a1fc16577efec351f886d98e7ecfa389098e72f4ec393fecf6b675caea554647eddf91edae1c0e01f2784602f4e94ac7fed5285a28801ef7cb6
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
index 6a58cc4aef1b..ac1e979b1561 100644
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/lziprecover/Manifest b/app-arch/lziprecover/Manifest
index ece18f987289..14d57daeadc5 100644
--- a/app-arch/lziprecover/Manifest
+++ b/app-arch/lziprecover/Manifest
@@ -1,9 +1,7 @@
 DIST lziprecover-1.17.tar.gz 75941 BLAKE2B 7b9e464ceac83571516a879a4809029219e05de43268d6febc0d1a9f5e86c869489dde2af87992d1d7d1bb8755f68f0f9d001f0cdd8971679acf54bea1568f52 SHA512 409a3634ef15238f8c87e6e69ecf0cf83c48274cff6c54a901a4f80bdc3d475b6bf03215cfee762ac64ca41b3e8a805ab620ceaaa1bec7fc22ffafad049b5f0f
-DIST lziprecover-1.18.tar.gz 86584 BLAKE2B a431d6919576866ca20e7deb04bfdba424c09107ebf34d646c2c82b892c3712c1c0c396e4184668aa476b8cce39dbdc71681ec786f102e3a6cd1a4dbab522196 SHA512 60febb52b5dde8e1fa1e4917c48bb09112bcd3a43c5486a234fdcfa3db1d5049977df306ce66ec0821e812676886f5fa214a3479649cb977151b5cf82018b6b6
 DIST lziprecover-1.19.tar.gz 96987 BLAKE2B c0a36c3a04723117d28edbd07443228321934459b9cfb40f74868813dd60556ff3018f066500fbfd60327893e0626def0b83d734c38a1a0ea28c1597d438c995 SHA512 2fc12c7fbc08fab45f97e01d97504258e77d9ac8a49e03a5099e6ed569523eb129898e5f9e7325e23e105f1ba171edf6628f5f03d8723daae1b1b4116d89c2f7
-DIST lziprecover-1.20-rc1.tar.gz 102589 BLAKE2B bb5b07f565432fc1c6abd39b404ccd0661b849956f72fe8e47278d9db8e415f138d8245996d1c13f567609d1ab6145db84fcde997628c379fb15ea2d20f80b76 SHA512 6a2cbaa7e5da867ddaca6a28d2918091c9a4d39273f12fa8c613e81dbaadcb68a0b88216880706819516592d311702c4af795ab0ffbdf861113f9648127bc4fb
+DIST lziprecover-1.20.tar.gz 102574 BLAKE2B 2b8a1d30d9094655d14978d935755083e4ce1168565745cd412cc56d110261a34afc335882e0e74edc7c87843f24698f6834395056381dbb170b229b68be4da8 SHA512 cb036869bc2bccd6ee56793ced03a4ce8556e6da1e2840934f12f2b9e1d9a9362c66c40483c061e7c3f817e739e4ed6488bd964b03c031b7c26cc99c2ee24867
 EBUILD lziprecover-1.17.ebuild 655 BLAKE2B cf7c042eeb532d477b001826e82979c4e9c8c9a0b1e5db50f5b6064fe0697ba8bbce7226ddacbf7797478771668a8ebf7acafa66def5a1db7af22036da2defa0 SHA512 0bdfe46c55ad1416c454091b228b39130e7cedb624a3d08eb6a05309f219304874628fd6874464a8832dcda7fc7c607c98374ba7700eaa7d15a543e4d60a504e
-EBUILD lziprecover-1.18.ebuild 657 BLAKE2B e5c159b6822ca97b71061c99f000a622cb039a3e38dfcb43a941ab2aeafabdf526e37403eca62707d74e9b5f9183bcdf4b935f8c26eacb982aa81f25de373401 SHA512 9655473dc568ffb079d9f2d925fba768d0c67e37a39ebd984ac62ff5030244e310ac4f8b7ab45c46cd6377cc9af4de6db0650017e6db801c7708e613b3ecf209
 EBUILD lziprecover-1.19.ebuild 727 BLAKE2B 0e899ec837ce663d5b9a5f9a1b677a250c4efad4d42a0894a6c2c3b2c8f646b9a5d9166aca3ef7f9303bce0d8ec8caf9e5fdbf755147016e736eaf7023e51318 SHA512 2535ae81e4c2a91a2e8f47a859a15d3c98f14d914d49882721c95c5ded413309022b312e78d951b8a8e7ff124402e56e001046216e2d7c084be8a995c9f317e3
-EBUILD lziprecover-1.20_rc1.ebuild 727 BLAKE2B 0e899ec837ce663d5b9a5f9a1b677a250c4efad4d42a0894a6c2c3b2c8f646b9a5d9166aca3ef7f9303bce0d8ec8caf9e5fdbf755147016e736eaf7023e51318 SHA512 2535ae81e4c2a91a2e8f47a859a15d3c98f14d914d49882721c95c5ded413309022b312e78d951b8a8e7ff124402e56e001046216e2d7c084be8a995c9f317e3
+EBUILD lziprecover-1.20.ebuild 727 BLAKE2B 49dc33e8f35307f2dedc2ca5bd59b749f004de686ea05d410f93398d70f39a36260dcda02e3ed749ad5b7db7ba0d47e524b1649037371853c0e3ff2ef356c061 SHA512 14e94ec502fd2bec72f321c2a6d02b9f00a4419437427eae29f325137b51c01d56a475faf865a6d7cc6a3f54a50943bbd9387de3f42bf8dbf60e50adb4506dcb
 MISC metadata.xml 2674 BLAKE2B 470d5c221311328b1620bc51fb5ccb6393f04e9a1d0367fcef04579061b9d88ac5bb131e050eb2cd3e2a8608db58586cf49bef3e58ca320d93398aba7579799b SHA512 c39f9d4478cdc3e5865567f5e6560e4fa34f014aa6538ca47a1dddf51f1d5549f8edcee34dda36e691bd28b734a8df4c04ff0a94d68c16caccc22e57c35a7823
diff --git a/app-arch/lziprecover/lziprecover-1.18.ebuild b/app-arch/lziprecover/lziprecover-1.18.ebuild
deleted file mode 100644
index 735ad623fc7e..000000000000
--- a/app-arch/lziprecover/lziprecover-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lziprecover is a data recovery tool and decompressor for lzip compressed files"
-HOMEPAGE="http://www.nongnu.org/lzip/lziprecover.html"
-SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	# not autotools-based
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		CXX="$(tc-getCXX)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-}
diff --git a/app-arch/lziprecover/lziprecover-1.20_rc1.ebuild b/app-arch/lziprecover/lziprecover-1.20.ebuild
index fe902d995592..e861188313cb 100644
--- a/app-arch/lziprecover/lziprecover-1.20_rc1.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index f34ffc06b2c3..774d58518516 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -3,5 +3,5 @@ AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604df
 AUX p7zip-16.02-darwin.patch 218 BLAKE2B 4e6b9f830ef9aff4d9db050163477a341353c4f16188ad2eeef3e248afabdc34d47d4c0708f174efa80e98906833b549b28d43af4585f2b1e34311e6f8c9944c SHA512 26ef30ce27fccdeae6388801e7a619225995c50394131ad5dd6fcf2236a40e92ad2d6dd2ea04c362fd660264decc6b616e5ee6ef83ff42c111e2b1a40f620c68
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 EBUILD p7zip-16.02-r1.ebuild 4498 BLAKE2B e1376067188375ef82b1703531d7c673a54ce6901bc3af814d2928ca503b23484572781d27ef9ee66d388cfc3344d2e960c602ebd0e034ea6ab685a87c6ff773 SHA512 9a0ec08e5013933c43234e38574ac95d81b75b58992c021a2ba2679fc6d00d1ec4b79985d4555189c774f22def0125fa8a5e1e66a67de1daf84d1ef94720e3dc
-EBUILD p7zip-16.02-r2.ebuild 4574 BLAKE2B fca0eae0627cd048be81a8735b7cb2cb9631fa0a490d13b9a69b11c942de2b549536f83f8b4acb5d81ea3f30e2d1a6895ea6eedbf3ccaa6b5dedc8a30c7b8aa4 SHA512 6849e8f2806b1544987dd000ec4f5c77552655257c55c35a81f84c2788237488fc7e8a366076a1472c7faa2688527ccd2463a2b31d22a2e397d162e432b00a2c
+EBUILD p7zip-16.02-r2.ebuild 4573 BLAKE2B d8d518f2aee2515f3d7c4d386bbd780e503fcb01d44b3b61939fca2a3564d2b36c80c30e1884a15ad7963edc2b535a0c73d3f2fa3b685df83b1cbad210890e84 SHA512 0c7af98d6866ce312e3b1e44eb3a855dd6511d131ec89c3134602653394893d6e2133b1e3fc0599ddb917e35dc419c65d0e07bd3b0cbfebe4e00f385e4af9aa6
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/p7zip-16.02-r2.ebuild b/app-arch/p7zip/p7zip-16.02-r2.ebuild
index e6a89fe7a155..fdc25149f249 100644
--- a/app-arch/p7zip/p7zip-16.02-r2.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index e023a4c3d893..c8416f0178ba 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -6,7 +6,7 @@ DIST pax-3.4-12.fc16.src.rpm 171016 BLAKE2B 94332a7cd24613c4488c1f00de3bcebeba9a
 DIST paxmirabilis-20160306.cpio.gz 147448 BLAKE2B b2a9bcfbb6d2007b8a4162b8d010c2a34f7ebc8595a8c20f6b8e973d85421a7f21f24d90b3d0228e5c9921b69dec1ef0ddcd4ee540f95072237255ecf309016d SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f
 DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
 EBUILD pax-20160306.ebuild 1423 BLAKE2B b53926a547d5969dfc9350ade35551912b8fd6c2498f67531a5102fbee0637662e69c115a7bceaf694aebc50769f9014de6d295aecef08c61f86aed7384932a3 SHA512 f1845f4921f165c8ba3130edd20fc3972c701caeec35fdbca0898faddc23c08c076a290a983786ff4e28f9ceb1fa1d5af3b230bad3701dfdc990720cc35e0cfc
-EBUILD pax-20161104.ebuild 1458 BLAKE2B 7cf8707d6a71efc8d87f64a124a6306d99e35e1f62c15156608af221e81ab5b35e601cc22860a20202e13425a20fc6e03595943da6d6488b7d0403b8af704e5c SHA512 4308adffb76d92a1990f024b7b37e6ec88564f117a5518e120ea0de6d2579489f21ae2ffa540af4f23261cee71600d1fc5690bd0c058b743d4977b4addb1f598
+EBUILD pax-20161104.ebuild 1456 BLAKE2B f467bffa0c0b8696d48b5f2161d75de38d21dac88cfc05cabe84ea16ccc1f691336ecb00016e22c5c99f626331d19abebf8b944ff81337669ea19503f3fb4a77 SHA512 0e79f2be36f84d4717d820e56a6b57a9b955a7b95881a3c28f298d6749659bdc16a68c1b48e19bdc592a6344b8859956918f05544f790f1a21250bfdf2b870fb
 EBUILD pax-3.4.12.16-r1.ebuild 1115 BLAKE2B 6f7bf0b2542e19ff6384f974c91856236571ed8ef63f3ff08a66292c73893f853f9a04be1354625478d714a428d2d2e0ef18554499b6fe4dbd17aa739af7a0fe SHA512 e8c555c337a83262a42be1074ec25cc471e08b03217254bddb3d0953ba6ba1e1aa2ea3c741d88face59e026b1ba1e8ffaf2a06840ab72da249a475be1f5d7547
 EBUILD pax-3.4.12.16.ebuild 1008 BLAKE2B 4ef6727535ef6773796832fa9cfe05565b23f2335754396939c1c621d8984e53fd0395275f47f4d071203bbb7a6fa68603e00d096467883434e89370d0a2e517 SHA512 c08f62d99219a9e9bf991be56c1c425c1ba595e9413814f91e7357b9ea6337404922952a39f4da3202c5ef00ef5807e225b97ce7611b2cd6590c0e90685fc51a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild
index 00a5e25b60d7..c9fc9875ca5c 100644
--- a/app-arch/pax/pax-20161104.ebuild
+++ b/app-arch/pax/pax-20161104.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND="
 	dev-libs/libbsd
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 11f6e836cc4c..328b665840a1 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -2,5 +2,5 @@ AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BL
 DIST snappy-1.1.3.tar.gz 1509026 BLAKE2B d8dbb6e92d1788f7b13e6e36aa0297cfcb28d664fb625d0798831ccd00de818675c224821359cc66f38f274da248725737510a85b01a36efe07aa4c9a8bcfda4 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
 EBUILD snappy-1.1.3-r1.ebuild 970 BLAKE2B f4794a69d78a43906d661c1e05a1810d8ec708e166b1c045ca7611b3800cd1694657a5b67b0b34155384edb28f1023e6c980d12fa963fb270f2378a7eec0bc98 SHA512 75c6fdc710845048e095963edbf50a7713cf919cabe45b5548487c27ad4e2278e06b79b3c56c16a529a82f65ef0eff8a11a3964b9f3a40b1a3293fcb4afdce29
-EBUILD snappy-1.1.7.ebuild 1924 BLAKE2B 4a2ec6de572cceee460e7637a7df9e82b8776efdc935584ab9d695c11526d611a965e83795362fccefbc4df4dda66e36c1f408ef28a03a493f777d349e4eaa23 SHA512 5ad62e05e30eba722bf439bacbacab4e27083ba528f4b167fb58b8b017b6f02481775b4efefb6ec3b01ad907edcf8fb409396e852f945256ae273ed23d2efb32
+EBUILD snappy-1.1.7.ebuild 1923 BLAKE2B f7e998659510e59b36837069e84c4fedfabfd98ae1ec9c8a652d4f33ffd3c112b2d086995e3e0a100cc6f84b34c54e83e29d7bb66a1221e4886799008d6ee36c SHA512 00b42731231e577d6db182ae0155c5ab8b116222fe9ba79f0d5685ead4498065dbb1e2e7f870e1222354675489328d29efdfd57554fb02fee1f4aa876f2596b6
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index 65991f0c81b4..36c15e2a3d9e 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 # upstream killed static lib support with build system update
 # (and we have packages depending on the flag)
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index 4946293a7f8e..82fb2bd72fc0 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -2,6 +2,6 @@ AUX no.in_path.patch 1341 BLAKE2B 7ec890361f9c7a30b5b60682773bbdfbf2eed2d6de19de
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
 DIST adflib.zip 254914 BLAKE2B 9683ea4edbeb7254e0c162140063e2aa53e183aba31b4b7bf1ab498a5bb218ae687a54d87e50cc2b15e5725a2f77c16e9ca4dba23b5d5a373f513747839055a9 SHA512 fe8edf5247ba82e475f62f96fcb72d50bf80641e14e957c99694def98735eb327a67208e3460504a0d109c9497d6e81f0cd8ce07ddc73486adc9e7070a75074a
-EBUILD unadf-0.7.12-r1.ebuild 713 BLAKE2B dec763f597a3b70d61f79d06e0fd318d0185b27d751ecb7043f4d827af9599ca3639868fd24ee0ffebdaff0758cfe72c24526f9b41bda95d865e0cadc1c504c6 SHA512 2a118c374eb133f1eb75d60905fb33cf016fab65c232e05e9e9d3a9966ebba8a9913028a96f1b4ca0fb2d97b0693f1ff0ff502e4bb578a33ff143361ea5af7a3
+EBUILD unadf-0.7.12-r1.ebuild 712 BLAKE2B d3b7c30a3646c35f0c231f0ebb28a4e2ed615a61f061e250217569421c0f3384aff24d5f7103525fcec6d08aff2f380490a38e3851f1978eb36e9616d973b1f8 SHA512 5f7f95bc553a624af88bb31bb87fda728ac3a1a9042d76e4fdccceee2fd7c665d83b29ace890e581555760a0fc8ad5840dbb1338a4622fba21303cb88d20521f
 EBUILD unadf-0.7.9b.ebuild 875 BLAKE2B 9df1ceefc07e087ebf0b5f5f5a99963fe19cf1a391eda0036a9950b5bc6af080cc4c8f4257fe83bcb4424f9c2562a5ed83903f2f7f854adf31724e71075b39ec SHA512 be619ea1d383e7279313c45c2cdd77aa32854962c04a1693bf99488ed9032c6de2b4a84ad0211d3358989cb68d9f8637bba5e625fab9fe3ee4ccc15d692a8f1a
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-arch/unadf/unadf-0.7.12-r1.ebuild b/app-arch/unadf/unadf-0.7.12-r1.ebuild
index e6592e1c01e4..fb1aed5c2ad7 100644
--- a/app-arch/unadf/unadf-0.7.12-r1.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 0b723fcc1aa4..1b74a58d9f61 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,6 +5,6 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2605 BLAKE2B 5acbda5840a17d83dcd5a7dbf23f0172813e698c56e9cdf8c32ee01ef5f11915def5575799b64e29258774e6a9f17f72e4947c364bed948ad58ab17ab7533bb6 SHA512 56b2df3d8ce49754e4eff7e2379ee23580a21628672542a7bda323e68471a2dd84369968c863bc4ac83fda8f02cb79f6a85431e541957fcf5f7afb1bddb0d4d4
+EBUILD unzip-6.0_p21-r2.ebuild 2604 BLAKE2B 5a8b2b331d5febdb8c109fb62516b9aab2fd3fc7a2fdd0d67be545c7402a96f9b1195952eb901b9f03b2fdf654ff95b7252ebdf72c07c4ca039aa2cfb4a5c1f6 SHA512 dc167f83ddc92dcf06625c14c91f6a99f178f1a4b30b22faddd0a87a267ee26e9b4ec1e43e2aa303ffb794e05d4c9a358e66f330cff4b533e3c26be6a2075f38
 EBUILD unzip-6.0_p21.ebuild 2539 BLAKE2B 10ad8ccadfbd15b18449b61c3e3ed2c73d428ed85595e0065f2e397a4821221fd6dcb20be3c6d41b13c99f6b20de57fda263eabab2b842204e09ecde1f729d56 SHA512 df4efaf0e18777f9ffacc1e72100b33c60a35f535f15934fd9b1a5c5d287a3dd1fe9ab0442ca03fb316b7a792ab737bc130cae75116cb5b8adf7d825fceebdd5
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index 333dbc08699c..3f3860b3db03 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 07a2ea57f5e4..172e11f179f5 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -5,6 +5,6 @@ DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 BLAKE2B c4f0b0ae634b6c11ea15d92
 DIST xarchiver-0.5.4.12.tar.gz 1074764 BLAKE2B 65d8968a470f7ea607fcbb1e2ff3b6c54ff8e521df1ca0cd29d3b7fc7b84d2ad5e2b9987bfb482979c7099d62287c463317d524cadc4a03d6b80ae61d28bfcc2 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554
 DIST xarchiver-0.5.4.tar.bz2 1003045 BLAKE2B 6f1303c1d1b09a60616977c04c771cac78a25c756fbac538401e22e4fe3a808f990848d83041d5c5ceb667e30b5bb1d694318f0d21953201047fefdfc9afeb2c SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d
 EBUILD xarchiver-0.5.4.11_p20170629.ebuild 1420 BLAKE2B facfe37669671309ece170cbab8f29887bf84b4180aaec7e4cafe80c7a8e975a10430d7b573037bbb46e817cea9cea2314433684b43406736f9f7c63eb5c04dc SHA512 0030d3bce1e6dc695b90d15a97c7d66910d9e90bc9f0743e4b942eb3a59cf194ae6b82dd095255fc8eb2ec8b2b3c409f60aafbdf9ee2cb0c1b6b22b5e4a2267f
-EBUILD xarchiver-0.5.4.12.ebuild 1321 BLAKE2B 6967c77f6d5b5e36e55aca2d9bba0bd3631d6064537514766ea93d00152d75f82344293e42f6d76949fe4e4de6ff8d40a5f1a2ba21da8e7c53658cb3d7b687a3 SHA512 74fccbaac02515bd17e3752071cc33d068e6ef702a1df76a451777d181fdd7d5f44b36b28a5637855d33ff627f819c6e754fb05cebbf03a791ef04735ec45a88
+EBUILD xarchiver-0.5.4.12.ebuild 1320 BLAKE2B 1f9b40a82529f4764fc56a123a6176bc4b65633cab5fc5710ae76b3b102b88c5cfe20d8f46f69447cce2324a3819a52641e504a528327fada0c476ae8036291f SHA512 848307a17c6aa0aefdf1eff7a516173f4f77fd774950ca03708251f70acea85ff3556f7d69af63f242afa126b356faf10960087d22dd1f37ca970a9c35d97a46
 EBUILD xarchiver-0.5.4.ebuild 1328 BLAKE2B 76286bbf89e4782fd113168a8bd6b6b02def8827ca86805e166c9d5a3d50032ad87d9e6d2529b29a06e4fa4c2ed25b3ae95373e2f99c8c36a98efedcd7398417 SHA512 ed25ddd86d9c9d048f8a6cb155fd79c0c45d380b91f587bd8364ac3d455fc0a75d9eed271b64f7b42d293c762c57747c52608a30f2a1899ee935b091c9a0258e
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
index 968d09e67908..7a9f62c11b87 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2:=
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index eda316ede101..9470d2312d5b 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -6,5 +6,5 @@ AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c1
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r3.ebuild 1720 BLAKE2B 58973350277d37f4c13aaa19e300f2bdcbf1417f66878b2b83cb76cf2cd07e8b149c1dab5608fdf452a66416c728a6af3fbf1968b4869a21c03c8f8fa62699b7 SHA512 1910a94dc81acd0533d91b161a21b1270b4898708cdbb20bd9cf728add15456c23ba9f9b820e181beac7e77650c8cbabfabc1fc12993da281c9960884179cdf7
+EBUILD zip-3.0-r3.ebuild 1719 BLAKE2B 3eb0086e814566937e582a4a524dc88c6b1c37eabec77c7a0215818359ea711c38fb1f5a50d9c2162572b87a0cec75bf7ae5a51befb021895fa3365ab99ff2b1 SHA512 3470b6dfccc160b77dc86f5dbdd021d8dbdf5135afea8e8a59b8fa7400b920a1fadcd6f79514ed3abf0fc0d497a81d4aa90337bae171044179ca61c7a2f84b77
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
index ac5bf2612082..4a9bf5719f95 100644
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ b/app-arch/zip/zip-3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
 IUSE="bzip2 crypt natspec unicode"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )