gentoo resync : 18.03.2018

17 files changed, 79 insertions, 381 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index bafa71afd92b..6b9786983255 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 224c2726d20c..404f042f1a9a 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 1848 BLAKE2B 026c0ff169ba380a54605279182de77b13269c3293fa8d51e5d0f854e7220504953833d6658d86f03d435619af823406e0f8c7cbcac5241fcc039e7073ddef76 SHA512 bfe3c353e72084ba8829741496bdbd58467bee72b2147b769c9edfdaf5d8136f771280a81d4a433a55631c241f13f9c8e353bea05df65cad301680c84fd7e906
+EBUILD dpkg-1.19.0.5.ebuild 1847 BLAKE2B 2e4d6806a047be0e3308204aeb6893a9188084b7167ed722cb321c2c748b343bd8af050dab2067589550111cfbf45c6355765be68dd7f24bb7b79d73bdafebba SHA512 8f55646ee069f2a7baf5c4ef3c1aa87fba5467d90afc8659f1848564c3d306fd9076e8bb078d06ca655f80840211424d68987a6757af476250c0259c73c64bc4
 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 8bb605e25c5b..653592189fd4 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/rpm/Manifest b/app-arch/rpm/Manifest
index c9595f823e0e..49072a28052d 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -2,12 +2,7 @@ AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017eba
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.11.0.1.tar.bz2 3670158 BLAKE2B 8190cd760ce86275a27a64aca7622340a2894f4f7aad0171425c7f5d3cfcf58e82c2a792f7d4687fff9270fe3f9c861027b6eea43f3602be8b12098dbccf408f SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535
-DIST rpm-4.11.1.tar.bz2 3778922 BLAKE2B 81b41ac1c661d499267f68b4e3a5cca34a0b9f0e258fe48414069b8b8dd5197fde845da815b4d2e3ea3a75a51c65a0e72073ae961bb1cb548f4821c924b96326 SHA512 ef65b265e74e549c9525da9247a1c81a4fca2b47f49c80b155e8065f0191039b6c56be3ed92fd9dd7a88c36954039a5c1a613e2bfb45599eb9a79d06503a8587
-DIST rpm-4.11.2.tar.bz2 3988837 BLAKE2B 1f7c6c3af50bad2a5c1106867b162685dec9b08f66566fa1e23abb866fdd53dbd11652a65f6dddc6b32aaca60cc3fad8ec6e8054442e316125d5a192ee8e1ff3 SHA512 de3d8e6ca4981bcbf48f9db5f74c03afcc14a3f100a74a721a351183be8c5cc6052be6dce5809976b9aa348a79bfb5bc04b41930f75df4d6fc4021311301ef0e
 DIST rpm-4.12.0.1.tar.bz2 4129093 BLAKE2B 85addde70d031f179566771350f5907311cf61a077b647b5dbb75e1e157141e541cb7a236e5a1d4fce881d98eb7c0331a0eadd0ca1dd09e53d9d28dd954203bf SHA512 ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f
 EBUILD rpm-4.11.0.1.ebuild 2739 BLAKE2B 80664cf24466365a81eb4774a49a146327367b20c26fabc11c872ad8c4c22079235ae9dc0ece0956478668fcf47caca1215fe77674f7f06e778eea7003502ef6 SHA512 ecade45798b73e1a573edac06b60dbe0d0e2d4915a13beb41bbdfdc2596e208899bf6b7a36ad1144d65ebf1c186889c6f9928575ff7f5f14516deb5687b2d83a
