Merge updates from master

9 files changed, 10 insertions, 10 deletions

diff --git a/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
index 64c3176f5135..91ac41ef891e 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://trac.openscenegraph.org/downloads/developer_releases/${MY_P}.zip
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/35" # Subslot consists of major + minor version number
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
 jpeg2k las libav lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff
 truetype vnc wxwidgets xine xrandr zlib"
diff --git a/dev-libs/libbsd/libbsd-0.8.3.ebuild b/dev-libs/libbsd/libbsd-0.8.3.ebuild
index 55af9c632aea..d5d3bc846dde 100644
--- a/dev-libs/libbsd/libbsd-0.8.3.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.3.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 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
index 1894fcd450c7..b1f8a52e792f 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild
index c70eb264af63..1664c7a8e0ac 100644
--- a/dev-php/pear/pear-1.10.1-r1.ebuild
+++ b/dev-php/pear/pear-1.10.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="PEAR - PHP Extension and Application Repository"
 HOMEPAGE="http://pear.php.net/"
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index db08cab1e85c..0f319d2a2323 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -197,7 +197,7 @@ _python_single_set_globals() {
 		# variables without PYTHON_SINGLE_TARGET.
 		PYTHON_REQUIRED_USE="${flags_mt[*]}"
 		python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" PYTHON_PKG_DEP
-		PYTHON_DEPS="${PYTHON_PKG_DEP} "
+		PYTHON_DEPS="${flags_mt[*]}? ( ${PYTHON_PKG_DEP} ) "
 		# Force on the python_single_target_* flag for this impl, so
 		# that any dependencies that inherit python-single-r1 and
 		# happen to have multiple implementations will still need
diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild b/media-sound/aqualung/aqualung-1.0-r1.ebuild
index 40cd9d6dfb50..9cebbcb2845e 100644
--- a/media-sound/aqualung/aqualung-1.0-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 3be17ec45246..4fc3c6f23441 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -15,6 +15,6 @@ DIST patch-3.18.48.xz 1084852 SHA256 0726728455304b075c03970359ee59bb8b1ad7f9f5f
 DIST patch-3.2.84.xz 1649140 SHA256 6ba37e79fc13c7c62ac368258731fe6111f194b5ae279f742b042aaf2ca73eb9 SHA512 0ac685d6a2434cefaf4e099aeb39d5bf5dced6cf5be1140225e14e960744e8b78faf64957cdda6c53b6e01b9578a3bad8b9f745e9cb2a89b89aa7400223b913f WHIRLPOOL df6fb1421189b47d300ef7bc77ce61b245860d30e901bc7d918463c78ed5452e7d0668a8e30eb0d84238b714b7454c3026769e2000dc1378074e0cadc402cca4
 DIST patch-3.4.113.xz 1362096 SHA256 d5492eeaadcf12aaad471011066e447907999035c26368da8e4f82b1871ef03a SHA512 cd212cb2c2d6fb911571472466027c7e502277f7af2426050a5afcd4c7799920e48414190b8a8a039f88d85bbf0d9e164c7d8c45982bf51f7567da9304137688 WHIRLPOOL bc88441d583b9ed2f315b6ed809c168cb00af5a3c1f91fd1e4bd651a5f21cc69fd9343460976b5707916ec992b3e7a2f519953ce1bbc55fbb3290237ec4b44a3
 DIST patch-4.1.38.xz 945376 SHA256 97eaedf1a4f5b931271035f640690757c0a3239d89f69c6dd7774d3371b589b6 SHA512 2d271e94fecc1a97c990de0e042cd20d5acdf6adfa71e71e162cf4886218b9481284aba4dd0201f777b146e309bfdf9d95062cfc878c08f613d8b50222010d2c WHIRLPOOL c947507c4e325bbdcdf2a49a2c58963bdf9b5876ebbfb8cce0a4b7c97fbb4fdefe904c52f59735efad24cd22becdf278e8d3bf898b2faa048618711161cd6f7b
-DIST patch-4.4.49.xz 948364 SHA256 2fbabe12dc00bfdcac70a8dbb24c70e63cc2a0b7896e0b6ef3394c770f96bb1b SHA512 8fd5e0130bb0cfcbcc13f82c1fe1af3d6b000e613f9d735563388e395f69f735bc82431729a3000fcd69488115b094b31c8e3e6582a2ea0cb49a77b0321f6ca7 WHIRLPOOL db0e8e5f3da26fc1799137ba8546a9538c56a385ae9b46003ce96b24b8b52ef3c764f844e31c9e9d5c602d69b5bf027a35186f1445ebde24e89a1897807b5aa9
+DIST patch-4.4.50.xz 952768 SHA256 c5756a4b7290092d875967c310b684dbd91cb57438a25a3603bce6b1d0f19b36 SHA512 07d9a641a44dbe0aff557031e4281401104fd4037d6ac4ebbbb4fef8c25bc49043afca8a27c0daa931ed54103ddb85ddf9ada22ba6a0b27e762dfa7fc37d5224 WHIRLPOOL fd15d1967fab5d5ff0bd1eb9a91411f501c90885247912239625cb8293ea29075ead8d3e3abf99b9ad4ca5e22a243115d513aff29c77367535d6fc8877f7b4ab
 DIST patch-4.8.17.xz 320288 SHA256 1e4be6f6a8eab3edcd0899db382fe1a9330320c603a9ad2c32ebb1dc6f53b3db SHA512 df239d990077cdf697fd487b4b8abb97fe442ac9fac4ed2e90c626560fc15058363310cf40580fd000d4ad55198486594a608544ce9c2bcaf03704415aa45441 WHIRLPOOL 401c8ee9f41b78b355ab76f1f0ed25b53855f641e0c27c07461e82af4e322fe958f73ef3cce6d074de2a6be550c8c8615a0a53187f3f9d17c8bd8b928d3a6051
-DIST patch-4.9.10.xz 271672 SHA256 d6350ace4757775a76f2b7f76ab1b16756587a2f6ab06182fee8125eb01dd3f4 SHA512 93958f4b932a46bbd9a122f52bf09b8c4b864b419a0774514baeb7dc83f11f55a5ba84f2e586a904dbfeeb7d976352e40670fbe2e32e25c35085ddf87e41b58d WHIRLPOOL 8024e77f73ec5b80daf36a066fae6dadca595ec3aaf2d2bfe571d33c9bf748e395509e437faccd46db269d3d3c355af6a0232d91e15065997fbc40aa18078df4
+DIST patch-4.9.11.xz 283140 SHA256 23e773a670f3cac11a92c4e442405dea6d2c28fea0f914ea2ba4bea313c26541 SHA512 7683628b011fa1462b5838301ebabc3eebaefcd50f65600be55bcf0102578ca07589c7683ef84b8d5300bd05795655fb21e1c145f5663d30593fc1801c163bc3 WHIRLPOOL 1ed9d2afeb42dbb20b566bbe092a18e534f57a874e58a62b8db6e6b1014779309ca68d75c17fef4e46ff00c09937992ab8245222563559466d3e905ff3d8bdab
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.49.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.50.ebuild
index 6aed91d53279..6aed91d53279 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.49.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.50.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.10.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.11.ebuild
index 6aed91d53279..6aed91d53279 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.10.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.11.ebuild