summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-text/llpp/Manifest3
-rw-r--r--app-text/llpp/llpp-20_p20140818.ebuild97
-rw-r--r--app-text/llpp/llpp-22.ebuild95
-rw-r--r--app-text/llpp/llpp-22_p20160324.ebuild94
-rw-r--r--app-text/zathura-pdf-mupdf/Manifest2
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.8.ebuild57
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0.ebuild57
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild4
-rw-r--r--media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild4
-rw-r--r--media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild4
-rw-r--r--media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild4
-rw-r--r--media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild4
-rw-r--r--media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild4
-rw-r--r--media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild4
-rw-r--r--media-libs/smpeg/smpeg-0.4.4-r10.ebuild4
-rw-r--r--media-libs/taglib/taglib-1.10.ebuild2
-rw-r--r--media-libs/taglib/taglib-1.11.1.ebuild4
-rw-r--r--media-libs/taglib/taglib-1.9.1-r2.ebuild4
-rw-r--r--media-libs/tiff/tiff-3.9.7-r1.ebuild4
-rw-r--r--media-libs/tiff/tiff-4.0.6-r1.ebuild4
-rw-r--r--media-libs/tiff/tiff-4.0.6.ebuild4
-rw-r--r--media-libs/tiff/tiff-4.0.7.ebuild2
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild4
-rw-r--r--media-plugins/emotion_generic_players/emotion_generic_players-1.15.0.ebuild4
-rw-r--r--media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild4
-rw-r--r--media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild4
-rw-r--r--media-plugins/evas_generic_loaders/evas_generic_loaders-1.15.0.ebuild4
-rw-r--r--media-plugins/evas_generic_loaders/evas_generic_loaders-1.16.0.ebuild4
-rw-r--r--media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild4
-rw-r--r--media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31-r1.ebuild4
-rw-r--r--media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36-r1.ebuild4
-rw-r--r--media-plugins/gst-plugins-mad/gst-plugins-mad-0.10.19-r1.ebuild4
-rw-r--r--media-plugins/gst-plugins-mad/gst-plugins-mad-1.8.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild4
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild2
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-1.8.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-0.10.19-r1.ebuild4
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.8.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23-r1.ebuild4
-rw-r--r--media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31-r1.ebuild4
-rw-r--r--media-plugins/gst-plugins-oss/gst-plugins-oss-1.8.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild4
-rw-r--r--media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild4
-rw-r--r--media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild4
-rw-r--r--media-plugins/live/live-2013.02.11.ebuild4
-rw-r--r--media-plugins/live/live-2016.10.11.ebuild4
-rw-r--r--media-plugins/live/live-2016.10.21.ebuild4
-rw-r--r--media-plugins/live/live-2016.11.28.ebuild4
-rw-r--r--media-plugins/live/live-2017.01.26.ebuild2
-rw-r--r--media-sound/audacious/audacious-2.5.4.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.1.1.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.1.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.2.2-r1.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.2.3.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.2.4.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.3.3.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.3.4.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.4.1.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.5.1.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.6.2.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.7.1-r1.ebuild4
-rw-r--r--media-sound/audacious/audacious-3.7.1.ebuild4
-rw-r--r--media-sound/lame/lame-3.99.5-r1.ebuild4
-rw-r--r--media-sound/madplay/madplay-0.15.2b-r1.ebuild4
-rw-r--r--media-sound/mpg321/mpg321-0.3.1-r1.ebuild4
-rw-r--r--media-sound/mpg321/mpg321-0.3.2.ebuild2
-rw-r--r--media-sound/snd/snd-12.8.ebuild4
-rw-r--r--media-sound/snd/snd-16.3.ebuild4
-rw-r--r--media-sound/sox/sox-14.4.2.ebuild4
-rw-r--r--media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild4
-rw-r--r--media-sound/wavpack/wavpack-4.70.0.ebuild4
-rw-r--r--media-sound/wavpack/wavpack-4.80.0.ebuild4
-rw-r--r--media-sound/wavpack/wavpack-5.0.0.ebuild4
-rw-r--r--media-sound/wavpack/wavpack-5.1.0.ebuild2
-rw-r--r--media-video/dirac/dirac-1.0.2-r1.ebuild4
-rw-r--r--media-video/dirac/dirac-1.0.2.ebuild4
-rw-r--r--media-video/lsdvd/lsdvd-0.17.ebuild4
-rw-r--r--net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild4
-rw-r--r--net-analyzer/fping/fping-3.10.ebuild4
-rw-r--r--net-analyzer/fping/fping-3.13.ebuild2
-rw-r--r--net-analyzer/ngrep/ngrep-1.45-r3.ebuild4
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild4
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild4
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.5.5.ebuild4
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild4
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.8.0.ebuild4
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.8.1.ebuild2
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.9.0.ebuild2
-rw-r--r--net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild4
-rw-r--r--net-dialup/minicom/minicom-2.6.ebuild4
-rw-r--r--net-dialup/minicom/minicom-2.7.ebuild4
-rw-r--r--net-dns/libidn/libidn-1.33.ebuild2
-rw-r--r--net-dns/libidn2/libidn2-0.11.ebuild2
-rw-r--r--net-dns/libidn2/libidn2-0.15.ebuild2
-rw-r--r--net-dns/libidn2/libidn2-0.16.ebuild2
-rw-r--r--net-ftp/filezilla/filezilla-3.12.0.2.ebuild4
-rw-r--r--net-ftp/filezilla/filezilla-3.14.1.ebuild4
-rw-r--r--net-ftp/tnftp/tnftp-20141104.ebuild4
-rw-r--r--net-ftp/tnftp/tnftp-20151004.ebuild4
-rw-r--r--net-im/pidgin/pidgin-2.11.0-r1.ebuild4
-rw-r--r--net-irc/epic4/epic4-2.10.1.ebuild4
-rw-r--r--net-irc/ircii/ircii-20110228.ebuild4
-rw-r--r--net-irc/ircii/ircii-20111115.ebuild4
-rw-r--r--net-irc/irssi/irssi-0.8.21.ebuild2
-rw-r--r--net-irc/irssi/irssi-1.0.0.ebuild2
-rw-r--r--net-libs/gnutls/gnutls-3.3.24-r1.ebuild4
-rw-r--r--net-libs/gnutls/gnutls-3.3.25.ebuild4
-rw-r--r--net-libs/gnutls/gnutls-3.3.26.ebuild2
-rw-r--r--net-libs/gnutls/gnutls-3.5.8.ebuild2
-rw-r--r--net-libs/libetpan/libetpan-1.6.ebuild4
-rw-r--r--net-libs/libetpan/libetpan-1.7.2-r1.ebuild4
-rw-r--r--net-libs/libetpan/libetpan-1.7.2.ebuild4
-rw-r--r--net-libs/libetpan/libetpan-1.7.ebuild4
-rw-r--r--net-libs/libgadu/libgadu-1.11.4.ebuild4
-rw-r--r--net-libs/libgadu/libgadu-1.12.0.ebuild4
-rw-r--r--net-libs/libgadu/libgadu-1.12.1.ebuild4
-rw-r--r--net-libs/liblockfile/liblockfile-1.09.ebuild4
-rw-r--r--net-libs/liblockfile/liblockfile-1.10.ebuild2
-rw-r--r--net-libs/liblockfile/liblockfile-1.13.ebuild2
-rw-r--r--net-libs/libnet/libnet-1.1.6-r1.ebuild4
-rw-r--r--net-libs/libnet/libnet-1.1.6.ebuild4
-rw-r--r--net-libs/libnet/libnet-1.2_rc3-r1.ebuild2
-rw-r--r--net-libs/libnet/libnet-1.2_rc3.ebuild4
-rw-r--r--net-libs/libotr/libotr-4.1.1.ebuild4
-rw-r--r--net-libs/libproxy/libproxy-0.4.11-r2.ebuild4
-rw-r--r--net-libs/libproxy/libproxy-0.4.13-r1.ebuild4
-rw-r--r--net-libs/librsync/librsync-0.9.7-r3.ebuild4
-rw-r--r--net-libs/librsync/librsync-2.0.0-r1.ebuild4
-rw-r--r--net-libs/librsync/librsync-2.0.0.ebuild4
-rw-r--r--x11-apps/xconsole/Manifest1
-rw-r--r--x11-apps/xconsole/xconsole-1.0.7.ebuild16
-rw-r--r--x11-misc/util-macros/Manifest4
-rw-r--r--x11-misc/util-macros/util-macros-1.17.1.ebuild12
-rw-r--r--x11-misc/util-macros/util-macros-1.18.0.ebuild12
-rw-r--r--x11-misc/util-macros/util-macros-1.19.1.ebuild (renamed from x11-misc/util-macros/util-macros-1.19.0.ebuild)2
147 files changed, 263 insertions, 677 deletions
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index d5cfb2598948..abff6c4dd4ea 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,4 +1 @@
-DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
-DIST llpp-22.tar.gz 153700 SHA256 06dff0377bb47c172f5cb498f8bce0f362cca910f90e8663fcd3f1500ce8fa0e SHA512 8db70d7c9f10094aef0928b5f69bd9544c3cac427710d409c593708f18e06a96c0f0051b255eb81f1cb3ad9cd2e5c627121bd897db0fac6a9ade1698f9a78738 WHIRLPOOL d8a2dfb889abeebe6a8b7d9bcd57f15198d84cd16de3f9519962c6de84e67722d911b26064c0f70c9fc7087ef5631d8d82d4ec38af0fc752c644facd12ee0aaa
-DIST llpp-22_p20160324.tar.gz 159647 SHA256 8326369aa84aa70073e26ed1905643a2ee8d442a02a10fccd9cd0ab1cf8eabb8 SHA512 b0a2675d55184282492bcfb3af7b47fb97ff3b98b9ff5cf25d515f70fad60e135b870f30dbe13e57a7cd2e401d87f81b330cddf92fd27705d0c1726e4e7e3fe1 WHIRLPOOL bb26ecda248e458e8b5e407ec196938bcd60b2b9118534c792677bed98982a648262e3f662a404fc9e2cf755639ca79806e1471e170b21ca4ba6d84f7efc8fbe
DIST llpp-23.tar.gz 159922 SHA256 83bf72ad88f0532a0163a6dc9bd285ad5ce8604116ec64764738cdb066748927 SHA512 ef89bead66c22ed218a4f7eb06f6f7d9b1d48f6ab6ef4785a5dc73ad486cdf4a5b1131a8a8cec9020e9caa14468528d9f27c88a29ab221e13c9c55616d20c296 WHIRLPOOL e2c5468b744e71036745de63e9172b32cfa7cb2aae3c61c2a71d0ffe8b3a8b0e2502ff300d1a23446619353c6e43b7b6e051a6126ddc45b1997213c67cfd2764
diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
deleted file mode 100644
index 938dfaa84a83..000000000000
--- a/app-text/llpp/llpp-20_p20140818.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
- <app-text/mupdf-1.9a:0=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/fontconfig:1.0[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-# egl? ( media-libs/mesa[static-libs] )
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- dev-lang/ocaml[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20-WM_CLASS.patch
-}
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG"
- #if use egl ; then
- # ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
- # local egl="egl"
- #fi
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
- ewarn ${spath}
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose ocaml str.cma keystoml.ml < KEYS > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o bo.${cmo} le/bo.ml
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
- verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN} misc/${PN}ac
- dodoc KEYS README Thanks fixme
-}
diff --git a/app-text/llpp/llpp-22.ebuild b/app-text/llpp/llpp-22.ebuild
deleted file mode 100644
index bc3878f77112..000000000000
--- a/app-text/llpp/llpp-22.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/561dc5673cea431e930668b0d87b0c4b31a36b39.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs]
- <app-text/mupdf-1.9a:0=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/fontconfig:1.0[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-# egl? ( media-libs/mesa[static-libs] )
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- >=dev-lang/ocaml-4.02[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20-WM_CLASS.patch
-}
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG -std=c99 -Wextra -Wall -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow"
- #if use egl ; then
- # ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
- # local egl="egl"
- #fi
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose sh mkhelp.sh KEYS ${PV} > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
- verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN} misc/${PN}ac
- dodoc KEYS README Thanks fixme
-}
diff --git a/app-text/llpp/llpp-22_p20160324.ebuild b/app-text/llpp/llpp-22_p20160324.ebuild
deleted file mode 100644
index e406c32a72a5..000000000000
--- a/app-text/llpp/llpp-22_p20160324.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="http://repo.or.cz/llpp.git/snapshot/794a8bce7716bf4571ca24c2574caa0f73851aa3.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.9a:0=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/fontconfig:1.0[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-# egl? ( media-libs/mesa[static-libs] )
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- >=dev-lang/ocaml-4.02[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-20-WM_CLASS.patch
-}
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG -std=c99 -Wextra -Wall -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow"
- #if use egl ; then
- # ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
- # local egl="egl"
- #fi
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose sh mkhelp.sh KEYS ${PV} > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
- verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN} misc/${PN}ac
- dodoc KEYS README Thanks fixme
-}
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 0bbcf03eec96..eb3e962f7114 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,3 +1 @@
-DIST zathura-pdf-mupdf-0.2.8.tar.gz 9930 SHA256 9f8b92762cdad14a2a587744c758edc0e1003be6a0c1511486065bdc91a66910 SHA512 fce85f513c7d99e1bc48a288fd9f9a14b8ab01ade660ac8eaeeffb3ceaa695d210026d2c4d9c0bf383df613b98a3cb56499b2c835a7d8873dd896d73c61b7258 WHIRLPOOL a0ba8f961c98c9681ae352097cfd0bd58613929466e1a7f072df8d162fe3d9888a7cf073bf995a4ff88332b96a6e40d91f2c65c23a0bf157e5e15c93f00454f0
-DIST zathura-pdf-mupdf-0.3.0.tar.gz 9914 SHA256 478cb9d1562d08e096ebec4a6db9116d616a3536260197c2a28a2772171f72c8 SHA512 c83eef453176c6317be338260e311c39e049b8ae1ae719445c6303725b4e993758ed3f3a61f0af31032d09f1f2f03574f862d24e36b27fa38732e0b6c7aa18ea WHIRLPOOL 6fef567220a5d1f9140b0d8a216752f92717c24b7abcdc945239acc8f9ee349695c052fefc671f0f47f3e3a9aa1d2e94cd88a9d5c3edd7e64b8edc9e923919a8
DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 SHA256 d9b9edc0297b9eddb53020976f287b4e8db33edef8cfa047d70e02653eb2f81b SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d WHIRLPOOL 5a331b1b90607f6ae56dd6ad356418143ee004028c995ac7b957b75b4f7bb0a762f7e11e860e0e80a3fefa5cc453f3871c054cad93690c42cfc1facdb7aac44e
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.8.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.8.ebuild
deleted file mode 100644
index 098f0e500a74..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~x86"
-else
-KEYWORDS=""
-fi
-IUSE=""
-
-RDEPEND="!app-text/zathura-pdf-poppler
- >=app-text/mupdf-1.7a:=
- <app-text/mupdf-1.9a:=
- >=app-text/zathura-0.3.1
- media-libs/jbig2dec:=
- media-libs/openjpeg:2=
- virtual/jpeg:0
- x11-libs/cairo:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_setup() {
- myzathuraconf=(
- CC="$(tc-getCC)"
- LD="$(tc-getLD)"
- VERBOSE=1
- DESTDIR="${D}"
- MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
- OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
- OPENSSL_LIB=''
- )
-}
-
-src_compile() {
- emake "${myzathuraconf[@]}"
-}
-
-src_install() {
- emake "${myzathuraconf[@]}" install
- dodoc AUTHORS
-}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0.ebuild
deleted file mode 100644
index ccdeb880eba1..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-EGIT_BRANCH="develop"
-
-LICENSE="ZLIB"
-SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~x86"
-else
-KEYWORDS=""
-fi
-IUSE=""
-
-RDEPEND="!app-text/zathura-pdf-poppler
- >=app-text/mupdf-1.7a:=
- <app-text/mupdf-1.9a:=
- >=app-text/zathura-0.3.1
- media-libs/jbig2dec:=
- media-libs/openjpeg:2=
- virtual/jpeg:0
- x11-libs/cairo:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_setup() {
- myzathuraconf=(
- CC="$(tc-getCC)"
- LD="$(tc-getLD)"
- VERBOSE=1
- DESTDIR="${D}"
- MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
- OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
- OPENSSL_LIB=''
- )
-}
-
-src_compile() {
- emake "${myzathuraconf[@]}"
-}
-
-src_install() {
- emake "${myzathuraconf[@]}" install
- dodoc AUTHORS
-}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 653df8747a09..e65a032741db 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.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$
@@ -25,7 +25,7 @@ fi
IUSE=""
RDEPEND="!app-text/zathura-pdf-poppler
- >=app-text/mupdf-1.7a:=
+ >=app-text/mupdf-1.10a:=
>=app-text/zathura-0.3.1
media-libs/jbig2dec:=
media-libs/openjpeg:2=
diff --git a/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild b/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
index f4344ac82701..7bc690b2fa9b 100644
--- a/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
+++ b/media-libs/schroedinger/schroedinger-1.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ SRC_URI="http://www.diracvideo.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2 MIT MPL-1.1"
SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
index bf25598e99cc..c6d535214b9c 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc cpu_flags_x86_mmx static-libs"
RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
index dc3bbfbc141a..f96b0736523b 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="gif jpeg png static-libs tiff webp"
RDEPEND="
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index bd5266a5af8c..48104de35df6 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index b6ccbac7ceb9..5b35622f432f 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 4b4e6bb75a16..282b93d01aa7 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="static-libs X"
RDEPEND="
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 4f4dba15b454..dbc65b38f5b1 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.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$
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
RDEPEND="
diff --git a/media-libs/taglib/taglib-1.10.ebuild b/media-libs/taglib/taglib-1.10.ebuild
index 8b65ab09bcd1..847bdd06133d 100644
--- a/media-libs/taglib/taglib-1.10.ebuild
+++ b/media-libs/taglib/taglib-1.10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1"
-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 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
SLOT="0"
IUSE="+asf debug examples +mp4 test"
diff --git a/media-libs/taglib/taglib-1.11.1.ebuild b/media-libs/taglib/taglib-1.11.1.ebuild
index 6cd16edf2b82..ac630ecaf94f 100644
--- a/media-libs/taglib/taglib-1.11.1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1.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 @@ HOMEPAGE="https://taglib.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1"
-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 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
SLOT="0"
IUSE="boost debug examples test"
diff --git a/media-libs/taglib/taglib-1.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild
index 4dc2ef69198b..fa0659a4b250 100644
--- a/media-libs/taglib/taglib-1.9.1-r2.ebuild
+++ b/media-libs/taglib/taglib-1.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1"
-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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
SLOT="0"
IUSE="+asf debug examples +mp4 test"
diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
index 4d32404e5da6..498a760aed89 100644
--- a/media-libs/tiff/tiff-3.9.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
LICENSE="libtiff"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.6-r1.ebuild b/media-libs/tiff/tiff-4.0.6-r1.ebuild
index b652b0555ad1..3aa5a5189017 100644
--- a/media-libs/tiff/tiff-4.0.6-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.6-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$
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.6.ebuild b/media-libs/tiff/tiff-4.0.6.ebuild
index df62351264a2..97d334c5bfb7 100644
--- a/media-libs/tiff/tiff-4.0.6.ebuild
+++ b/media-libs/tiff/tiff-4.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/tiff/tiff-4.0.7.ebuild b/media-libs/tiff/tiff-4.0.7.ebuild
index 3f402c4d3e47..c013c04beb54 100644
--- a/media-libs/tiff/tiff-4.0.7.ebuild
+++ b/media-libs/tiff/tiff-4.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild
index 2d62ffe3e164..4b353f2d2bce 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate lirc midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile cpu_flags_x86_sse2 vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
index 45542f2a6fb7..76f60b52484b 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
index a241c3494e2c..cd6702054c58 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
index 8d95fd34574f..783b0b952d3c 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack
lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
index 1bbe41b99b00..b6af93798212 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild
index 333d69f602c9..a99f5adf2314 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
index cf0d54edc3b3..3e0303641482 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild
index bffff386e3c8..706dd23f2a9c 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild
index 5f446b1181ed..b8bbd0f1fb89 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild
index 01322eb6a951..b513a2562fe5 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome jack
lame libnotify libsamplerate lirc midi mms mp3 nls pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
index 45e1117a762b..377e89532fa7 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk3 jack
lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
REQUIRED_USE="|| ( alsa flac lame jack pulseaudio qt5 sdl )"
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
index d16040f4d2cc..eabc0f8a5ac0 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac +adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack
lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
REQUIRED_USE="
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
index 0a12e0103998..e7a4a7585332 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="aac +adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack
lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack"
REQUIRED_USE="
diff --git a/media-plugins/emotion_generic_players/emotion_generic_players-1.15.0.ebuild b/media-plugins/emotion_generic_players/emotion_generic_players-1.15.0.ebuild
index f0a638866b7a..1b95955cb4b5 100644
--- a/media-plugins/emotion_generic_players/emotion_generic_players-1.15.0.ebuild
+++ b/media-plugins/emotion_generic_players/emotion_generic_players-1.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.enlightenment.org/"
LICENSE="GPL-2"
# The -arch need to keyword vlc first.
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/efl-${PV}
media-video/vlc"
diff --git a/media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild b/media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild
index f0a638866b7a..1b95955cb4b5 100644
--- a/media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild
+++ b/media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.enlightenment.org/"
LICENSE="GPL-2"
# The -arch need to keyword vlc first.
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/efl-${PV}
media-video/vlc"
diff --git a/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild b/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild
index 7ead1d049552..c0e4baee50fe 100644
--- a/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild
+++ b/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.enlightenment.org/"
LICENSE="GPL-2"
# The -arch need to keyword vlc first.
-KEYWORDS="-alpha amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="-alpha amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/efl-${PV}
media-video/vlc"
diff --git a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.15.0.ebuild b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.15.0.ebuild
index 78dc36e6c3d5..fa7f486e7041 100644
--- a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.15.0.ebuild
+++ b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.15.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$
@@ -18,7 +18,7 @@ inherit enlightenment
DESCRIPTION="Provides external applications as generic loaders for Evas"
HOMEPAGE="https://www.enlightenment.org/"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
LICENSE="GPL-2"
IUSE="gstreamer pdf postscript raw svg"
diff --git a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.16.0.ebuild b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.16.0.ebuild
index 78dc36e6c3d5..fa7f486e7041 100644
--- a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.16.0.ebuild
+++ b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.16.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$
@@ -18,7 +18,7 @@ inherit enlightenment
DESCRIPTION="Provides external applications as generic loaders for Evas"
HOMEPAGE="https://www.enlightenment.org/"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
LICENSE="GPL-2"
IUSE="gstreamer pdf postscript raw svg"
diff --git a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild
index b81e4be02a1b..c82cdbbada46 100644
--- a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild
+++ b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.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$
@@ -18,7 +18,7 @@ inherit enlightenment
DESCRIPTION="Provides external applications as generic loaders for Evas"
HOMEPAGE="https://www.enlightenment.org/"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
LICENSE="GPL-2"
IUSE="gstreamer pdf postscript raw svg"
diff --git a/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31-r1.ebuild b/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31-r1.ebuild
index 511220c5e5c4..18f477219a95 100644
--- a/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31-r1.ebuild
+++ b/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gnome2-utils gstreamer
DESCRIPTION="GStreamer plugin for wrapping GConf audio/video settings"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND=">=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36-r1.ebuild b/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36-r1.ebuild
index 1f07df6c2ae7..27473f8326eb 100644
--- a/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36-r1.ebuild
+++ b/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI="5"
GST_ORG_MODULE=gst-plugins-base
inherit gstreamer
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND=">=gnome-base/gnome-vfs-2.24.4-r2:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-0.10.19-r1.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-0.10.19-r1.ebuild
index 00083033dbc2..a67864c6e382 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-0.10.19-r1.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-0.10.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI="5"
GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.8.3.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.8.3.ebuild
index 3974bdea551c..ab9218d9279b 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.8.3.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.8.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild
index b9417957b064..7d886a227e02 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
LICENSE="metapackage"
SLOT="0.10"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg musepack ogg opus oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X x264 xv xvid"
REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild
index 95778d772354..2ac7b28ed1f9 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
LICENSE="metapackage"
SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="aac a52 alsa cdda dts dv dvb dvd flac http jack lame libass libvisual mms mp3 modplug mpeg musepack ogg opus oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X x264 xv xvid"
REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.8.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.8.3.ebuild
index e45fc575c91f..73bcb104f003 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.8.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.8.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
LICENSE="metapackage"
SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-0.10.19-r1.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-0.10.19-r1.ebuild
index db00ed8bb466..86258f0b167d 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-0.10.19-r1.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-0.10.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.8.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.8.3.ebuild
index ee551605b364..0755a1d16b05 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.8.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.8.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23-r1.ebuild b/media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23-r1.ebuild
index 7dec009d7402..632db7176a82 100644
--- a/media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23-r1.ebuild
+++ b/media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI="5"
GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-sound/musepack-tools-465-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31-r1.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31-r1.ebuild
index cd898bfc677d..a9fe8ce460cb 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31-r1.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.8.3.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.8.3.ebuild
index 964d198e814a..232e92495a43 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.8.3.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.8.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
index d429da391536..c7debf0057a9 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI="5"
GST_ORG_MODULE=gst-plugins-base
inherit gstreamer
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
index d6fa22762b69..d765826571c0 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.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$
@@ -15,7 +15,7 @@ inherit enlightenment
DESCRIPTION="image loader plugins for Imlib 2"
HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="eet xcf"
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild
index d6fa22762b69..d765826571c0 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.8.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$
@@ -15,7 +15,7 @@ inherit enlightenment
DESCRIPTION="image loader plugins for Imlib 2"
HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="eet xcf"
diff --git a/media-plugins/live/live-2013.02.11.ebuild b/media-plugins/live/live-2013.02.11.ebuild
index 5742134d800c..79f9b1dcf9e8 100644
--- a/media-plugins/live/live-2013.02.11.ebuild
+++ b/media-plugins/live/live-2013.02.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples static-libs"
S="${WORKDIR}"
diff --git a/media-plugins/live/live-2016.10.11.ebuild b/media-plugins/live/live-2016.10.11.ebuild
index adf2aeb6d3dc..edfb2b7f5c4e 100644
--- a/media-plugins/live/live-2016.10.11.ebuild
+++ b/media-plugins/live/live-2016.10.11.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="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
mirror://gentoo/${P/-/.}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples static-libs"
DOCS=( "live-shared/README" )
diff --git a/media-plugins/live/live-2016.10.21.ebuild b/media-plugins/live/live-2016.10.21.ebuild
index adf2aeb6d3dc..edfb2b7f5c4e 100644
--- a/media-plugins/live/live-2016.10.21.ebuild
+++ b/media-plugins/live/live-2016.10.21.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="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
mirror://gentoo/${P/-/.}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples static-libs"
DOCS=( "live-shared/README" )
diff --git a/media-plugins/live/live-2016.11.28.ebuild b/media-plugins/live/live-2016.11.28.ebuild
index adf2aeb6d3dc..edfb2b7f5c4e 100644
--- a/media-plugins/live/live-2016.11.28.ebuild
+++ b/media-plugins/live/live-2016.11.28.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="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
mirror://gentoo/${P/-/.}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples static-libs"
DOCS=( "live-shared/README" )
diff --git a/media-plugins/live/live-2017.01.26.ebuild b/media-plugins/live/live-2017.01.26.ebuild
index 4870186a3945..edfb2b7f5c4e 100644
--- a/media-plugins/live/live-2017.01.26.ebuild
+++ b/media-plugins/live/live-2017.01.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
mirror://gentoo/${P/-/.}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples static-libs"
DOCS=( "live-shared/README" )
diff --git a/media-sound/audacious/audacious-2.5.4.ebuild b/media-sound/audacious/audacious-2.5.4.ebuild
index 08daba6a467b..52fea5b71568 100644
--- a/media-sound/audacious/audacious-2.5.4.ebuild
+++ b/media-sound/audacious/audacious-2.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="altivec chardet nls session cpu_flags_x86_sse2"
RDEPEND=">=dev-libs/dbus-glib-0.60
diff --git a/media-sound/audacious/audacious-3.1.1.ebuild b/media-sound/audacious/audacious-3.1.1.ebuild
index 04ac865306c0..186c68c1fbf7 100644
--- a/media-sound/audacious/audacious-3.1.1.ebuild
+++ b/media-sound/audacious/audacious-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls session"
RDEPEND=">=dev-libs/dbus-glib-0.60
diff --git a/media-sound/audacious/audacious-3.1.ebuild b/media-sound/audacious/audacious-3.1.ebuild
index 3eaedb30465d..759144801330 100644
--- a/media-sound/audacious/audacious-3.1.ebuild
+++ b/media-sound/audacious/audacious-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls session"
RDEPEND=">=dev-libs/dbus-glib-0.60
diff --git a/media-sound/audacious/audacious-3.2.2-r1.ebuild b/media-sound/audacious/audacious-3.2.2-r1.ebuild
index f161c3d90b95..bf25fa30840f 100644
--- a/media-sound/audacious/audacious-3.2.2-r1.ebuild
+++ b/media-sound/audacious/audacious-3.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet +gtk gtk3 nls session"
RDEPEND=">=dev-libs/dbus-glib-0.60
diff --git a/media-sound/audacious/audacious-3.2.3.ebuild b/media-sound/audacious/audacious-3.2.3.ebuild
index 8b814df68ad8..7047485a3d71 100644
--- a/media-sound/audacious/audacious-3.2.3.ebuild
+++ b/media-sound/audacious/audacious-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls session"
diff --git a/media-sound/audacious/audacious-3.2.4.ebuild b/media-sound/audacious/audacious-3.2.4.ebuild
index 4db974ad3cdf..df295d2ee423 100644
--- a/media-sound/audacious/audacious-3.2.4.ebuild
+++ b/media-sound/audacious/audacious-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls session"
diff --git a/media-sound/audacious/audacious-3.3.3.ebuild b/media-sound/audacious/audacious-3.3.3.ebuild
index 07cd1ed6ece6..9c1f7eb10bbe 100644
--- a/media-sound/audacious/audacious-3.3.3.ebuild
+++ b/media-sound/audacious/audacious-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls"
diff --git a/media-sound/audacious/audacious-3.3.4.ebuild b/media-sound/audacious/audacious-3.3.4.ebuild
index aa14e5980e1d..d914874cd29d 100644
--- a/media-sound/audacious/audacious-3.3.4.ebuild
+++ b/media-sound/audacious/audacious-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls"
diff --git a/media-sound/audacious/audacious-3.4.1.ebuild b/media-sound/audacious/audacious-3.4.1.ebuild
index bcff67cda5b1..698e36b2c4ee 100644
--- a/media-sound/audacious/audacious-3.4.1.ebuild
+++ b/media-sound/audacious/audacious-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls"
diff --git a/media-sound/audacious/audacious-3.5.1.ebuild b/media-sound/audacious/audacious-3.5.1.ebuild
index 0adc3c903556..4bb0dd55507b 100644
--- a/media-sound/audacious/audacious-3.5.1.ebuild
+++ b/media-sound/audacious/audacious-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls"
diff --git a/media-sound/audacious/audacious-3.6.2.ebuild b/media-sound/audacious/audacious-3.6.2.ebuild
index a516ca5d441e..585cb4f90672 100644
--- a/media-sound/audacious/audacious-3.6.2.ebuild
+++ b/media-sound/audacious/audacious-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="chardet nls gtk3 qt5"
DOCS="AUTHORS"
diff --git a/media-sound/audacious/audacious-3.7.1-r1.ebuild b/media-sound/audacious/audacious-3.7.1-r1.ebuild
index c84797dbdb9e..f959ea5b18a1 100644
--- a/media-sound/audacious/audacious-3.7.1-r1.ebuild
+++ b/media-sound/audacious/audacious-3.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="+chardet nls gtk gtk3 qt5"
REQUIRED_USE="
diff --git a/media-sound/audacious/audacious-3.7.1.ebuild b/media-sound/audacious/audacious-3.7.1.ebuild
index 5824c1a3df7f..1473fa6dd9f2 100644
--- a/media-sound/audacious/audacious-3.7.1.ebuild
+++ b/media-sound/audacious/audacious-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="+chardet nls gtk gtk3 qt5"
REQUIRED_USE="
diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild
index 2890dda355df..40c6ea66b92b 100644
--- a/media-sound/lame/lame-3.99.5-r1.ebuild
+++ b/media-sound/lame/lame-3.99.5-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$
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
# These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index 1d030ad5c872..668182e49dfd 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 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="mirror://sourceforge/mad/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa debug nls"
RDEPEND=">=media-libs/libid3tag-0.15.1b
diff --git a/media-sound/mpg321/mpg321-0.3.1-r1.ebuild b/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
index f6c764d1a1d7..17ef87f1c1bf 100644
--- a/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="ipv6"
RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
index d22fd8c70755..2091f34e282b 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa ipv6"
RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/snd/snd-12.8.ebuild b/media-sound/snd/snd-12.8.ebuild
index cb670cdbac1e..ce67c11f9e85 100644
--- a/media-sound/snd/snd-12.8.ebuild
+++ b/media-sound/snd/snd-12.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="alsa doc fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7"
RDEPEND="media-libs/audiofile
diff --git a/media-sound/snd/snd-16.3.ebuild b/media-sound/snd/snd-16.3.ebuild
index a14da2840618..1d471ffbd122 100644
--- a/media-sound/snd/snd-16.3.ebuild
+++ b/media-sound/snd/snd-16.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$
@@ -12,7 +12,7 @@ SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7"
RDEPEND="media-libs/audiofile
diff --git a/media-sound/sox/sox-14.4.2.ebuild b/media-sound/sox/sox-14.4.2.ebuild
index 7dc1a267eb8d..61f91d751312 100644
--- a/media-sound/sox/sox-14.4.2.ebuild
+++ b/media-sound/sox/sox-14.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
RDEPEND="
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
index 0afb35b2a9b6..9a3deac04f45 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac kate nls +ogg123 speex"
RDEPEND=">=media-libs/libvorbis-1.3.0
diff --git a/media-sound/wavpack/wavpack-4.70.0.ebuild b/media-sound/wavpack/wavpack-4.70.0.ebuild
index defeba30e298..157605ee53f6 100644
--- a/media-sound/wavpack/wavpack-4.70.0.ebuild
+++ b/media-sound/wavpack/wavpack-4.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="cpu_flags_x86_mmx static-libs"
RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
diff --git a/media-sound/wavpack/wavpack-4.80.0.ebuild b/media-sound/wavpack/wavpack-4.80.0.ebuild
index b99c6193287d..5110db254b3c 100644
--- a/media-sound/wavpack/wavpack-4.80.0.ebuild
+++ b/media-sound/wavpack/wavpack-4.80.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
diff --git a/media-sound/wavpack/wavpack-5.0.0.ebuild b/media-sound/wavpack/wavpack-5.0.0.ebuild
index cd03ed11e95f..08b83ea73181 100644
--- a/media-sound/wavpack/wavpack-5.0.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.0.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$
@@ -12,7 +12,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=virtual/libiconv-0-r1
diff --git a/media-sound/wavpack/wavpack-5.1.0.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
index 24312722b48b..08b83ea73181 100644
--- a/media-sound/wavpack/wavpack-5.1.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=virtual/libiconv-0-r1
diff --git a/media-video/dirac/dirac-1.0.2-r1.ebuild b/media-video/dirac/dirac-1.0.2-r1.ebuild
index c3e2c2dd1717..f0fa86cce9a2 100644
--- a/media-video/dirac/dirac-1.0.2-r1.ebuild
+++ b/media-video/dirac/dirac-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug doc cpu_flags_x86_mmx static-libs"
RDEPEND=""
diff --git a/media-video/dirac/dirac-1.0.2.ebuild b/media-video/dirac/dirac-1.0.2.ebuild
index d60ae3b9fffb..ad4359ed9786 100644
--- a/media-video/dirac/dirac-1.0.2.ebuild
+++ b/media-video/dirac/dirac-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug doc cpu_flags_x86_mmx static-libs"
RDEPEND=""
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
index 640ef612e684..184e89cb7708 100644
--- a/media-video/lsdvd/lsdvd-0.17.ebuild
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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="mirror://sourceforge/lsdvd/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="media-libs/libdvdread"
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
index 0110b41d650b..ecdf87395e49 100644
--- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
+++ b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ HOMEPAGE="http://fping.sourceforge.net/ http://packages.qa.debian.org/f/fping.ht
SLOT="0"
LICENSE="fping"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="ipv6"
S="${WORKDIR}/fping-2.4b2_to-ipv6"
diff --git a/net-analyzer/fping/fping-3.10.ebuild b/net-analyzer/fping/fping-3.10.ebuild
index ed7e3fd08615..01c66ae9fe7b 100644
--- a/net-analyzer/fping/fping-3.10.ebuild
+++ b/net-analyzer/fping/fping-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@ SRC_URI="http://fping.org/dist/${P}.tar.gz"
LICENSE="fping"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="ipv6 suid"
src_configure() {
diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild
index 6efab6dc46e5..01c66ae9fe7b 100644
--- a/net-analyzer/fping/fping-3.13.ebuild
+++ b/net-analyzer/fping/fping-3.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fping.org/dist/${P}.tar.gz"
LICENSE="fping"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="ipv6 suid"
src_configure() {
diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
index c8b8271d7ed5..48f39a3e044e 100644
--- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
LICENSE="ngrep"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6"
DEPEND="
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
index 1c5979229dc4..df33834fc224 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc +graph lua perl python rrdcgi ruby static-libs tcl tcpd"
CDEPEND="
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
index 365cfd0ece06..c9798d54bf7e 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
index 31d09a0f92aa..b7e890fc259d 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index 0b4df26e1281..f81ef8b87cb8 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.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$
@@ -16,7 +16,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0.0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/tcpdump/tcpdump-4.8.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.8.0.ebuild
index b0e61493c3b5..b7b9046f7230 100644
--- a/net-analyzer/tcpdump/tcpdump-4.8.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.8.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$
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RDEPEND="
diff --git a/net-analyzer/tcpdump/tcpdump-4.8.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.8.1.ebuild
index cbf5ba1ed304..905293c925e6 100644
--- a/net-analyzer/tcpdump/tcpdump-4.8.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.8.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RDEPEND="
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
index 04259e24be3a..6c2ec03bd858 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RDEPEND="
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
index ee978ff393e8..1e49ff1eccd2 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.ohse.de/uwe/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="nls"
DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dialup/minicom/minicom-2.6.ebuild b/net-dialup/minicom/minicom-2.6.ebuild
index 157a5efed5b0..499b47913abb 100644
--- a/net-dialup/minicom/minicom-2.6.ebuild
+++ b/net-dialup/minicom/minicom-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="nls"
COMMON_DEPEND="sys-libs/ncurses"
diff --git a/net-dialup/minicom/minicom-2.7.ebuild b/net-dialup/minicom/minicom-2.7.ebuild
index 407593752d76..5bc949835122 100644
--- a/net-dialup/minicom/minicom-2.7.ebuild
+++ b/net-dialup/minicom/minicom-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="nls"
COMMON_DEPEND="sys-libs/ncurses"
diff --git a/net-dns/libidn/libidn-1.33.ebuild b/net-dns/libidn/libidn-1.33.ebuild
index 78ea2970d9bf..4e1c03fa8afb 100644
--- a/net-dns/libidn/libidn-1.33.ebuild
+++ b/net-dns/libidn/libidn-1.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-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 ~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="doc emacs java mono nls static-libs"
DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn2/libidn2-0.11.ebuild b/net-dns/libidn2/libidn2-0.11.ebuild
index 75450840f943..b8acb74b2498 100644
--- a/net-dns/libidn2/libidn2-0.11.ebuild
+++ b/net-dns/libidn2/libidn2-0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu-alpha/libidn/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-3+"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~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 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND="
diff --git a/net-dns/libidn2/libidn2-0.15.ebuild b/net-dns/libidn2/libidn2-0.15.ebuild
index 4d80537ec955..9e27728e775f 100644
--- a/net-dns/libidn2/libidn2-0.15.ebuild
+++ b/net-dns/libidn2/libidn2-0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2+ LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~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 ~hppa ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/net-dns/libidn2/libidn2-0.16.ebuild b/net-dns/libidn2/libidn2-0.16.ebuild
index 1b90fbf6104a..74bb2ada29da 100644
--- a/net-dns/libidn2/libidn2-0.16.ebuild
+++ b/net-dns/libidn2/libidn2-0.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2+ LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~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 ~hppa ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/net-ftp/filezilla/filezilla-3.12.0.2.ebuild b/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
index 84a1dff0c1fa..d76ba56f79b3 100644
--- a/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="aqua dbus nls test"
RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
diff --git a/net-ftp/filezilla/filezilla-3.14.1.ebuild b/net-ftp/filezilla/filezilla-3.14.1.ebuild
index 88d257b87edd..03cd6f88cbeb 100644
--- a/net-ftp/filezilla/filezilla-3.14.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="aqua dbus nls test"
RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
index 8c3abac924bf..be6bcb0dea3e 100644
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ b/net-ftp/tnftp/tnftp-20141104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
SLOT="0"
LICENSE="BSD-4 BSD ISC"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6 socks5"
DEPEND=">=sys-libs/ncurses-5.1
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
index 8ed1dd8daa9f..6c8ed2bbcefe 100644
--- a/net-ftp/tnftp/tnftp-20151004.ebuild
+++ b/net-ftp/tnftp/tnftp-20151004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
SLOT="0"
LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6 socks5"
DEPEND=">=sys-libs/ncurses-5.1
diff --git a/net-im/pidgin/pidgin-2.11.0-r1.ebuild b/net-im/pidgin/pidgin-2.11.0-r1.ebuild
index a645995680a2..b1f3b7cf714b 100644
--- a/net-im/pidgin/pidgin-2.11.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.11.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$
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0/2" # libpurple version
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit pie"
IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/net-irc/epic4/epic4-2.10.1.ebuild b/net-irc/epic4/epic4-2.10.1.ebuild
index 340e9acf7e48..fdee91429295 100644
--- a/net-irc/epic4/epic4-2.10.1.ebuild
+++ b/net-irc/epic4/epic4-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6 perl ssl"
DEPEND="
diff --git a/net-irc/ircii/ircii-20110228.ebuild b/net-irc/ircii/ircii-20110228.ebuild
index 240ab9ac891b..afb85f016604 100644
--- a/net-irc/ircii/ircii-20110228.ebuild
+++ b/net-irc/ircii/ircii-20110228.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.eterna.com.au/ircii/"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="ipv6"
DEPEND="sys-libs/ncurses
diff --git a/net-irc/ircii/ircii-20111115.ebuild b/net-irc/ircii/ircii-20111115.ebuild
index 2461cf7e0c2e..3c5f3b583686 100644
--- a/net-irc/ircii/ircii-20111115.ebuild
+++ b/net-irc/ircii/ircii-20111115.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="http://eterna.com.au/ircii/"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="ipv6"
DEPEND="sys-libs/ncurses
diff --git a/net-irc/irssi/irssi-0.8.21.ebuild b/net-irc/irssi/irssi-0.8.21.ebuild
index a355d0a9fb6d..bbbf3ef10415 100644
--- a/net-irc/irssi/irssi-0.8.21.ebuild
+++ b/net-irc/irssi/irssi-0.8.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/irssi/irssi/releases/download/${PV/_/-}/${MY_P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
CDEPEND="sys-libs/ncurses:0=
diff --git a/net-irc/irssi/irssi-1.0.0.ebuild b/net-irc/irssi/irssi-1.0.0.ebuild
index 1644d032de22..59c046fb7e99 100644
--- a/net-irc/irssi/irssi-1.0.0.ebuild
+++ b/net-irc/irssi/irssi-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/irssi/irssi/releases/download/${PV/_/-}/${MY_P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+perl selinux socks5 +proxy libressl"
CDEPEND="sys-libs/ncurses:0=
diff --git a/net-libs/gnutls/gnutls-3.3.24-r1.ebuild b/net-libs/gnutls/gnutls-3.3.24-r1.ebuild
index d5a0dc7e7a12..7dfbd621e460 100644
--- a/net-libs/gnutls/gnutls-3.3.24-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.24-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$
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
# heartbeat support is not disabled until re-licensing happens fullyf
diff --git a/net-libs/gnutls/gnutls-3.3.25.ebuild b/net-libs/gnutls/gnutls-3.3.25.ebuild
index 3cecd2231622..275c118a7e20 100644
--- a/net-libs/gnutls/gnutls-3.3.25.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.25.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$
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
# heartbeat support is not disabled until re-licensing happens fullyf
diff --git a/net-libs/gnutls/gnutls-3.3.26.ebuild b/net-libs/gnutls/gnutls-3.3.26.ebuild
index b85af850cecc..a523e3ecc2ae 100644
--- a/net-libs/gnutls/gnutls-3.3.26.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.26.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
# heartbeat support is not disabled until re-licensing happens fullyf
diff --git a/net-libs/gnutls/gnutls-3.5.8.ebuild b/net-libs/gnutls/gnutls-3.5.8.ebuild
index 1720a223ea5a..6a55627b332a 100644
--- a/net-libs/gnutls/gnutls-3.5.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 sslv2 +sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
diff --git a/net-libs/libetpan/libetpan-1.6.ebuild b/net-libs/libetpan/libetpan-1.6.ebuild
index 91087306df8e..0e8d9dacf5dd 100644
--- a/net-libs/libetpan/libetpan-1.6.ebuild
+++ b/net-libs/libetpan/libetpan-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="berkdb debug gnutls ipv6 liblockfile sasl ssl static-libs"
DEPEND="berkdb? ( sys-libs/db:= )
diff --git a/net-libs/libetpan/libetpan-1.7.2-r1.ebuild b/net-libs/libetpan/libetpan-1.7.2-r1.ebuild
index 71b72453f5f8..3a7a68b3ded3 100644
--- a/net-libs/libetpan/libetpan-1.7.2-r1.ebuild
+++ b/net-libs/libetpan/libetpan-1.7.2-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$
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="berkdb debug gnutls ipv6 liblockfile libressl sasl ssl static-libs"
DEPEND="berkdb? ( sys-libs/db:= )
diff --git a/net-libs/libetpan/libetpan-1.7.2.ebuild b/net-libs/libetpan/libetpan-1.7.2.ebuild
index e9ab62f9ba4e..9e7b57a74a58 100644
--- a/net-libs/libetpan/libetpan-1.7.2.ebuild
+++ b/net-libs/libetpan/libetpan-1.7.2.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://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="berkdb debug gnutls ipv6 liblockfile sasl ssl static-libs"
DEPEND="berkdb? ( sys-libs/db:= )
diff --git a/net-libs/libetpan/libetpan-1.7.ebuild b/net-libs/libetpan/libetpan-1.7.ebuild
index e9ab62f9ba4e..9e7b57a74a58 100644
--- a/net-libs/libetpan/libetpan-1.7.ebuild
+++ b/net-libs/libetpan/libetpan-1.7.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://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="berkdb debug gnutls ipv6 liblockfile sasl ssl static-libs"
DEPEND="berkdb? ( sys-libs/db:= )
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 4c4d50eaf2d1..c6a33d136ba5 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
RESTRICT="test"
LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
SLOT="0"
IUSE="doc gnutls ssl static-libs threads"
diff --git a/net-libs/libgadu/libgadu-1.12.0.ebuild b/net-libs/libgadu/libgadu-1.12.0.ebuild
index eb92d78b9d6f..59856af4b3b6 100644
--- a/net-libs/libgadu/libgadu-1.12.0.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
SLOT="0"
IUSE="doc gnutls ssl static-libs test threads"
diff --git a/net-libs/libgadu/libgadu-1.12.1.ebuild b/net-libs/libgadu/libgadu-1.12.1.ebuild
index 13dfd9968a6e..ebad67882bcd 100644
--- a/net-libs/libgadu/libgadu-1.12.1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
SLOT="0"
IUSE="doc gnutls ssl static-libs test threads"
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
index 8d7481ade6d4..66b7e37cd51a 100644
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
pkg_setup() {
diff --git a/net-libs/liblockfile/liblockfile-1.10.ebuild b/net-libs/liblockfile/liblockfile-1.10.ebuild
index 79e62cda3c71..d2c37a03cd84 100644
--- a/net-libs/liblockfile/liblockfile-1.10.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
pkg_setup() {
diff --git a/net-libs/liblockfile/liblockfile-1.13.ebuild b/net-libs/liblockfile/liblockfile-1.13.ebuild
index b3cf7a29bd58..2bd0a362e93e 100644
--- a/net-libs/liblockfile/liblockfile-1.13.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}/${PN}"
diff --git a/net-libs/libnet/libnet-1.1.6-r1.ebuild b/net-libs/libnet/libnet-1.1.6-r1.ebuild
index 0144fd40e3e6..20d11be390aa 100644
--- a/net-libs/libnet/libnet-1.1.6-r1.ebuild
+++ b/net-libs/libnet/libnet-1.1.6-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$
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
LICENSE="BSD BSD-2 HPND"
SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc static-libs"
DEPEND="sys-devel/autoconf"
diff --git a/net-libs/libnet/libnet-1.1.6.ebuild b/net-libs/libnet/libnet-1.1.6.ebuild
index 83eb1881f6ea..88601cee86fb 100644
--- a/net-libs/libnet/libnet-1.1.6.ebuild
+++ b/net-libs/libnet/libnet-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
LICENSE="BSD BSD-2 HPND"
SLOT="1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc static-libs"
DEPEND="sys-devel/autoconf"
diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
index 48a2527c5824..b5f96c98a8d2 100644
--- a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
+++ b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
LICENSE="BSD BSD-2 HPND"
SLOT="1.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc static-libs"
DOCS=(
diff --git a/net-libs/libnet/libnet-1.2_rc3.ebuild b/net-libs/libnet/libnet-1.2_rc3.ebuild
index 7fa3661901d5..d19cc4c7dde5 100644
--- a/net-libs/libnet/libnet-1.2_rc3.ebuild
+++ b/net-libs/libnet/libnet-1.2_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
LICENSE="BSD BSD-2 HPND"
SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc static-libs"
DEPEND="sys-devel/autoconf"
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index aafa181624dd..1874b74586d3 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.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$
@@ -10,7 +10,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND=">=dev-libs/libgcrypt-1.2:0
diff --git a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
index 1ae5fe64c495..35d54946dda6 100644
--- a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.11-r2.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$
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libproxy/libproxy-0.4.13-r1.ebuild b/net-libs/libproxy/libproxy-0.4.13-r1.ebuild
index 368163c68197..0ef1fd83d92a 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-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$
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index 2451aefca0c6..8a92a82a9193 100644
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ b/net-libs/librsync/librsync-0.9.7-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$
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
RDEPEND="dev-libs/popt"
diff --git a/net-libs/librsync/librsync-2.0.0-r1.ebuild b/net-libs/librsync/librsync-2.0.0-r1.ebuild
index 69b6692bbc3b..e339a1332ab9 100644
--- a/net-libs/librsync/librsync-2.0.0-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-2.1"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}"
diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild
index c0b90a7b71c6..be75484caaf5 100644
--- a/net-libs/librsync/librsync-2.0.0.ebuild
+++ b/net-libs/librsync/librsync-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}"
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index 3308f4f1ac87..bacd2ea6c239 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1 +1,2 @@
DIST xconsole-1.0.6.tar.bz2 132225 SHA256 e561959b6ee8b735a32c1050015cfd8c551ed162cabb6cb72e36ce72966855d1 SHA512 115b3a03098ae3e06ba16af67afcd11c5a7906980ca04e8ec8ddd2c1dd4d02aab7a8952fd7f428861ad158052b9da8de11eab193de73e1f7264aca424e7cc620 WHIRLPOOL e3b99368138b4d09b492cabfdc0dbf12d6952d89a646a204f64d880427802889ea61467d455a3bc43d2c0d0047b5ca71df75624e52f0385298233cabb0d4e4a1
+DIST xconsole-1.0.7.tar.bz2 134832 SHA256 d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 SHA512 89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9 WHIRLPOOL 5acd8714444e3e3ec911f562fc6f4004891e8c39a4435d3e7dba04d02439a85883e6bed034dbc90e6d6cb8cffb2494d948941f6e3720635e4aa09957cb768087
diff --git a/x11-apps/xconsole/xconsole-1.0.7.ebuild b/x11-apps/xconsole/xconsole-1.0.7.ebuild
new file mode 100644
index 000000000000..bf4be0a89c89
--- /dev/null
+++ b/x11-apps/xconsole/xconsole-1.0.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="monitor system console messages with X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index b631af03e89b..c0304d9eb057 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,3 +1 @@
-DIST util-macros-1.17.1.tar.bz2 79105 SHA256 5e52654f2a0b04223cf28a9d7fd62cf288852e639ac13a75172fd47d0d6ac625 SHA512 0b8eaebd63d194aad5e395f9596e3099aa0a503dd892c62ef805f1a566c3a83eeca85d2bd47c680867e2903801bddc5cc0b097bf7db592fe289ead9ead891e04 WHIRLPOOL 23a1172bfb547b9028f33997558fcd557010343a9330e727b8a419d6ab2b222c406b8955c18f5d0f736357be39161cb8ee70fd1810181b7d1559676b3b1affe2
-DIST util-macros-1.18.0.tar.bz2 77830 SHA256 e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b SHA512 c663c03e6d4a37d47154d16a805933f7d683724d341cc558be0a01a007e824097d1b39bc8edbf8753d7374bf8e16eb037983c7672cfec6e2fa73cf2cab864ef4 WHIRLPOOL 9300ce9a63190afede83d0afad727824bd105a939385b314b771ae93556423f796d1135da1c5986e1e50d101514be0ac8c92da29bff4592b435bdd6869e6c3cf
-DIST util-macros-1.19.0.tar.bz2 80027 SHA256 2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba SHA512 6820fced14e28d505ed47c4e7e9fae17340e93caf94cc983683128b53833e257aed636bcac6204ed87ddc10132473ceb4bd2f6de53ea66ab8f71b8cd23fbfc15 WHIRLPOOL d0ab481249e8983122f413c9178fd68e216925fcc4ab98faa8c270505578289b6adf3976796135fc5f01bab992a5eaaa0d3b8bd91f7c240affed9ff3cf32f9e6
+DIST util-macros-1.19.1.tar.bz2 83274 SHA256 18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6 SHA512 d69a415d5922f072bab1ddf8984c98bc349a24ffc7a60184320a12992a76b04d7cb773b426b1a7000e6dc7983d59df51bbc8f2ff25273d63e4e238b4cd91eb38 WHIRLPOOL 7da9de2c27abeea024e5a62c1df06104709aeb469de95f0f6d88fdaf63d9ec81ee499bf34e2a34a1c323e0381d3bbf013ea3623c26786245114da49e139386b4
diff --git a/x11-misc/util-macros/util-macros-1.17.1.ebuild b/x11-misc/util-macros/util-macros-1.17.1.ebuild
deleted file mode 100644
index 91e738708b6e..000000000000
--- a/x11-misc/util-macros/util-macros-1.17.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
-DESCRIPTION="X.Org autotools utility macros"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/x11-misc/util-macros/util-macros-1.18.0.ebuild b/x11-misc/util-macros/util-macros-1.18.0.ebuild
deleted file mode 100644
index 878e017d1b10..000000000000
--- a/x11-misc/util-macros/util-macros-1.18.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
-DESCRIPTION="X.Org autotools utility macros"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/x11-misc/util-macros/util-macros-1.19.0.ebuild b/x11-misc/util-macros/util-macros-1.19.1.ebuild
index c840b5db516a..3d2532452568 100644
--- a/x11-misc/util-macros/util-macros-1.19.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$