gentoo resync : 08.01.2018

14 files changed, 25 insertions, 72 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ee8a44923d48..422e6f170998 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index ebcab11dd855..ecc5cb66cd05 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,5 +1,5 @@
 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 1396 BLAKE2B 3b39eadcdb1e1282916d6c556a525f41c82b980ee96e433a7d56c166eeab07fd3fd47506a565c9914f96ef2b9a49e775606088ead8d2908d8f4b9cb40f969ec0 SHA512 a161d5622e00eefa3f2d49befe0a953cd1e1d52b4c15e5c49ee9b2baed358538d0fe289509abd9b4b84b47933717146a4ee71fdac6a3bf20f1eaed619f68b873
+EBUILD brotli-1.0.2.ebuild 1402 BLAKE2B e0931ddbcdb6b53970ac0f64c74d2f1e31840c229242b6649520ad45fed97634c46f8c4a8e9aad3f87001b0f1eeb1854a3cf3d3ce5d93de2bc4e8af0dfb0cd8b SHA512 9e39127b114cc77db688c216024a4f19ca95fdf423bb2246c1353377e02de67b32d02c2be8f5fdfd790b53c862a11851924da0e56d581058ea941193616fdad6
 EBUILD brotli-9999.ebuild 1336 BLAKE2B 920c9159f284dcbf0246e52d28048aad22c4803c0950a101093afeabf45bc7b109216ac8bd54676a27ec579cfa49e4ed791cb944c7a9d4ce9e376e85f22cdebc SHA512 2686041468cf95c7dafa9571c6c4997f5ddc9440593e35f6d8526af7df8a2cd249af9e5b0ddf04a272cc8f6497db5de77c628641d2867e47cce6b099e3b187af
 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 58b19b68512d..63ee15d686df 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="~amd64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha ~amd64 ~ia64 ~sparc ~x86 ~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/gzip/Manifest b/app-arch/gzip/Manifest
index 5928766bdf6d..944e79646408 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,9 +1,7 @@
-AUX gzip-1.3.8-install-symlinks.patch 280 BLAKE2B 3c35bb9d17a5c8ed8f1b5b6fdbe699ada7b9abdcbf9ce6305af362335a1a3b6825af428693e23d49508807277916dedca8ec20f097e74860d0bad2562f70af6d SHA512 b804a4d4ef9294a8f241b75a06ee6464d932330824dc95f2fa1f67bb6f22f4d66287e4f47dcafce4e59e68fa3d11ac61cdbca55ab0939747d8a17464d2aa29c1
-AUX gzip-1.4-asmv.patch 702 BLAKE2B 0ed90ba497b7f1c2a7ef309c644fba40c9acc9a646088b2a51b4a1159967b160e0e58fe0d2a1d162c94143ec1016d7b0742e504a56f4394c209e7cc723efafde SHA512 34ab638432a690e1678a1754817d65f5e0258a50ea4f308f4a26ae48a2829537ae23a252ee08540c486931c617e634e6a0fc5712d8c337099029c7b3eeb3b408
-DIST gzip-1.6.tar.xz 725084 BLAKE2B 3f4e6ac2e3186de403a1be58041f4b8f86074d8659cb360a64cd1bab023c0f46a1521aadf1a8669636ec1202cca96a1b73a77c208a7eb99b0eb6b14657231a4f SHA512 06da599fc38b459d7e9a3f43fdd06d1a0d7b29ad14cb7b6552176bab584a1135bb47ba37a4eb377e6c42c4934d557079ace1e289a252ae192ee154079a62ed01
-DIST gzip-1.7.tar.xz 764056 BLAKE2B baa5a6b95cf89dffbff05d2b91c3a619dcb67e8692bdff24385b8867259a4191612e8586ebbc96c334d5bd224bf0364ffbf3c0b1384f7632a46ebe09686452c2 SHA512 e28f23738f0d2936773d9b50ea9e46c59945e227a90ca7d8e953fb5a774b8692a3341b744320e924da2d5825117dab730affce506f6fc8e65f0af372f3082539
+AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
+AUX gzip-1.4-asmv.patch 630 BLAKE2B 64508293c8257db3dafd2b20fe5bc23aa37b54f90b63eaeb7a67643ea837b88d58b90fa8b177d84a538eef183d5e49ab98e6b5f8a482303e68ef2c5acb390faf SHA512 7769c98cfc8d6c7c48bc1772d45b44c6c4e1a9fa266dbe5bfe1b9822434b96f7c42ec0d2f4444a5ee8ae8086e571f6891756c7c22f61352649721044eda61a0f
 DIST gzip-1.8.tar.xz 728116 BLAKE2B 34b707bd403791aca8620de3520637c460dbd9167a4fb693c78438115862781350ef5e256ad0accce75b25515b82fcd3e405cc310d6ea36f2d2609b0a270c4db SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55
