Merge updates from master

40 files changed, 43 insertions, 40 deletions

diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index 8c7496678088..fa253ed21ba9 100644
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-editors/nano/nano-2.6.3.ebuild b/app-editors/nano/nano-2.6.3.ebuild
index 3aa2c96495de..84b9d333916f 100644
--- a/app-editors/nano/nano-2.6.3.ebuild
+++ b/app-editors/nano/nano-2.6.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 875da69a9cf1..af51950ac27b 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla"
 
 RESTRICT=test
diff --git a/app-text/llpp/llpp-23.ebuild b/app-text/llpp/llpp-23.ebuild
index 80189bc4b462..942740da10b9 100644
--- a/app-text/llpp/llpp-23.ebuild
+++ b/app-text/llpp/llpp-23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://repo.or.cz/llpp.git/snapshot/b51644926dda712aebdc3f075bdc0771f35
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.10a:0=[static-libs]
diff --git a/app-text/mupdf/mupdf-1.10a.ebuild b/app-text/mupdf/mupdf-1.10a.ebuild
index 00c21c0217c7..26df2816d85b 100644
--- a/app-text/mupdf/mupdf-1.10a.ebuild
+++ b/app-text/mupdf/mupdf-1.10a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://mupdf.com/downloads/${P}-source.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
 
 LIB_DEPEND="
diff --git a/app-text/tesseract/tesseract-3.04.01.ebuild b/app-text/tesseract/tesseract-3.04.01.ebuild
index 9ff1eba608a0..9ab2c5a011a1 100644
--- a/app-text/tesseract/tesseract-3.04.01.ebuild
+++ b/app-text/tesseract/tesseract-3.04.01.ebuild
@@ -62,7 +62,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 sparc x86"
 
 IUSE="doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
 
diff --git a/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild b/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
index 3dad30704078..9b90434f0f3a 100644
--- a/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs vim-syntax static-libs test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-cpp/libbinio/libbinio-1.4-r1.ebuild b/dev-cpp/libbinio/libbinio-1.4-r1.ebuild
index 520026c5b502..a7a0772281e0 100644
--- a/dev-cpp/libbinio/libbinio-1.4-r1.ebuild
+++ b/dev-cpp/libbinio/libbinio-1.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-lang/mujs/mujs-0_p20161202.ebuild b/dev-lang/mujs/mujs-0_p20161202.ebuild
index bc58e1555e4a..10c4b1770309 100644
--- a/dev-lang/mujs/mujs-0_p20161202.ebuild
+++ b/dev-lang/mujs/mujs-0_p20161202.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbd
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-lang/ocaml/ocaml-4.04.0.ebuild b/dev-lang/ocaml/ocaml-4.04.0.ebuild
index d7d90a8efa2b..a133a608bdbf 100644
--- a/dev-lang/ocaml/ocaml-4.04.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
 
 RDEPEND="
diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild
index 5441416dfd70..8b79c652fe5c 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-58.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="amd64 hppa ia64 ppc64 ~x86"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 ~x86"
 IUSE="debug static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libuv/libuv-1.10.2.ebuild b/dev-libs/libuv/libuv-1.10.2.ebuild
index 1d01248c31e1..e82ff1f28c55 100644
--- a/dev-libs/libuv/libuv-1.10.2.ebuild
+++ b/dev-libs/libuv/libuv-1.10.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc x86 ~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 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-ml/camlimages/camlimages-4.2.2.ebuild b/dev-ml/camlimages/camlimages-4.2.2.ebuild
index 07b400b8c2d3..8596299133a3 100644
--- a/dev-ml/camlimages/camlimages-4.2.2.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="doc exif gif gtk jpeg png postscript tiff truetype X xpm"
 
 RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index 6df75fd34fc6..cde082951a74 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.04_beta:=[ocamlopt?]"
diff --git a/dev-ml/camlzip/camlzip-1.06.ebuild b/dev-ml/camlzip/camlzip-1.06.ebuild
index 5d53eaf694ea..173b3e6970c3 100644
--- a/dev-ml/camlzip/camlzip-1.06.ebuild
+++ b/dev-ml/camlzip/camlzip-1.06.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1616/${P}.tar.gz"
 
 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