-EBUILD rpm-4.11.1.ebuild 2750 BLAKE2B 94632c5c17aa232645d9b7d10934eff8e540c3f8d04698400972c8a822e02fc30b4af305ac33261323cc6e1dc9485972064faee714c80e12553ab911866f968e SHA512 3e31e3fae0961f95041d43a1fc4478c3c93309d7428e6daa3f7d56e1bdac10135f2a1e6c33d570b65a66048a8e0459515d1b40d1084a62dcf2b620dc3c246350
-EBUILD rpm-4.11.2-r1.ebuild 2849 BLAKE2B df9a6df5c08c2a9fa5a6fe006f505eae1fbb352928b42717e2d2291c91174492b316bb7813f5ef2c23b10778c077ba83b79074ca9c545c56d387d2ba71e46a91 SHA512 8b1fb11173ad640291d47b5abe43cfd5294bf2cfebb65172fcbe98869cd14fbe4284934d388cc51b8be8911aab1a50a444c40fb166bbe800dbfa7b970c105fbe
-EBUILD rpm-4.11.2.ebuild 2750 BLAKE2B 94632c5c17aa232645d9b7d10934eff8e540c3f8d04698400972c8a822e02fc30b4af305ac33261323cc6e1dc9485972064faee714c80e12553ab911866f968e SHA512 3e31e3fae0961f95041d43a1fc4478c3c93309d7428e6daa3f7d56e1bdac10135f2a1e6c33d570b65a66048a8e0459515d1b40d1084a62dcf2b620dc3c246350
-EBUILD rpm-4.12.0.1.ebuild 2879 BLAKE2B 55f735b86b70db7b1d07702d5bd436e02a363f2e5e7842445b1a46e1c5d66c594fe0df7a6c2e06e1f5db8d7f1de8e918087217cf7ce4efe459184d9378c0e792 SHA512 cb2a7ddf21a39cd5658291cd2237652a2aa6c81f3d276664dafc356d20cf0f1ba22a9cc5b8406141a1acee62e08a9ab4c00abd7afc6f32d7f514991bdcb8a3f3
-MISC metadata.xml 232 BLAKE2B c631433a9b129e3e3b7cd485e9ec345264bf2f22f7f64193d5955987c5b44339d36356c8e17c2ded1c8f771774a0811ee41f12ca699a947bf2faf183805c4c1b SHA512 23824ca618f16dec558197c0c853f3ebf5c0f1b034635242282bd40f01beea59cbac3b416e86f2eb4337942d9db945a2e1fd4fe52c88762b65749855762769fa
+EBUILD rpm-4.12.0.1.ebuild 2895 BLAKE2B d427a4186655dc4b84df4a74abd842237a0c7668f7a20c23791e6b8f2a6a8cedc1a260f94ce35b160f31b79f45732c750d0dff974320a8e4c597a626c675fe28 SHA512 3e31c722000ec68d734b43ba533eab59cef96dac93473e2bd7a01b9d19313f839c02725c785b500ae6a9529739d655e3afbe4f804edd7980dcd4282b5cae082b
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index c78052713743..097975e3adc2 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 </pkgmetadata>
diff --git a/app-arch/rpm/rpm-4.11.1.ebuild b/app-arch/rpm/rpm-4.11.1.ebuild
deleted file mode 100644
index bb5f3723c57d..000000000000
--- a/app-arch/rpm/rpm-4.11.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-
-CDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.11.2-r1.ebuild b/app-arch/rpm/rpm-4.11.2-r1.ebuild
deleted file mode 100644
index 81e5f7aef1a7..000000000000
--- a/app-arch/rpm/rpm-4.11.2-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-
-CDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i 's:@__PYTHON@:/usr/bin/python2:' macros.in || die "Fixing %__python failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.11.2.ebuild b/app-arch/rpm/rpm-4.11.2.ebuild
deleted file mode 100644
index bb5f3723c57d..000000000000
--- a/app-arch/rpm/rpm-4.11.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-
-CDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.12.0.1.ebuild b/app-arch/rpm/rpm-4.12.0.1.ebuild
index b57bd21fbbe5..e0418711eda3 100644
--- a/app-arch/rpm/rpm-4.12.0.1.ebuild
+++ b/app-arch/rpm/rpm-4.12.0.1.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
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="nls python doc caps lua acl selinux"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="!app-arch/rpm5
 	app-arch/libarchive
@@ -32,17 +33,15 @@ CDEPEND="!app-arch/rpm5
 	nls? ( virtual/libintl )
 	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
 	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
+	caps? ( >=sys-libs/libcap-2.0 )
+"
 DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
