Merge updates from master

33 files changed, 192 insertions, 123 deletions

diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 5c0efa64b99a..df3b997f88e7 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,3 +1 @@
-DIST opencc-0.3.0_pre20120819.tar.xz 363528 SHA256 3ed46594547b86f1326b07c3ea910148b1c58b74c9d21c8d4e11ec30e2254fae SHA512 0ca231b5fd7b314111a76bfaa8e288fc2d43e02dbbb2a7c7e9312c1f1f0aed1a0d3b67b04b0cc3634d1b48b8fe6983e6219db053f3a2114abadec1af00b9f8d5 WHIRLPOOL 268d331479bffefdc6e1f58600422a36a32abb7d4dd873eeb216977daca05f4a4775ca547bb301bc16ea8fc702ef04cfd5d8f88c90d10e224a585575129e67c6
-DIST opencc-0.4.3.tar.gz 535151 SHA256 7bdcf9e38ac05a16750d5276494d810db107c8a8b5f8b87e2357ee167a13a587 SHA512 ac31c3c018467cf047e077d399903560feb0f8c214accd1ef45d0b1477d011af8e9bf2dbde4497c133daef61b6508460e9b2b04c0b5f336c2d67fc840a1d07e6 WHIRLPOOL 316857e7720e962c9fde27c04327c0c6b5137ca7290b170cc1ead86dcd0c6f14202ac2386f6e565ad12ebca99c939a511447902054792203edeabed88e149a2e
 DIST opencc-1.0.4.tar.gz 1597309 SHA256 0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac SHA512 682cc621fddb6495f26675863faefe7c9f584d2c60676cee0a3ff2120828a09a5e71671f5537030c2cc874f55b7f22af70d9d376f17b83e30cb04dcd5f6bba8a WHIRLPOOL 964180d27db85df6ffb4310ea6cae7b6c294c163bce68d05a5a21e8e736be6c11b44f8a2a856481b47e14c8c1104d244fc294259cbfa2f3160912743ac933cd6