diff --git a/dev-ml/facile/facile-1.1.2.ebuild b/dev-ml/facile/facile-1.1.2.ebuild
index 83a4bb73cdc0..b8b385bb1ed3 100644
--- a/dev-ml/facile/facile-1.1.2.ebuild
+++ b/dev-ml/facile/facile-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.recherche.enac.fr/log/facile/distrib/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
index 1c39acf27b9e..02cdae2ad03c 100644
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@@ -14,7 +14,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
index ea92b3c77006..e5bbc99ac1c9 100644
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://forge.ocamlcore.org/frs/download.php/1628/${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild
index 2648a2079717..bbb14423956f 100644
--- a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="$DEPEND"
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 
 src_compile()
 {
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild
index 41ee22991b5b..e5a95434f8fa 100644
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3.ebuild
@@ -18,7 +18,7 @@ RDEPEND="${DEPEND}"
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 src_compile() {
 	emake -j1
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
index c64db04f4625..35a09b65772e 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
index cd24a5c1b706..3cbbd5a4bf24 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"
 SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )"
 DEPEND="${RDEPEND}
diff --git a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild b/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
index 566cc1a14528..c59a330d0d85 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.39.ebuild
@@ -14,7 +14,7 @@ IUSE=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 
 DEPEND=">=dev-lang/ocaml-3.09:=
 	virtual/latex-base
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
index 6a68ef62b6fd..11f73d83529d 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/v${PV}/${P}.tar.
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND=">=dev-libs/libpcre-4.5
 	>=dev-lang/ocaml-4:="
diff --git a/dev-ml/res/res-4.0.7.ebuild b/dev-ml/res/res-4.0.7.ebuild
index 75f066dda698..959722aedae7 100644
--- a/dev-ml/res/res-4.0.7.ebuild
+++ b/dev-ml/res/res-4.0.7.ebuild
@@ -17,7 +17,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	>=dev-ml/findlib-1.5"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
diff --git a/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild b/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild
index 6b038b8efd5d..f7bcdd441243 100644
--- a/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild
+++ b/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Generic cache interface and implementations"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ppc64 x86 ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
index 6cc6085696fd..ecd314f615e5 100644
--- a/dev-python/pyparted/pyparted-3.10.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.10.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 REQUIRED_USE="
 	test? ( python_targets_python2_7 )
diff --git a/dev-util/debootstrap/debootstrap-1.0.87.ebuild b/dev-util/debootstrap/debootstrap-1.0.87.ebuild
index 4e7c11123207..274f8b533692 100644
--- a/dev-util/debootstrap/debootstrap-1.0.87.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.87.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index b1aeae539e45..26a532f01705 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
index 131a5a93034f..19198f560c83 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.68k.org/~michael/audiofile/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="flac static-libs test"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
index 32568a9719bb..3ea260990a58 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 SRC_URI+=" https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-h264-patches.tar.xz"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
index c4e1d2e997c7..cd47be5fa385 100644
--- a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
+++ b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="snmp ssl"
 
 COMMON_DEPEND="
diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index f3d5a4876f37..0b22d113a0af 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-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="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index aa8359b44adf..5603207a6719 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -16,7 +16,6 @@
 			tracking</flag>
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
 			getting ip</flag>
-		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
 		<flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg>
 			in libnm.</flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 4ccb5c112277..9796b139302b 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -5,6 +5,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Michael Palimaka <kensington@gentoo.org (26 Jan 2017)
+# Requires testing version of media-libs/opencv
+media-libs/mlt opencv
+
 # Johannes Huber <johu@gentoo.org> (25 Jan 2017)
 # Fails to build with dev-lang/ocaml-0.04.0 which
 # needs to be stabilized due to security issue.
diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild
index 58158ce3bcb5..5c0fc45b98ee 100644
--- a/sci-calculators/units/units-2.13.ebuild
+++ b/sci-calculators/units/units-2.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units_cur"
 
 DEPEND="
diff --git a/sys-apps/portage/portage-2.3.3.ebuild b/sys-apps/portage/portage-2.3.3.ebuild
index 1f9920b6d6d3..4c08be2f141a 100644
--- a/sys-apps/portage/portage-2.3.3.ebuild
+++ b/sys-apps/portage/portage-2.3.3.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
diff --git a/sys-cluster/keepalived/keepalived-1.2.24.ebuild b/sys-cluster/keepalived/keepalived-1.2.24.ebuild
index 3f34605bb163..aca8c601150d 100644
--- a/sys-cluster/keepalived/keepalived-1.2.24.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="debug ipv6 snmp"
 
 RDEPEND="dev-libs/popt
diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild
index 3c522feb49ef..12ade0cebd53 100644
--- a/sys-devel/make/make-4.2.1.ebuild
+++ b/sys-devel/make/make-4.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/x11-misc/ktsuss/ktsuss-2.1.ebuild b/x11-misc/ktsuss/ktsuss-2.1.ebuild
index 040ff1f60470..102c402896a8 100644
--- a/x11-misc/ktsuss/ktsuss-2.1.ebuild
+++ b/x11-misc/ktsuss/ktsuss-2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nomius/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~mips ppc ~ppc64 x86"
 IUSE="sudo"
 
 RDEPEND=">=x11-libs/gtk+-2.12.11:2