-EBUILD gzip-1.6.ebuild 1156 BLAKE2B 73ae857e058934518b6341a1bf123c9f5b7f00a61ba4a3452b1831a35adc4269af1b511cb817b7e4528ff7e5a0f67ab1051b8d15affc7a5a12bf82cbc38ad9ec SHA512 e20603abfd88a283b228fafa8765f84bcab7460af0be95d82304b4fa45b6683651de1dbcc6b153fba519fc65f93b1142e9efcde18511b880588355b4c8738f00
-EBUILD gzip-1.7.ebuild 1190 BLAKE2B 55d038edc86ece3e24930394bd320e9928622a8cca4c1da8bd1ddb16a2e8c239aefe95ac7d1932839769a6cf3f6986e899a4d96348a47be46ad775d6efc3a78a SHA512 9c48f878e7953e012253ab5465a656e0eac6d41d33a401ac8b43562f374a1c2ad63dd8f1f0a6d8caf4701d558de8082dd83bb3ee8682ec367d6e03a2b01272c5
+DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
 EBUILD gzip-1.8.ebuild 1189 BLAKE2B 4c6a4cb55803c6ffbb0709b3a53e11bbbd98ad12900429b283b74b4206db319bae15675520447d33a1e7292edec877b3b509c2ba1a07b6da92db5631c624325e SHA512 857d78565eea8c432ed26852c89ba0b9a45c3145b843e9f5804b8ebc4715c7e386a8c5089fad8a89f7e7dcb2c1151f056b09b00a50f6481c7a2e2704b7cf632e
+EBUILD gzip-1.9.ebuild 1122 BLAKE2B e1c85598edd62c27c4079af997cd436aa285ebcc47882d85c59859f8d67fa6b5b28212c368bcac2864010fc058b802f630adfd113d322fa2be49a92c82b4c9f0 SHA512 12bc7fca087b2aa92075d56ceae98b0654aa18c8c67d085084d74f89cd42a6a54ba1b9e6a27d178e4b75aea4cdcfdb862db0ab64d3c13085855db9ca7ef2f8a9
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
index 8d92b609b5dd..6f04b42c7696 100644
--- a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
+++ b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
@@ -1,5 +1,5 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -926,7 +926,7 @@
  	     rm -f "$$dest" && \
  	     case $@ in \
diff --git a/app-arch/gzip/files/gzip-1.4-asmv.patch b/app-arch/gzip/files/gzip-1.4-asmv.patch
index c87855018cff..1be1f63738b0 100644
--- a/app-arch/gzip/files/gzip-1.4-asmv.patch
+++ b/app-arch/gzip/files/gzip-1.4-asmv.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=302773
 
---- tailor.h.old	2010-01-29 11:13:02.000000000 +0000
-+++ tailor.h	2010-01-29 13:18:15.000000000 +0000
+--- a/tailor.h
++++ b/tailor.h
 @@ -69,9 +69,6 @@
  #  include <io.h>
  #  define OS_CODE  0x00
diff --git a/app-arch/gzip/gzip-1.6.ebuild b/app-arch/gzip/gzip-1.6.ebuild
deleted file mode 100644
index f843d530c868..000000000000
--- a/app-arch/gzip/gzip-1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
-	mirror://gnu/gzip/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pic static"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.4-asmv.patch
-}
-
-src_configure() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf
-}
-
-src_install() {
-	default
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
-}
diff --git a/app-arch/gzip/gzip-1.7.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 910bb04b7dec..d582478b998d 100644
--- a/app-arch/gzip/gzip-1.7.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -1,30 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="Standard GNU compressor"
 HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
-	mirror://gnu/gzip/${P}.tar.xz
+SRC_URI="mirror://gnu/gzip/${P}.tar.xz
+	mirror://gnu-alpha/gzip/${P}.tar.xz
 	mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
-	"${FILESDIR}/${PN}-1.4-asmv.patch"
 )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
@@ -39,6 +34,6 @@ src_install() {
 
 	# keep most things in /usr, just the fun stuff in /
 	dodir /bin
-	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
+	mv "${ED%/}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED%/}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED%/}"/bin/gunzip || die
 }
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 265a0e70f69e..ba303f400a69 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 1926 BLAKE2B 0bd32400602038e843f93689f84bf2c98fa663cf1dbb9df654a48afda082248fe8dfaa411855d1289a9f26aae44ec8f418ebdaca37d83cd572387d90e9bc0052 SHA512 8672e96d9a80d388891892dbfe5e46240826f5ab33dce96f3dedbd752c64a5be341a689435840132b3b28275df6590d56e7746638a6d158dd4af2e18ea0c2cb4
+EBUILD snappy-1.1.7.ebuild 1925 BLAKE2B 9bbb86ffadec79eae7c06fc41490129e4094a1bd3969d551614ac9e5167889d01eb0cd9cc638cf2b151af1d4748f71865af8ad489028f85acf3da609f829aa60 SHA512 826c118d3bc8c41ff133ad707e6221aab0c422f6b6df6f642c71db3db7f6c40890ce66ad066b461bf595b2fec373e46babf7f6e1233ce0128d2637c75eb79d8c
 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 b56e491c71da..45af409ab6ba 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/unp/Manifest b/app-arch/unp/Manifest