diff --git a/app-i18n/opencc/files/opencc-0.3.0_pre20120819-cmake-libdir.patch b/app-i18n/opencc/files/opencc-0.3.0_pre20120819-cmake-libdir.patch
deleted file mode 100644
index 76dc4330c440..000000000000
--- a/app-i18n/opencc/files/opencc-0.3.0_pre20120819-cmake-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,11 +70,11 @@ set (DIR_SHARE ${DIR_PREFIX}/share)
- set (DIR_BIN ${DIR_PREFIX}/bin)
- set (DIR_ETC ${DIR_PREFIX}/etc)
- 
- if (DEFINED CMAKE_INSTALL_LIBDIR)
--	set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR})
--	set (DIR_LIBRARY_STATIC ${CMAKE_INSTALL_LIBDIR})
-+	set (DIR_LIBRARY ${DIR_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-+	set (DIR_LIBRARY_STATIC ${DIR_PREFIX}/${CMAKE_INSTALL_LIBDIR})
- endif (DEFINED CMAKE_INSTALL_LIBDIR)
- 
- if (DEFINED SHARE_INSTALL_PREFIX)
- 	set (DIR_SHARE ${SHARE_INSTALL_PREFIX})
- endif (DEFINED SHARE_INSTALL_PREFIX)
diff --git a/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild b/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild
deleted file mode 100644
index 1d81dd28c572..000000000000
--- a/app-i18n/opencc/opencc-0.3.0_pre20120819-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils multilib eutils
-
-DESCRIPTION="Libraries for Simplified-Traditional Chinese Conversion"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="+nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-DOCS="AUTHORS README"
-
-src_prepare() {
-	sed -i \
-		-e "s:\${CMAKE_\(SHARED\|STATIC\)_LIBRARY_PREFIX}:\"$(get_libdir)\":" \
-		CMakeLists.txt || die
-	epatch "${FILESDIR}"/${P}-cmake-libdir.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_enable nls GETTEXT)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use static-libs || find "${ED}" -name '*.la' -o -name '*.a' -exec rm {} +
-}
diff --git a/app-i18n/opencc/opencc-0.4.3.ebuild b/app-i18n/opencc/opencc-0.4.3.ebuild
deleted file mode 100644
index 8a7d1f13d10c..000000000000
--- a/app-i18n/opencc/opencc-0.4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib eutils
-
-DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-SRC_URI="https://opencc.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-DOCS="AUTHORS NEWS.md README.md"
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_enable nls GETTEXT)"
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use static-libs || find "${ED}" -name '*.la' -o -name '*.a' -exec rm {} +
-}
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
index ad443883162e..d7d6bbf92604 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.500.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.500.0.ebuild
index 8c5aa1d811d2..74d65fcea65d 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.500.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.500.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test system-sqlite"
 
 # NB: Get min sqlite version from sqlite3.c
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
index b13191f6cfd5..2525d79a8046 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="dev-perl/Net-CIDR-Lite
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild
index 847f7b0ae7f9..5254fdd7575e 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~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="libressl test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
index a6a4d5382e97..edd78dda3489 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="ipv6? ( dev-perl/Socket6 )"
diff --git a/dev-perl/PadWalker/PadWalker-2.200.0.ebuild b/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
index 42d301af4258..cab771d0ba93 100644
--- a/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Pango/Pango-1.227.0.ebuild b/dev-perl/Pango/Pango-1.227.0.ebuild
index 20ddbd13f5f7..44f16a1b5366 100644
--- a/dev-perl/Pango/Pango-1.227.0.ebuild
+++ b/dev-perl/Pango/Pango-1.227.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Layout and render international text"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
index b860ab0302ca..1960386fc384 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
index 243389e1352d..4a4e1903637b 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="PerlIO layer to gzip/gunzip"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
index e43978da96c5..44b3e3b84e93 100644
--- a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
+++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Unix process table information"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="examples"
 
 PATCHES=(
diff --git a/dev-perl/Socket6/Socket6-0.270.0.ebuild b/dev-perl/Socket6/Socket6-0.270.0.ebuild
index 7b4281e4fd05..7d423ce3a380 100644
--- a/dev-perl/Socket6/Socket6-0.270.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.270.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
index e97627204405..b0055bfc5d0f 100644
--- a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
index 999d2ddd73f9..95f601e7d772 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Retrieve names of code references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild b/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild
index 7e26c46355da..f2d28e2dbd43 100644
--- a/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild
+++ b/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Memory informations"
 
 LICENSE="LGPL-2.1 ${LICENSE}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
index b056c6af7054..5ee66d07491a 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change terminal modes, and perform non-blocking reads"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
index 0633597b7874..0382a083a759 100644
--- a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
+++ b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Data Driven Testing Framework"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
index 65cc5b83a8c5..f623965c2604 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86"
 IUSE="test"
 PERL_RM_FILES=(
 	"t/boilerplate.t"
diff --git a/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild b/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild
index 8c0a4f17083e..5b19a3525c61 100644
--- a/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild
+++ b/dev-perl/Test-YAML/Test-YAML-1.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Testing Module for YAML Implementations"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild
index 17bb11464c98..f6cfe290fd31 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.230.0.ebuild
@@ -13,7 +13,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild b/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild
index 1b213c146dc8..71ac1fe4f39f 100644
--- a/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild
+++ b/dev-perl/Text-Wrapper/Text-Wrapper-1.50.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Word wrap text by breaking long lines"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 IUSE="test minimal"
 
 RDEPEND="virtual/perl-Carp"
diff --git a/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
index c0273879f526..12c33ecfa71b 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module multilib
 DESCRIPTION="A Perl extension interface to James Clark's XML parser, expat"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~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=""
 
 RDEPEND=">=dev-libs/expat-1.95.1-r1"
diff --git a/dev-perl/YAML-Syck/YAML-Syck-1.290.0.ebuild b/dev-perl/YAML-Syck/YAML-Syck-1.290.0.ebuild
index 8498fcaa5e0c..210cfa5bf34a 100644
--- a/dev-perl/YAML-Syck/YAML-Syck-1.290.0.ebuild
+++ b/dev-perl/YAML-Syck/YAML-Syck-1.290.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast, lightweight YAML loader and dumper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/YAML/YAML-1.150.0.ebuild b/dev-perl/YAML/YAML-1.150.0.ebuild
index 2066f4b00e6e..fe73d5c524e1 100644
--- a/dev-perl/YAML/YAML-1.150.0.ebuild
+++ b/dev-perl/YAML/YAML-1.150.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="YAML Ain't Markup Language (tm)"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/net-misc/quagga/quagga-1.1.1.ebuild b/net-misc/quagga/quagga-1.1.1.ebuild
index 76d456f5dd23..36509c0aec06 100644
--- a/net-misc/quagga/quagga-1.1.1.ebuild
+++ b/net-misc/quagga/quagga-1.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~s390 ~sparc ~x86"
 
 IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
 
diff --git a/sys-apps/usb_modeswitch/files/usb_modeswitch.sh-tmpdir.patch b/sys-apps/usb_modeswitch/files/usb_modeswitch.sh-tmpdir.patch
new file mode 100644
index 000000000000..5039d44da1fd
--- /dev/null
+++ b/sys-apps/usb_modeswitch/files/usb_modeswitch.sh-tmpdir.patch
@@ -0,0 +1,18 @@
+Script that this patch modifies and usb_modeswitch_dispatcher Tcl script
+that is being called by it both need a writable temporary directory which
+is a problematic requirement for example if usb_modeswitch is triggered
+by a module loaded during system startup.
+Fortunately, /run is available very early at boot so let's redirect them
+there instead.
+
+--- a/usb_modeswitch.sh	2016-11-29 17:29:47.000000000 +0100
++++ b/usb_modeswitch.sh	2016-11-30 01:11:51.747993839 +0100
+@@ -17,6 +17,8 @@
+ 	return 0
+ }
+ 
++export TMPDIR=/run
++
+ if [ $(expr "$1" : "--.*") ]; then
+ 	p_id=$4
+ 	if [ -z $p_id ]; then
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
index ceb9bfd3b851..74132f36d153 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -37,6 +37,7 @@ CONFIG_CHECK="~USB_SERIAL"
 
 src_prepare() {
 	sed -i -e '/install.*BIN/s:-s::' Makefile || die
+	epatch "${FILESDIR}/usb_modeswitch.sh-tmpdir.patch"
 }
 
 src_compile() {
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch
new file mode 100644
index 000000000000..7ffc062006c0
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch
@@ -0,0 +1,121 @@
+From https://github.com/plougher/squashfs-tools/pull/9
+
+From 4280e74de14070869787a9166242f9ce2dafd82e Mon Sep 17 00:00:00 2001
+From: Alexandru Ardelean <aa@ocedo.com>
+Date: Wed, 6 Jan 2016 15:33:43 +0200
+Subject: [PATCH] squashfs-tools: with fnmatch.h compatibility with musl
+
+musl does not define FNM_EXTMATCH
+
+Signed-off-by: Alexandru Ardelean <aa@ocedo.com>
+---
+ squashfs-tools/action.c         |  2 +-
+ squashfs-tools/fnmatch_compat.h | 32 ++++++++++++++++++++++++++++++++
+ squashfs-tools/mksquashfs.c     |  2 +-
+ squashfs-tools/unsquashfs.c     |  1 +
+ squashfs-tools/unsquashfs.h     |  1 -
+ 5 files changed, 35 insertions(+), 3 deletions(-)
+ create mode 100644 squashfs-tools/fnmatch_compat.h
+
+diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c
+index 35889a4..4b06ccb 100644
+--- a/squashfs-tools/action.c
++++ b/squashfs-tools/action.c
+@@ -31,7 +31,6 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <fnmatch.h>
+ #include <pwd.h>
+ #include <grp.h>
+ #include <sys/wait.h>
+@@ -43,6 +42,7 @@
+ #include "mksquashfs.h"
+ #include "action.h"
+ #include "error.h"
++#include "fnmatch_compat.h"
+ 
+ /*
+  * code to parse actions
+diff --git a/squashfs-tools/fnmatch_compat.h b/squashfs-tools/fnmatch_compat.h
+new file mode 100644
+index 0000000..7b4afd8
+--- /dev/null
++++ b/squashfs-tools/fnmatch_compat.h
+@@ -0,0 +1,32 @@
++#ifndef FNMATCH_COMPAT
++#define FNMATCH_COMPAT
++/*
++ * Squashfs
++ *
++ * Copyright (c) 2015
++ * Phillip Lougher <phillip@squashfs.org.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2,
++ * or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * fnmatch_compat.h
++ */
++
++#include <fnmatch.h>
++
++#ifndef FNM_EXTMATCH
++#define FNM_EXTMATCH	0
++#endif
++
++#endif
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index d221c35..4e7cbdd 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -46,7 +46,6 @@
+ #include <sys/mman.h>
+ #include <pthread.h>
+ #include <regex.h>
+-#include <fnmatch.h>
+ #include <sys/wait.h>
+ #include <limits.h>
+ #include <ctype.h>
+@@ -76,6 +75,7 @@
+ #include "read_fs.h"
+ #include "restore.h"
+ #include "process_fragments.h"
++#include "fnmatch_compat.h"
+ 
+ int delete = FALSE;
+ int fd;
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index 1323dd6..2428baa 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -30,6 +30,7 @@
+ #include "xattr.h"
+ #include "unsquashfs_info.h"
+ #include "stdarg.h"
++#include "fnmatch_compat.h"
+ 
+ #include <sys/sysinfo.h>
+ #include <sys/types.h>
+diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
+index ecd0bb4..0edbd25 100644
+--- a/squashfs-tools/unsquashfs.h
++++ b/squashfs-tools/unsquashfs.h
+@@ -40,7 +40,6 @@
+ #include <grp.h>
+ #include <time.h>
+ #include <regex.h>
+-#include <fnmatch.h>
+ #include <signal.h>
+ #include <pthread.h>
+ #include <math.h>
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch
new file mode 100644
index 000000000000..52b7f48c8eab
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch
@@ -0,0 +1,24 @@
+From https://github.com/plougher/squashfs-tools/pull/9
+
+From b0ca8a5c98ff73e70b2ab1bc24aa824aa2458287 Mon Sep 17 00:00:00 2001
+From: Alexandru Ardelean <aa@ocedo.com>
+Date: Wed, 6 Jan 2016 15:36:48 +0200
+Subject: [PATCH] pseudo.c: add explicit <sys/stat.h> include
+
+Signed-off-by: Alexandru Ardelean <aa@ocedo.com>
+---
+ squashfs-tools/pseudo.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
+index f85fe60..83bfc97 100644
+--- a/squashfs-tools/pseudo.c
++++ b/squashfs-tools/pseudo.c
+@@ -32,6 +32,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/stat.h>
+ #include <ctype.h>
+ 
+ #include "pseudo.h"
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
index 7b050d6908ad..1729abe02c72 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
@@ -38,6 +38,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-local-cve-fix.patch
 	epatch "${FILESDIR}"/${P}-mem-overflow.patch
 	epatch "${FILESDIR}"/${P}-xattrs.patch
+	epatch "${FILESDIR}"/${P}-extmatch.patch
+	epatch "${FILESDIR}"/${P}-musl.patch
 }
 
 use10() { usex $1 1 0 ; }