Merge updates from master

5 files changed, 10 insertions, 10 deletions

diff --git a/media-libs/libmtp/libmtp-1.1.14.ebuild b/media-libs/libmtp/libmtp-1.1.14.ebuild
index b009b4abaff4..079492dd3eff 100644
--- a/media-libs/libmtp/libmtp-1.1.14.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.14.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
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 86f9bc1b2151..e35354c3e66c 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.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
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 LICENSE="szip"
 
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="static-libs"
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/x11-libs/libast/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r1.ebuild
index 079c427988ad..281091cbdc3a 100644
--- a/x11-libs/libast/libast-0.7-r1.ebuild
+++ b/x11-libs/libast/libast-0.7-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
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
index 377b2c070edc..1dd2077a99bc 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r2.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
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libICE
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
index 57d8b9750d5d..6c5f1648423c 100644
--- a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.8-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
@@ -10,7 +10,7 @@ SRC_URI="http://www.kde-look.org/content/files/$MY_P.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 S=${WORKDIR}/${MY_P:5}