index 07217d558479..a4299c333960 100644
--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@@ -2,6 +2,6 @@ AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 BLAKE2B 9d060bc629bfbd669f0e
 DIST unp_2.0~pre7+nmu1.tar.bz2 17537 BLAKE2B 7ef6cfcc524daf95c7cd9dc41ba690cb8db1b1983cd45709c8764591af36d6d00631975bfef0359ac633aae1c11b73efe827e367931f73fe7c5fcc8832b0fe84 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362
 DIST unp_2.0~pre7.tar.bz2 14492 BLAKE2B 5155aa3a63ba9aaad981c42ea88602b97c08416384d166979f35a1ddec592b7cfbf4f002a500de0f21a374732f1a5aec85e69bcbb915ca7936edd67f04875898 SHA512 b90238a3e359d45e4b0ec3e5559a682fce3a7a37f74dd5419b005bb7bd3e3e5be03dde2e5d40d1671c0274ff1d795560fa238a572fe6cf3ab12f17dd1e2bcd1d
 EBUILD unp-2.0_pre7.ebuild 907 BLAKE2B 35828af309a0b824d5e90244c1673b3a60ac1deb85135a5727349364969ed3d75b1b24a03febce0b5811cb92fbb91928ca4a245bd71e62715e05497fa47161b2 SHA512 22c61e13cefc72e3b048bd1a9d4cf1736c1970f3896eb5a801df93e0da48d6d54faa17e4ff1879e63cc4e3a7e69e44e3519f0ba5f90bf14ec70cac85525c0d7b
-EBUILD unp-2.0_pre7_p1-r1.ebuild 1231 BLAKE2B 591462db99a2937a260cc27b2edfe086405954ae118bdbc72b28f37e877270b87907695a292b4273aa895bbd98eeb870692411d11fb53b8a1b42e51dc196fb2a SHA512 15419f7849c02357eb7dc4c38ff99302acbdf4325dd90e31d28290ccccc923819cb5b5618c55bd50ee29ad7e55feb6a3a52ff8d070522a67cc97829c132f5823
+EBUILD unp-2.0_pre7_p1-r1.ebuild 1230 BLAKE2B 9f89106a462a6e5ac713f7a5b31e8cbd394318642f8e11f73f10d64e1654705045c2c382d96bd59f24656ba09f66a469b84fa1179945dff36a92aa9714c38fb0 SHA512 afeb1d792d4a30a9b4db076080d44c201bd85217350f211db0ea22db428070a73cd7473b225b9461128bb652d3fdb14742a09ebba202a7e740ef7fcaabca434b
 EBUILD unp-2.0_pre7_p1.ebuild 1028 BLAKE2B bb3893a4d7513454e34c6c3d11d53790e25d57bf7af309ce8a1215ddae861b49637df86318281cd3e12f2f1d1f4d78c5da3dd79fbcf11bcf93c983ab59004120 SHA512 5095690f96dbc6a3fe47bf550863ee3b795b14ed9b9e6f3594ea5ae7ac2ef93774f0d30277a9eb2f0e9ba53ca0ca9e4c481dd462cd5de52fb178d3156af02901
 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 f62ac3041d62..cfaff187f34c 100644
--- a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
+++ b/app-arch/unp/unp-2.0_pre7_p1-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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 32f1c7d43871..5056d416f9c7 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 1324 BLAKE2B 4acb0aae2afd8170cd72ce23644daa8cb155cc60918ce86b569ab5a489f421f278d6e9505aabdd0dfc05fff82f3af08004120c285c522b28a2bd59492840b2e1 SHA512 5a9be3a0f23c0208dcd61957a2c608bbd9f58fe872864781589951c8a201686357ae6843389ffbefbefce65a4e9e93acd2dce66aecc5b5630f41f219c895c8e0
+EBUILD xarchiver-0.5.4.12.ebuild 1322 BLAKE2B e07038fe2f550774e807838c6c2b09d9ed49967f5506b7b5a645c30e3d2f5ebf1df9a17262eac64b06b43ce3a55ebb833346a2c1304182e210cfab5e25f92d63 SHA512 65f70528f6fc663af07021feb1e6420add8b44e63cc9ce190a043e32e616ec9286406f876235e791f95d5e6fd80ea77e2350cd31e5ace28566db13e1592cba59
 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 800786fd793f..d5d6ad278419 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:=