+	selinux? ( sec-policy/selinux-rpm )
 "
 
 src_prepare() {
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 328b665840a1..1f70ad683bf7 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 1923 BLAKE2B f7e998659510e59b36837069e84c4fedfabfd98ae1ec9c8a652d4f33ffd3c112b2d086995e3e0a100cc6f84b34c54e83e29d7bb66a1221e4886799008d6ee36c SHA512 00b42731231e577d6db182ae0155c5ab8b116222fe9ba79f0d5685ead4498065dbb1e2e7f870e1222354675489328d29efdfd57554fb02fee1f4aa876f2596b6
+EBUILD snappy-1.1.7.ebuild 1930 BLAKE2B 6256c11d45fa57412f17188aa4e9fddcf3d9c6c75fd94113c51d5ac994ce20209af492c374d017ea59ac88474c2bacddf99ebb614129e0e65c3e5982a1873e9b SHA512 b80fb24f3e719e611d515b2431ff23c618a33f1b6180ef1ed9d2424fb0e641dd980eac8e47eef099d83e0071a8aff7285451f7ac40834c6de4284b5e31297e93
 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 36c15e2a3d9e..0971da8ddfb7 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 ~sparc 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/xar/Manifest b/app-arch/xar/Manifest
index f411cf3e10f6..54de6c48c966 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -8,6 +8,6 @@ DIST xar-1.6.1.tar.gz 180771 BLAKE2B efc15995941b7240486a02cad736981e4881dac8a57
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 EBUILD xar-1.5.2-r1.ebuild 798 BLAKE2B cf559675c085e7f4f2b97a3496aab0aaa468ffc2f35a68cb94a686526ae0dd90ab96e92ff452226b678c02709e2b9c4fef78735bc7ba82909c6b43dd24c38634 SHA512 e5e8f4b9ddb93e892cc2c4072cb97d3204758b2957aceb0f6268edf525a7ba980f3d121705902bc9a7d51f2660f91fc86521db213aa2cadaf237d4c07765b8dc
 EBUILD xar-1.6.1-r1.ebuild 796 BLAKE2B d90e8026e9aa22d2cfbc88337cd4d1102cb60f0d5834156d78a16739e7ebcb3ef169b1fc782dcdde6213c62245022d9fad1e8cf5f98e68eaa98ea9cacd4142f0 SHA512 f69913a2f0ae8de5e0cdc92ec071f4559f1994f2d3c89faa3b3801899134e729fa7ce2e41b29fd76c964de962cc0fbf1c0706eff9be7c89bd3e88e08733a47a9
-EBUILD xar-1.8-r1.ebuild 1194 BLAKE2B cee751b3253eefe59e04203dc7214bfc6bcfc8b49c49b37c26a9319c2ff3ace91f6769110eedc75a60b01f7c404fec5507913d033e2bc20b055aacf53fdfe082 SHA512 be62204ab75dbc817beafd68d9a487c5eab3a4e8dc5dfd812bd434fe30d3d63ed62e127d7c80aa9f9fa3624706119ceada389768fdadd61351d18f6478bba496
+EBUILD xar-1.8-r1.ebuild 1213 BLAKE2B 0731eec8aea3e2bd4709d2fdc9c67722ad547ab3e1df845eef2518e1c27bb070e3abf26f70ed26f6308df9b5e5f29cb6225dce344ea79b69f57df496991d8e60 SHA512 c7efb5b234260e34fba1a21f160923b575dcb3d809b7c9a4a9473ef4f04a26079305e4bc62aba0497099800aa40a7cb0dba5cb76d11642a2215ead4451647399
 EBUILD xar-1.8.ebuild 1162 BLAKE2B 91a94417a7cc057a4df9ba6ee2bce98b9972fc0d7a2f0dbdd083cf0c37ab8ad88ef5710c995eb7edf212e2fcc3629f4b3dc1dcc63e28e0a1633631af769270b6 SHA512 afeca9c84293c6c08c8b9d2e7169e9159befe58f5cb8cf4d10a9a5f448baf91ccbe92d677e4f3461eb456c76d6af09befbb956b697c58fe8a8be3f1609bd754a
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r1.ebuild b/app-arch/xar/xar-1.8-r1.ebuild
index c1c4883df5ee..50016f141325 100644
--- a/app-arch/xar/xar-1.8-r1.ebuild
+++ b/app-arch/xar/xar-1.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 172e11f179f5..9a49db35c4dc 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -3,8 +3,10 @@ AUX xarchiver-0.5.3-fix-password-protected.patch 1213 BLAKE2B 74cf2cf4fa5a1a8938
 AUX xarchiver-0.5.3-fix-rpm-support.patch 3291 BLAKE2B ef93bf2403366723ee2626cf0cbe2308e5449d4638fefc984842b2416223b3e700cccbabaa86899968f463b3356c82eee848124b8c736ee46d59792963756829 SHA512 4ea64799b765ceadb34d4ea48df8f1e1748749a128a3b734265c7e9aa414bbc4a443007d3ae2b767cb3d6c3cae6b6bfb3866f76584cbbf66b8cc4afa34a76ebd
 DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 BLAKE2B c4f0b0ae634b6c11ea15d9231a2e55e91ecb4f41b571611f42c046f2d70f0598711ac80516a5130a03ae091a9c2477d12e17ba7c22092437a4013b0afdfe1273 SHA512 e63e9ddd98c5ec5708b74e993cb1901835c133e220ba95aa5a07cca01660fab5894533c57b39223db6155e2fc0ea014ce6eede853ebaf067de27f1e77c5e023f
 DIST xarchiver-0.5.4.12.tar.gz 1074764 BLAKE2B 65d8968a470f7ea607fcbb1e2ff3b6c54ff8e521df1ca0cd29d3b7fc7b84d2ad5e2b9987bfb482979c7099d62287c463317d524cadc4a03d6b80ae61d28bfcc2 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554
+DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849
 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 1320 BLAKE2B 1f9b40a82529f4764fc56a123a6176bc4b65633cab5fc5710ae76b3b102b88c5cfe20d8f46f69447cce2324a3819a52641e504a528327fada0c476ae8036291f SHA512 848307a17c6aa0aefdf1eff7a516173f4f77fd774950ca03708251f70acea85ff3556f7d69af63f242afa126b356faf10960087d22dd1f37ca970a9c35d97a46
+EBUILD xarchiver-0.5.4.13.ebuild 1327 BLAKE2B 2eb437ed5a3c8bfc85fd8f68cf7d6e7d2ad4c67ae76462a65e4bc55441e4349853bd9d4f46c31cceade4c4f9f03f6db13dc5ab43a099fa679362be2df11735ec SHA512 60aa5577d9c758a1cdc9ec643296e3dc544bd81f1dd7a9b1d3ea52b4dffb323b892eda314a23fc1a70babc5777434f3bb45447e2fabd3228d9bc0b552e554e5d
 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.13.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
new file mode 100644
index 000000000000..5ddc2bd57e86
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver"
+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"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2:=
+	x11-libs/gtk+:3="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)"
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index d8f80ce403ef..95d0f0d17316 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -9,6 +9,6 @@ EBUILD zstd-1.1.0.ebuild 928 BLAKE2B 7ede914553f0b418dbaebcca524d85215edd2a9786f
 EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
 EBUILD zstd-1.2.0.ebuild 911 BLAKE2B 1d05c3c40bd2508433ff818a7b53bdce10bbc2567660ca5a45228a661836b0a5662610a50afc33803d75d070bb0ad0871a26e6b586d73db9b438c7fbee22d73f SHA512 1df5717823ff075a56edc7ddd0d5c43087226560720cf48fdcd6084f4ba5ac2ae215865a9cb69549b61785ef78f689b9b7c15f934d4d29b9dce40f20ed8f3ae0
 EBUILD zstd-1.3.0.ebuild 1246 BLAKE2B 79cbdd3c8eeb485eebeabe7864f2a7815e1f7587ba656bc63c2679b4a4d4671f62696484dce5eba875f40974fa232bac3a37ce95e01b04048e0caa2bcd68154f SHA512 ae39d6c828fd7a3f1a9473a9028f5656bc5914aa0b1a149305ba13718e0482c12fe2f710bca4cbe73a746d9cab5cef2afcab327fe95cadeacbd699bbb32d6027
-EBUILD zstd-1.3.2.ebuild 1269 BLAKE2B 4e2352c6b9110d26fec23be2c2b2acb2c2fec75a0e40d9e901a5b026f9b0eb6f186e9f833e0267d34d83727f373a625a6445d3e3699b17256d8a4f9689ce97a0 SHA512 d0188e5884e58d6e9a06d10db72622bec12b2762c94a79b7a7bf52b3f9d2b97c1aa9298962fee73af6b84226e805f6278907b21c00a29855a1e87f188cac3c78
+EBUILD zstd-1.3.2.ebuild 1268 BLAKE2B 255455e55d8c6db01148dd8cf2ca511a6051481beb14d9c4eb6f12b5a97aeec14641c781a77d3dbbb3b0a5942434a9e23842d040983650485d871a4af88d346b SHA512 bd78230e8e1fa5d9e8aa2350b232959840d269f3d989c2995b3f5d600159814081ea772abea57799d4e53023dcc77ac8fd2b40631a69836aa8a2ea40348c3fcb
 EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.3.2.ebuild b/app-arch/zstd/zstd-1.3.2.ebuild
index 3daa6d7d0ada..453e24c6ab07 100644
--- a/app-arch/zstd/zstd-1.3.2.ebuild
+++ b/app-arch/zstd/zstd-1.3.2.ebuild
@@ -11,7 +11,7 @@ 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="app-arch/xz-utils"