summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/mktwpol/mktwpol-0.2.6.ebuild2
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.25.ebuild2
-rw-r--r--app-admin/tripwire/tripwire-2.4.3.4.ebuild2
-rw-r--r--app-benchmarks/sysbench/sysbench-1.0.3.ebuild2
-rw-r--r--app-doc/kicad-doc/kicad-doc-4.0.4.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.8.0-r10.ebuild2
-rw-r--r--dev-cpp/gtest/gtest-1.7.0-r1.ebuild2
-rw-r--r--dev-db/percona-xtrabackup/percona-xtrabackup-2.4.6-r1.ebuild2
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild2
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild2
-rw-r--r--dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild2
-rw-r--r--dev-perl/File-ShareDir/File-ShareDir-1.102.0.ebuild2
-rw-r--r--dev-perl/Filter/Filter-1.570.0.ebuild2
-rw-r--r--dev-util/cppcheck/cppcheck-1.77.ebuild2
-rw-r--r--kde-apps/analitza/analitza-16.12.3.ebuild2
-rw-r--r--kde-apps/ark/ark-16.12.3.ebuild2
-rw-r--r--kde-apps/artikulate/artikulate-16.12.3.ebuild2
-rw-r--r--kde-apps/audiocd-kio/audiocd-kio-16.12.3.ebuild2
-rw-r--r--kde-apps/baloo-widgets/baloo-widgets-16.12.3.ebuild2
-rw-r--r--kde-apps/blinken/blinken-16.12.3.ebuild2
-rw-r--r--kde-apps/bomber/bomber-16.12.3.ebuild2
-rw-r--r--kde-apps/bovo/bovo-16.12.3.ebuild2
-rw-r--r--kde-apps/cantor/cantor-16.12.3.ebuild2
-rw-r--r--kde-apps/cervisia/cervisia-16.12.3.ebuild2
-rw-r--r--kde-apps/dolphin-plugins/dolphin-plugins-16.12.3.ebuild2
-rw-r--r--kde-apps/dolphin/dolphin-16.12.3.ebuild2
-rw-r--r--kde-apps/dragon/dragon-16.12.3.ebuild2
-rw-r--r--kde-apps/ffmpegthumbs/ffmpegthumbs-16.12.3.ebuild2
-rw-r--r--kde-apps/filelight/filelight-16.12.3.ebuild2
-rw-r--r--kde-apps/granatier/granatier-16.12.3.ebuild2
-rw-r--r--kde-apps/gwenview/gwenview-16.12.3.ebuild2
-rw-r--r--kde-apps/jovie/jovie-16.12.3.ebuild2
-rw-r--r--kde-apps/juk/juk-16.12.3.ebuild2
-rw-r--r--kde-apps/kaccessible/kaccessible-16.12.3.ebuild2
-rw-r--r--kde-apps/kaccounts-integration/kaccounts-integration-16.12.3.ebuild2
-rw-r--r--kde-apps/kaccounts-providers/kaccounts-providers-16.12.3.ebuild2
-rw-r--r--kde-apps/kajongg/kajongg-16.12.3.ebuild2
-rw-r--r--kde-apps/kalgebra/kalgebra-16.12.3.ebuild2
-rw-r--r--kde-apps/kalzium/kalzium-16.12.3.ebuild2
-rw-r--r--kde-apps/kamera/kamera-16.12.3.ebuild2
-rw-r--r--kde-apps/kanagram/kanagram-16.12.3.ebuild2
-rw-r--r--kde-apps/kapman/kapman-16.12.3.ebuild2
-rw-r--r--kde-apps/kapptemplate/kapptemplate-16.12.3.ebuild2
-rw-r--r--kde-apps/kate/kate-16.12.3.ebuild2
-rw-r--r--kde-apps/katomic/katomic-16.12.3.ebuild2
-rw-r--r--kde-apps/kblackbox/kblackbox-16.12.3.ebuild2
-rw-r--r--kde-apps/kblocks/kblocks-16.12.3.ebuild2
-rw-r--r--kde-apps/kbounce/kbounce-16.12.3.ebuild2
-rw-r--r--kde-apps/kbreakout/kbreakout-16.12.3.ebuild2
-rw-r--r--kde-apps/kbruch/kbruch-16.12.3.ebuild2
-rw-r--r--kde-apps/kcachegrind/kcachegrind-16.12.3.ebuild2
-rw-r--r--kde-apps/kcalc/kcalc-16.12.3.ebuild2
-rw-r--r--kde-apps/kcharselect/kcharselect-16.12.3.ebuild2
-rw-r--r--kde-apps/kcolorchooser/kcolorchooser-16.12.3.ebuild2
-rw-r--r--kde-apps/kcron/kcron-16.12.3.ebuild2
-rw-r--r--kde-apps/kde-apps-meta/kde-apps-meta-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/kde-dev-scripts/kde-dev-scripts-16.12.3.ebuild2
-rw-r--r--kde-apps/kde-dev-utils/kde-dev-utils-16.12.3.ebuild2
-rw-r--r--kde-apps/kde-l10n/kde-l10n-16.12.3.ebuild2
-rw-r--r--kde-apps/kde-meta/kde-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kde4-l10n/kde4-l10n-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdeadmin-meta/kdeadmin-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdebase-meta/kdebase-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdebugsettings/kdebugsettings-16.12.3.ebuild2
-rw-r--r--kde-apps/kdecore-meta/kdecore-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdeedu-data/kdeedu-data-16.12.3.ebuild2
-rw-r--r--kde-apps/kdeedu-meta/kdeedu-meta-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/kdegames-meta/kdegames-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdegraphics-meta/kdegraphics-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.3.ebuild2
-rw-r--r--kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.12.3.ebuild2
-rw-r--r--kde-apps/kdenetwork-meta/kdenetwork-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdenlive/kdenlive-16.12.3.ebuild2
-rw-r--r--kde-apps/kdepim-l10n/kdepim-l10n-16.12.3.ebuild2
-rw-r--r--kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.12.3.ebuild2
-rw-r--r--kde-apps/kdesdk-meta/kdesdk-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.12.3.ebuild2
-rw-r--r--kde-apps/kdeutils-meta/kdeutils-meta-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/kdewebdev-meta/kdewebdev-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/kdf/kdf-16.12.3.ebuild2
-rw-r--r--kde-apps/kdialog/kdialog-16.12.3.ebuild2
-rw-r--r--kde-apps/kdiamond/kdiamond-16.12.3.ebuild2
-rw-r--r--kde-apps/keditbookmarks/keditbookmarks-16.12.3.ebuild2
-rw-r--r--kde-apps/kfilereplace/kfilereplace-16.12.3.ebuild2
-rw-r--r--kde-apps/kfind/kfind-16.12.3.ebuild2
-rw-r--r--kde-apps/kfloppy/kfloppy-16.12.3.ebuild2
-rw-r--r--kde-apps/kfourinline/kfourinline-16.12.3.ebuild2
-rw-r--r--kde-apps/kgeography/kgeography-16.12.3.ebuild2
-rw-r--r--kde-apps/kget/kget-16.12.3.ebuild2
-rw-r--r--kde-apps/kgoldrunner/kgoldrunner-16.12.3.ebuild2
-rw-r--r--kde-apps/khangman/khangman-16.12.3.ebuild2
-rw-r--r--kde-apps/khelpcenter/khelpcenter-16.12.3.ebuild2
-rw-r--r--kde-apps/kig/kig-16.12.3.ebuild2
-rw-r--r--kde-apps/kigo/kigo-16.12.3.ebuild2
-rw-r--r--kde-apps/killbots/killbots-16.12.3.ebuild2
-rw-r--r--kde-apps/kimagemapeditor/kimagemapeditor-16.12.3.ebuild2
-rw-r--r--kde-apps/kio-extras/kio-extras-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/kiriki/kiriki-16.12.3.ebuild2
-rw-r--r--kde-apps/kiten/kiten-16.12.3.ebuild2
-rw-r--r--kde-apps/kjumpingcube/kjumpingcube-16.12.3.ebuild2
-rw-r--r--kde-apps/klettres/klettres-16.12.3.ebuild2
-rw-r--r--kde-apps/klickety/klickety-16.12.3.ebuild2
-rw-r--r--kde-apps/klines/klines-16.12.3.ebuild2
-rw-r--r--kde-apps/klinkstatus/klinkstatus-16.12.3.ebuild2
-rw-r--r--kde-apps/kmag/kmag-16.12.3.ebuild2
-rw-r--r--kde-apps/kmahjongg/kmahjongg-16.12.3.ebuild2
-rw-r--r--kde-apps/kmines/kmines-16.12.3.ebuild2
-rw-r--r--kde-apps/kmix/kmix-16.12.3.ebuild2
-rw-r--r--kde-apps/kmousetool/kmousetool-16.12.3.ebuild2
-rw-r--r--kde-apps/kmouth/kmouth-16.12.3.ebuild2
-rw-r--r--kde-apps/kmplot/kmplot-16.12.3.ebuild2
-rw-r--r--kde-apps/knavalbattle/knavalbattle-16.12.3.ebuild2
-rw-r--r--kde-apps/knetwalk/knetwalk-16.12.3.ebuild2
-rw-r--r--kde-apps/kolf/kolf-16.12.3.ebuild2
-rw-r--r--kde-apps/kollision/kollision-16.12.3.ebuild2
-rw-r--r--kde-apps/kolourpaint/kolourpaint-16.12.3.ebuild2
-rw-r--r--kde-apps/kommander/kommander-16.12.3.ebuild2
-rw-r--r--kde-apps/kompare/kompare-16.12.3.ebuild2
-rw-r--r--kde-apps/konqueror/konqueror-16.12.3.ebuild2
-rw-r--r--kde-apps/konquest/konquest-16.12.3.ebuild2
-rw-r--r--kde-apps/konsole/konsole-16.12.3.ebuild2
-rw-r--r--kde-apps/kopete/kopete-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/kpat/kpat-16.12.3.ebuild2
-rw-r--r--kde-apps/kppp/kppp-16.12.3.ebuild2
-rw-r--r--kde-apps/kqtquickcharts/kqtquickcharts-16.12.3.ebuild2
-rw-r--r--kde-apps/krdc/krdc-16.12.3.ebuild2
-rw-r--r--kde-apps/kremotecontrol/kremotecontrol-16.12.3.ebuild2
-rw-r--r--kde-apps/kreversi/kreversi-16.12.3.ebuild2
-rw-r--r--kde-apps/krfb/krfb-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/kross-interpreters/kross-interpreters-16.12.3.ebuild2
-rw-r--r--kde-apps/kruler/kruler-16.12.3.ebuild2
-rw-r--r--kde-apps/ksaneplugin/ksaneplugin-16.12.3.ebuild2
-rw-r--r--kde-apps/kscd/kscd-16.12.3.ebuild2
-rw-r--r--kde-apps/kshisen/kshisen-16.12.3.ebuild2
-rw-r--r--kde-apps/ksirk/ksirk-16.12.3.ebuild2
-rw-r--r--kde-apps/ksnakeduel/ksnakeduel-16.12.3.ebuild2
-rw-r--r--kde-apps/kspaceduel/kspaceduel-16.12.3.ebuild2
-rw-r--r--kde-apps/ksquares/ksquares-16.12.3.ebuild2
-rw-r--r--kde-apps/kstars/kstars-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/ksudoku/ksudoku-16.12.3.ebuild2
-rw-r--r--kde-apps/ksystemlog/ksystemlog-16.12.3.ebuild2
-rw-r--r--kde-apps/kteatime/kteatime-16.12.3.ebuild2
-rw-r--r--kde-apps/ktimer/ktimer-16.12.3.ebuild2
-rw-r--r--kde-apps/ktouch/ktouch-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-approver/ktp-approver-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-auth-handler/ktp-auth-handler-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-call-ui/ktp-call-ui-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-common-internals/ktp-common-internals-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-contact-list/ktp-contact-list-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-contact-runner/ktp-contact-runner-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-kded-module/ktp-kded-module-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-send-file/ktp-send-file-16.12.3.ebuild2
-rw-r--r--kde-apps/ktp-text-ui/ktp-text-ui-16.12.3.ebuild2
-rw-r--r--kde-apps/ktuberling/ktuberling-16.12.3.ebuild2
-rw-r--r--kde-apps/kturtle/kturtle-16.12.3.ebuild2
-rw-r--r--kde-apps/kubrick/kubrick-16.12.3.ebuild2
-rw-r--r--kde-apps/kwalletmanager/kwalletmanager-16.12.3.ebuild2
-rw-r--r--kde-apps/kwave/kwave-16.12.3.ebuild2
-rw-r--r--kde-apps/kwordquiz/kwordquiz-16.12.3.ebuild2
-rw-r--r--kde-apps/kwrite/kwrite-16.12.3.ebuild2
-rw-r--r--kde-apps/libkcddb/libkcddb-16.12.3.ebuild2
-rw-r--r--kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/libkdcraw/libkdcraw-16.12.3.ebuild2
-rw-r--r--kde-apps/libkdegames/libkdegames-16.12.3.ebuild2
-rw-r--r--kde-apps/libkeduvocdocument/libkeduvocdocument-16.12.3.ebuild2
-rw-r--r--kde-apps/libkexiv2/libkexiv2-16.12.3.ebuild2
-rw-r--r--kde-apps/libkface/libkface-16.12.3.ebuild2
-rw-r--r--kde-apps/libkgeomap/libkgeomap-16.12.3.ebuild2
-rw-r--r--kde-apps/libkipi/libkipi-16.12.3.ebuild2
-rw-r--r--kde-apps/libkmahjongg/libkmahjongg-16.12.3.ebuild2
-rw-r--r--kde-apps/libkomparediff2/libkomparediff2-16.12.3.ebuild2
-rw-r--r--kde-apps/libksane/libksane-16.12.3.ebuild2
-rw-r--r--kde-apps/lokalize/lokalize-16.12.3.ebuild2
-rw-r--r--kde-apps/lskat/lskat-16.12.3.ebuild2
-rw-r--r--kde-apps/marble/marble-16.12.3-r1.ebuild2
-rw-r--r--kde-apps/okteta/okteta-16.12.3.ebuild2
-rw-r--r--kde-apps/okular/okular-16.12.3.ebuild2
-rw-r--r--kde-apps/palapeli/palapeli-16.12.3.ebuild2
-rw-r--r--kde-apps/parley/parley-16.12.3.ebuild2
-rw-r--r--kde-apps/picmi/picmi-16.12.3.ebuild2
-rw-r--r--kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.12.3.ebuild2
-rw-r--r--kde-apps/poxml/poxml-16.12.3.ebuild2
-rw-r--r--kde-apps/print-manager/print-manager-16.12.3.ebuild2
-rw-r--r--kde-apps/rocs/rocs-16.12.3.ebuild2
-rw-r--r--kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.12.3.ebuild2
-rw-r--r--kde-apps/spectacle/spectacle-16.12.3.ebuild2
-rw-r--r--kde-apps/step/step-16.12.3.ebuild2
-rw-r--r--kde-apps/svgpart/svgpart-16.12.3.ebuild2
-rw-r--r--kde-apps/sweeper/sweeper-16.12.3.ebuild2
-rw-r--r--kde-apps/thumbnailers/thumbnailers-16.12.3.ebuild2
-rw-r--r--kde-apps/umbrello/umbrello-16.12.3.ebuild2
-rw-r--r--kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.12.3.ebuild2
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.4.5.ebuild2
-rw-r--r--media-libs/zimg/zimg-2.5.ebuild2
-rw-r--r--net-firewall/ferm/ferm-2.3.1.ebuild2
-rw-r--r--net-ftp/proftpd/proftpd-1.3.5e.ebuild2
-rw-r--r--net-libs/webkit-gtk/Manifest1
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch22
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild287
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild2
-rw-r--r--profiles/arch/alpha/make.defaults4
-rw-r--r--profiles/arch/alpha/use.stable.mask4
-rw-r--r--profiles/arch/amd64/make.defaults4
-rw-r--r--profiles/arch/amd64/use.stable.mask4
-rw-r--r--profiles/arch/arm/make.defaults4
-rw-r--r--profiles/arch/arm/use.stable.mask4
-rw-r--r--profiles/arch/arm64/make.defaults4
-rw-r--r--profiles/arch/arm64/use.stable.mask4
-rw-r--r--profiles/arch/hppa/make.defaults4
-rw-r--r--profiles/arch/hppa/use.stable.mask9
-rw-r--r--profiles/arch/ia64/make.defaults4
-rw-r--r--profiles/arch/ia64/use.stable.mask4
-rw-r--r--profiles/arch/powerpc/ppc32/make.defaults4
-rw-r--r--profiles/arch/powerpc/ppc32/use.stable.mask4
-rw-r--r--profiles/arch/powerpc/ppc64/make.defaults4
-rw-r--r--profiles/arch/powerpc/ppc64/use.stable.mask9
-rw-r--r--profiles/arch/sparc/make.defaults4
-rw-r--r--profiles/arch/sparc/use.stable.mask4
-rw-r--r--profiles/arch/x86/make.defaults4
-rw-r--r--profiles/arch/x86/use.stable.mask4
-rw-r--r--profiles/base/make.defaults2
-rw-r--r--profiles/base/use.stable.mask1
-rw-r--r--sci-libs/indilib/indilib-1.3.1.ebuild2
-rw-r--r--sys-power/powertop/powertop-2.8.ebuild2
-rw-r--r--x11-wm/xpra/xpra-1.0.4-r1.ebuild2
230 files changed, 296 insertions, 517 deletions
diff --git a/app-admin/mktwpol/mktwpol-0.2.6.ebuild b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
index 139ba65e46b9..daa6b71b8e59 100644
--- a/app-admin/mktwpol/mktwpol-0.2.6.ebuild
+++ b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE=""
RDEPEND="app-admin/tripwire"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
index 30bef37ab352..a0b14a3cbc87 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~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"
fi
LICENSE="GPL-2"
diff --git a/app-admin/tripwire/tripwire-2.4.3.4.ebuild b/app-admin/tripwire/tripwire-2.4.3.4.ebuild
index cd6b5aac038a..be7f7f8b4646 100644
--- a/app-admin/tripwire/tripwire-2.4.3.4.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
IUSE="libressl ssl static +tools"
DEPEND="sys-devel/automake
diff --git a/app-benchmarks/sysbench/sysbench-1.0.3.ebuild b/app-benchmarks/sysbench/sysbench-1.0.3.ebuild
index 819414f6efa2..e5d9c4ad2c68 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.3.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="aio mysql postgres test"
RDEPEND="aio? ( dev-libs/libaio )
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
index b632e286ab40..b4189b6d1514 100644
--- a/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-4.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="html pdf"
LANGS="en fr it ja nl pl"
for lang in ${LANGS}; do
diff --git a/app-emulation/qemu/qemu-2.8.0-r10.ebuild b/app-emulation/qemu/qemu-2.8.0-r10.ebuild
index 29753846c833..f16ed0805ee7 100644
--- a/app-emulation/qemu/qemu-2.8.0-r10.ebuild
+++ b/app-emulation/qemu/qemu-2.8.0-r10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
fi
# bug #606088
diff --git a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
index 7f0d62887fe3..6b122147db14 100644
--- a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://googletest.googlecode.com/files/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples static-libs"
DEPEND="app-arch/unzip
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.6-r1.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.6-r1.ebuild
index e2d50264fd1b..f2926e24fd1b 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.6-r1.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/s
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
index c55015b0af8f..169c5bc5d281 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
index 91865ea375f3..d18902b476c1 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild b/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
index 74618e7e1e2f..178422abf635 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="http://concurrencykit.org/releases/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0 BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.102.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.102.0.ebuild
index 70fdc7adde60..dd8f2711ea54 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.102.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.102.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Locate per-dist and per-module shared files"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Filter/Filter-1.570.0.ebuild b/dev-perl/Filter/Filter-1.570.0.ebuild
index 190159b7bb4a..027f48cfc24a 100644
--- a/dev-perl/Filter/Filter-1.570.0.ebuild
+++ b/dev-perl/Filter/Filter-1.570.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface for creation of Perl Filters"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-util/cppcheck/cppcheck-1.77.ebuild b/dev-util/cppcheck/cppcheck-1.77.ebuild
index 1f6c354fcf08..f4ad03600e8f 100644
--- a/dev-util/cppcheck/cppcheck-1.77.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.77.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="htmlreport pcre qt4"
RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
diff --git a/kde-apps/analitza/analitza-16.12.3.ebuild b/kde-apps/analitza/analitza-16.12.3.ebuild
index 9ab652789732..ad0face9e243 100644
--- a/kde-apps/analitza/analitza-16.12.3.ebuild
+++ b/kde-apps/analitza/analitza-16.12.3.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="eigen opengl"
DEPEND="
diff --git a/kde-apps/ark/ark-16.12.3.ebuild b/kde-apps/ark/ark-16.12.3.ebuild
index 531f9f5bacc0..7b44c77e4b4f 100644
--- a/kde-apps/ark/ark-16.12.3.ebuild
+++ b/kde-apps/ark/ark-16.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="KDE Archiving tool"
HOMEPAGE="https://www.kde.org/applications/utilities/ark
https://utils.kde.org/projects/ark"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bzip2 lzma zlib"
RDEPEND="
diff --git a/kde-apps/artikulate/artikulate-16.12.3.ebuild b/kde-apps/artikulate/artikulate-16.12.3.ebuild
index 1f78646e6048..2da87c3c7d9e 100644
--- a/kde-apps/artikulate/artikulate-16.12.3.ebuild
+++ b/kde-apps/artikulate/artikulate-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Language learning application that helps improving pronunciation skills"
HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+gstreamer qtmedia"
DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-16.12.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-16.12.3.ebuild
index c0b3ab30fcd9..0617fa44f628 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-16.12.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="kioslave for accessing audio CDs"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="flac vorbis"
DEPEND="
diff --git a/kde-apps/baloo-widgets/baloo-widgets-16.12.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-16.12.3.ebuild
index 71850b3e20e7..5eea753f6f02 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-16.12.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Widget library for baloo"
LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/blinken/blinken-16.12.3.ebuild b/kde-apps/blinken/blinken-16.12.3.ebuild
index 6b75e19b55d3..21bc4808e3e7 100644
--- a/kde-apps/blinken/blinken-16.12.3.ebuild
+++ b/kde-apps/blinken/blinken-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KDE version of the Simon Says game"
HOMEPAGE="https://www.kde.org/applications/education/blinken
https://edu.kde.org/blinken"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/bomber/bomber-16.12.3.ebuild b/kde-apps/bomber/bomber-16.12.3.ebuild
index 807cb7246bbd..9f2c60aa878c 100644
--- a/kde-apps/bomber/bomber-16.12.3.ebuild
+++ b/kde-apps/bomber/bomber-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="KDE arcade bombing game"
HOMEPAGE="https://www.kde.org/applications/games/bomber/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/bovo/bovo-16.12.3.ebuild b/kde-apps/bovo/bovo-16.12.3.ebuild
index a258ffdbfe58..14ff9ec99845 100644
--- a/kde-apps/bovo/bovo-16.12.3.ebuild
+++ b/kde-apps/bovo/bovo-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Five-in-a-row Board Game"
HOMEPAGE="https://www.kde.org/applications/games/bovo/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/cantor/cantor-16.12.3.ebuild b/kde-apps/cantor/cantor-16.12.3.ebuild
index b2f83e55cc6e..215bc594b2d8 100644
--- a/kde-apps/cantor/cantor-16.12.3.ebuild
+++ b/kde-apps/cantor/cantor-16.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5 python-r1
DESCRIPTION="Interface for doing mathematics and scientific computing"
HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="analitza julia lua postscript python qalculate +R"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cervisia/cervisia-16.12.3.ebuild b/kde-apps/cervisia/cervisia-16.12.3.ebuild
index 9c72fd509840..341f7ad25025 100644
--- a/kde-apps/cervisia/cervisia-16.12.3.ebuild
+++ b/kde-apps/cervisia/cervisia-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="CVS frontend by KDE"
HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-16.12.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-16.12.3.ebuild
index 5f191aa72a4c..b44c1097d81b 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-16.12.3.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-16.12.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="false"
inherit kde5
DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bazaar dropbox git mercurial subversion"
# FIXME: required in root CMakeLists.txt, but:
diff --git a/kde-apps/dolphin/dolphin-16.12.3.ebuild b/kde-apps/dolphin/dolphin-16.12.3.ebuild
index 4d121930083c..79a5c4ee9f68 100644
--- a/kde-apps/dolphin/dolphin-16.12.3.ebuild
+++ b/kde-apps/dolphin/dolphin-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Plasma filemanager focusing on usability"
HOMEPAGE="https://dolphin.kde.org https://www.kde.org/applications/system/dolphin"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="semantic-desktop thumbnail"
DEPEND="
diff --git a/kde-apps/dragon/dragon-16.12.3.ebuild b/kde-apps/dragon/dragon-16.12.3.ebuild
index ddc8ff1df1c4..d0fea2298ac9 100644
--- a/kde-apps/dragon/dragon-16.12.3.ebuild
+++ b/kde-apps/dragon/dragon-16.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A simple video player"
HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-16.12.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-16.12.3.ebuild
index 34eff6ec3964..2a0462baa5c1 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-16.12.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="FFmpeg based thumbnail generator for video files"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libav"
RDEPEND="
diff --git a/kde-apps/filelight/filelight-16.12.3.ebuild b/kde-apps/filelight/filelight-16.12.3.ebuild
index 1f7bd3fcde51..b1cc6791a99b 100644
--- a/kde-apps/filelight/filelight-16.12.3.ebuild
+++ b/kde-apps/filelight/filelight-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
HOMEPAGE="https://utils.kde.org/projects/filelight"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/granatier/granatier-16.12.3.ebuild b/kde-apps/granatier/granatier-16.12.3.ebuild
index fecb430847da..60f6a3448ba3 100644
--- a/kde-apps/granatier/granatier-16.12.3.ebuild
+++ b/kde-apps/granatier/granatier-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="KDE Bomberman game"
HOMEPAGE="https://www.kde.org/applications/games/granatier/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/gwenview/gwenview-16.12.3.ebuild b/kde-apps/gwenview/gwenview-16.12.3.ebuild
index e256ebf16e15..e0ca603a35ab 100644
--- a/kde-apps/gwenview/gwenview-16.12.3.ebuild
+++ b/kde-apps/gwenview/gwenview-16.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="kipi raw semantic-desktop X"
# requires running environment
diff --git a/kde-apps/jovie/jovie-16.12.3.ebuild b/kde-apps/jovie/jovie-16.12.3.ebuild
index 9806ecf162cb..3e77d467c2a9 100644
--- a/kde-apps/jovie/jovie-16.12.3.ebuild
+++ b/kde-apps/jovie/jovie-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Text to speech application"
HOMEPAGE="https://www.kde.org/applications/utilities/jovie/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/juk/juk-16.12.3.ebuild b/kde-apps/juk/juk-16.12.3.ebuild
index 39ba32d2c95e..e2ba85e0c4ff 100644
--- a/kde-apps/juk/juk-16.12.3.ebuild
+++ b/kde-apps/juk/juk-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Jukebox and music manager by KDE"
HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kaccessible/kaccessible-16.12.3.ebuild b/kde-apps/kaccessible/kaccessible-16.12.3.ebuild
index dc89cdd8a3e7..97f22692596a 100644
--- a/kde-apps/kaccessible/kaccessible-16.12.3.ebuild
+++ b/kde-apps/kaccessible/kaccessible-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde4-base
DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug +speechd"
DEPEND="speechd? ( app-accessibility/speech-dispatcher )"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-16.12.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-16.12.3.ebuild
index 2e46dede0d7f..1d1b1ce4f5e0 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-16.12.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-16.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Administer web accounts for the sites and services across the Plasm
HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-16.12.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-16.12.3.ebuild
index 4bdff6f7ed9c..29dae8302edf 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-16.12.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE accounts providers"
HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-apps/kajongg/kajongg-16.12.3.ebuild b/kde-apps/kajongg/kajongg-16.12.3.ebuild
index 376f4eb7835f..fcafd988a5c5 100644
--- a/kde-apps/kajongg/kajongg-16.12.3.ebuild
+++ b/kde-apps/kajongg/kajongg-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit python-single-r1 kde4-base
DESCRIPTION="The classical Mah Jongg for four players"
HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalgebra/kalgebra-16.12.3.ebuild b/kde-apps/kalgebra/kalgebra-16.12.3.ebuild
index 678792d84577..9fc7dd29d55d 100644
--- a/kde-apps/kalgebra/kalgebra-16.12.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="MathML-based graph calculator by KDE"
HOMEPAGE="https://www.kde.org/applications/education/kalgebra
https://edu.kde.org/kalgebra"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="opengl readline"
DEPEND="
diff --git a/kde-apps/kalzium/kalzium-16.12.3.ebuild b/kde-apps/kalzium/kalzium-16.12.3.ebuild
index ad5104853200..2dc7857b85dc 100644
--- a/kde-apps/kalzium/kalzium-16.12.3.ebuild
+++ b/kde-apps/kalzium/kalzium-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5 flag-o-matic
DESCRIPTION="Periodic table of the elements"
HOMEPAGE="https://www.kde.org/applications/education/kalzium
https://edu.kde.org/kalzium"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="editor solver"
DEPEND="
diff --git a/kde-apps/kamera/kamera-16.12.3.ebuild b/kde-apps/kamera/kamera-16.12.3.ebuild
index 9f66d10f0e05..b5ab33fe5355 100644
--- a/kde-apps/kamera/kamera-16.12.3.ebuild
+++ b/kde-apps/kamera/kamera-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Plasma integration for gphoto2 cameras"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kanagram/kanagram-16.12.3.ebuild b/kde-apps/kanagram/kanagram-16.12.3.ebuild
index f21b933bd2f3..8f5045a602e2 100644
--- a/kde-apps/kanagram/kanagram-16.12.3.ebuild
+++ b/kde-apps/kanagram/kanagram-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Game based on anagrams of words"
HOMEPAGE="https://www.kde.org/applications/education/kanagram
https://edu.kde.org/kanagram"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kapman/kapman-16.12.3.ebuild b/kde-apps/kapman/kapman-16.12.3.ebuild
index 910aad28caf4..4f52e16b7908 100644
--- a/kde-apps/kapman/kapman-16.12.3.ebuild
+++ b/kde-apps/kapman/kapman-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Pac-Man clone by KDE"
HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-16.12.3.ebuild b/kde-apps/kapptemplate/kapptemplate-16.12.3.ebuild
index c742b7d790b3..09d668313a32 100644
--- a/kde-apps/kapptemplate/kapptemplate-16.12.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kate/kate-16.12.3.ebuild b/kde-apps/kate/kate-16.12.3.ebuild
index b16902e355b4..2017465da7a6 100644
--- a/kde-apps/kate/kate-16.12.3.ebuild
+++ b/kde-apps/kate/kate-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Kate is an advanced text editor"
HOMEPAGE="https://www.kde.org/applications/utilities/kate http://kate-editor.org"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+addons"
DEPEND="
diff --git a/kde-apps/katomic/katomic-16.12.3.ebuild b/kde-apps/katomic/katomic-16.12.3.ebuild
index ab248d98d712..b6d1f740e722 100644
--- a/kde-apps/katomic/katomic-16.12.3.ebuild
+++ b/kde-apps/katomic/katomic-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/katomic/
https://games.kde.org/game.php?game=katomic
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kblackbox/kblackbox-16.12.3.ebuild b/kde-apps/kblackbox/kblackbox-16.12.3.ebuild
index 03612a840ec6..fccb91844fe6 100644
--- a/kde-apps/kblackbox/kblackbox-16.12.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-16.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_SELINUX_MODULE="games"
inherit kde5
DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kblocks/kblocks-16.12.3.ebuild b/kde-apps/kblocks/kblocks-16.12.3.ebuild
index 8f137be80550..c77d8e9ad006 100644
--- a/kde-apps/kblocks/kblocks-16.12.3.ebuild
+++ b/kde-apps/kblocks/kblocks-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="A single-player Tetris-like KDE game"
HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kbounce/kbounce-16.12.3.ebuild b/kde-apps/kbounce/kbounce-16.12.3.ebuild
index 1a0900a6421a..7bece6a87374 100644
--- a/kde-apps/kbounce/kbounce-16.12.3.ebuild
+++ b/kde-apps/kbounce/kbounce-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kbounce/
https://games.kde.org/game.php?game=kbounce
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kbreakout/kbreakout-16.12.3.ebuild b/kde-apps/kbreakout/kbreakout-16.12.3.ebuild
index 63bc865b8edb..3706090405e2 100644
--- a/kde-apps/kbreakout/kbreakout-16.12.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-16.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kbreakout/
https://games.kde.org/game.php?game=kbreakout
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kbruch/kbruch-16.12.3.ebuild b/kde-apps/kbruch/kbruch-16.12.3.ebuild
index a6671ba833ff..4ab74c019a94 100644
--- a/kde-apps/kbruch/kbruch-16.12.3.ebuild
+++ b/kde-apps/kbruch/kbruch-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Educational application to learn calculating with fractions"
HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-16.12.3.ebuild b/kde-apps/kcachegrind/kcachegrind-16.12.3.ebuild
index 470c8c43c2be..f7d558f693bd 100644
--- a/kde-apps/kcachegrind/kcachegrind-16.12.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="Frontend for Cachegrind by KDE"
HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
https://kcachegrind.github.io/html/Home.html"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kcalc/kcalc-16.12.3.ebuild b/kde-apps/kcalc/kcalc-16.12.3.ebuild
index f7df88799b59..d5224da9c5b0 100644
--- a/kde-apps/kcalc/kcalc-16.12.3.ebuild
+++ b/kde-apps/kcalc/kcalc-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="KDE calculator"
HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
https://utils.kde.org/projects/kcalc"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kcharselect/kcharselect-16.12.3.ebuild b/kde-apps/kcharselect/kcharselect-16.12.3.ebuild
index eae865a53ed3..7feccd8e8fab 100644
--- a/kde-apps/kcharselect/kcharselect-16.12.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KDE character selection utility"
HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
https://utils.kde.org/projects/kcharselect"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kcolorchooser/kcolorchooser-16.12.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-16.12.3.ebuild
index 53208f5a397c..53613b414fd0 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-16.12.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE color selector/editor"
HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kcron/kcron-16.12.3.ebuild b/kde-apps/kcron/kcron-16.12.3.ebuild
index e11f76fa9be8..5ab87f614949 100644
--- a/kde-apps/kcron/kcron-16.12.3.ebuild
+++ b/kde-apps/kcron/kcron-16.12.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
inherit kde5
DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-16.12.3-r1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-16.12.3-r1.ebuild
index 4b0c61c2ef80..3f4956694085 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-16.12.3-r1.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-16.12.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="Meta package for the KDE Applications collection"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="accessibility pim sdk"
RDEPEND="
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-16.12.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-16.12.3.ebuild
index ecdfb50303e0..7223fda16629 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-16.12.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-16.12.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="true"
inherit kde5
DESCRIPTION="KDE Development Scripts"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-16.12.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-16.12.3.ebuild
index 92f6f6deb4c3..206c1a833a0e 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-16.12.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-16.12.3.ebuild
@@ -6,5 +6,5 @@ EAPI=6
inherit kde4-base
DESCRIPTION="KDE Development Utilities"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
diff --git a/kde-apps/kde-l10n/kde-l10n-16.12.3.ebuild b/kde-apps/kde-l10n/kde-l10n-16.12.3.ebuild
index b901f795094a..83dd737afb58 100644
--- a/kde-apps/kde-l10n/kde-l10n-16.12.3.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-16.12.3.ebuild
@@ -14,7 +14,7 @@ inherit kde5
DESCRIPTION="KDE internationalization package"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kde-meta/kde-meta-16.12.3.ebuild b/kde-apps/kde-meta/kde-meta-16.12.3.ebuild
index c91249451d51..7a993557d580 100644
--- a/kde-apps/kde-meta/kde-meta-16.12.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.12.3-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.12.3-r1.ebuild
index 2227f0352b16..e0fcfa67446b 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.12.3-r1.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.12.3-r1.ebuild
@@ -16,7 +16,7 @@ inherit kde5
DESCRIPTION="KDE legacy internationalization package"
SLOT="4"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
DEPEND="
kde-frameworks/kdelibs:4
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.12.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.12.3.ebuild
index d0be40a7f03c..5be6dd6f9fc6 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.12.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-16.12.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.12.3.ebuild
index 05d9490f5b15..ae528d852de8 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-16.12.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+cron nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdebase-meta/kdebase-meta-16.12.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-16.12.3.ebuild
index ab3e83641ca4..d4ee1a184467 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-16.12.3.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kdebugsettings/kdebugsettings-16.12.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-16.12.3.ebuild
index b9e0f22e1ee0..e6a33cdc81f5 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-16.12.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-16.12.3.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kdecore-meta/kdecore-meta-16.12.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-16.12.3.ebuild
index 32049cf55f54..95b6342dd4a8 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-16.12.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+handbook nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdeedu-data/kdeedu-data-16.12.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-16.12.3.ebuild
index 24dbb527a4f1..201e2de7ce5d 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-16.12.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-16.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_DEBUG="false"
inherit kde5
DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-16.12.3-r1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-16.12.3-r1.ebuild
index ec30bea6eccf..82296127cecd 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-16.12.3-r1.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-16.12.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
HOMEPAGE="https://edu.kde.org"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdegames-meta/kdegames-meta-16.12.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-16.12.3.ebuild
index 378e92ef21e9..e1ba848ac471 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-16.12.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-16.12.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
HOMEPAGE="https://games.kde.org/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls opengl python"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-16.12.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-16.12.3.ebuild
index 22183280b146..b16622442c35 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-16.12.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-16.12.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
HOMEPAGE="https://www.kde.org/applications/graphics/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls scanner"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.3.ebuild
index a985dc71b2b5..698207c6f8d3 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5
DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="+thumbnail"
DEPEND="
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.12.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.12.3.ebuild
index 7cc5486fcb67..7b9078b646d1 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.12.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.12.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="
https://www.kde.org/applications/multimedia/
https://multimedia.kde.org/
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+ffmpeg nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.12.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.12.3.ebuild
index 6182ea31485c..69a722dbf06e 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.12.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5
DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-16.12.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.12.3.ebuild
index f0adb9931229..ec898a026a27 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-16.12.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls ppp"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdenlive/kdenlive-16.12.3.ebuild b/kde-apps/kdenlive/kdenlive-16.12.3.ebuild
index 62f096040f16..5ba293e0a445 100644
--- a/kde-apps/kdenlive/kdenlive-16.12.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-16.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Non-linear video editing suite by KDE"
HOMEPAGE="https://www.kdenlive.org/"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
RDEPEND="
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-16.12.3.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-16.12.3.ebuild
index 15487dff2a3d..2c3aac49eeb1 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-16.12.3.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-16.12.3.ebuild
@@ -14,7 +14,7 @@ inherit kde5
DESCRIPTION="KDE PIM internationalization package"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.12.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.12.3.ebuild
index 58ab4f23dfef..42fc1c64a2da 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.12.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde4-base
DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
src_configure() {
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-16.12.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-16.12.3.ebuild
index c0ebf1b4cb2f..8be38389abf7 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-16.12.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-16.12.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cvs nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.12.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.12.3.ebuild
index 4b5edff3ce82..5a14390bde10 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.12.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5
DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-16.12.3-r1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-16.12.3-r1.ebuild
index b65b783c6f36..58b53c07e475 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-16.12.3-r1.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-16.12.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cups floppy lirc nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdewebdev-meta/kdewebdev-meta-16.12.3.ebuild b/kde-apps/kdewebdev-meta/kdewebdev-meta-16.12.3.ebuild
index 6b19be9af3b6..60e9f606bf9e 100644
--- a/kde-apps/kdewebdev-meta/kdewebdev-meta-16.12.3.ebuild
+++ b/kde-apps/kdewebdev-meta/kdewebdev-meta-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5-meta-pkg
DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdf/kdf-16.12.3.ebuild b/kde-apps/kdf/kdf-16.12.3.ebuild
index b20173a98278..22fae33a3669 100644
--- a/kde-apps/kdf/kdf-16.12.3.ebuild
+++ b/kde-apps/kdf/kdf-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="KDE free disk space utility"
HOMEPAGE="https://utils.kde.org/projects/kdf"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kdialog/kdialog-16.12.3.ebuild b/kde-apps/kdialog/kdialog-16.12.3.ebuild
index 75cbde25642f..16d014315f76 100644
--- a/kde-apps/kdialog/kdialog-16.12.3.ebuild
+++ b/kde-apps/kdialog/kdialog-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5
DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="X"
DEPEND="
diff --git a/kde-apps/kdiamond/kdiamond-16.12.3.ebuild b/kde-apps/kdiamond/kdiamond-16.12.3.ebuild
index 0e2c31934ab8..e28d84cde1f2 100644
--- a/kde-apps/kdiamond/kdiamond-16.12.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-16.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kdiamond/
https://games.kde.org/game.php?game=kdiamond
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-16.12.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-16.12.3.ebuild
index d2ced9fa358e..28ea84edf3f2 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-16.12.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-16.12.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="+man"
DEPEND="
diff --git a/kde-apps/kfilereplace/kfilereplace-16.12.3.ebuild b/kde-apps/kfilereplace/kfilereplace-16.12.3.ebuild
index b60abff77fcf..65334bfecc27 100644
--- a/kde-apps/kfilereplace/kfilereplace-16.12.3.ebuild
+++ b/kde-apps/kfilereplace/kfilereplace-16.12.3.ebuild
@@ -8,5 +8,5 @@ inherit kde4-base
DESCRIPTION="Powerful tool to search and replace in multiple files"
HOMEPAGE="https://www.kde.org/applications/utilities/kfilereplace/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
diff --git a/kde-apps/kfind/kfind-16.12.3.ebuild b/kde-apps/kfind/kfind-16.12.3.ebuild
index fcd2a8f1c103..9271c09c10f2 100644
--- a/kde-apps/kfind/kfind-16.12.3.ebuild
+++ b/kde-apps/kfind/kfind-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="File finder utility based on KDE Frameworks"
HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-16.12.3.ebuild b/kde-apps/kfloppy/kfloppy-16.12.3.ebuild
index d4c90635ab3c..dd21c97f897e 100644
--- a/kde-apps/kfloppy/kfloppy-16.12.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://utils.kde.org/projects/kfloppy/
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kfourinline/kfourinline-16.12.3.ebuild b/kde-apps/kfourinline/kfourinline-16.12.3.ebuild
index deebf5805da7..4da6a75140d9 100644
--- a/kde-apps/kfourinline/kfourinline-16.12.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-16.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kfourinline/
https://games.kde.org/game.php?game=kfourinline
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kgeography/kgeography-16.12.3.ebuild b/kde-apps/kgeography/kgeography-16.12.3.ebuild
index 05fc376f651f..5e038cfb4b6c 100644
--- a/kde-apps/kgeography/kgeography-16.12.3.ebuild
+++ b/kde-apps/kgeography/kgeography-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Geography learning tool"
HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kget/kget-16.12.3.ebuild b/kde-apps/kget/kget-16.12.3.ebuild
index 35c9bc7acc79..c1c3d726438a 100644
--- a/kde-apps/kget/kget-16.12.3.ebuild
+++ b/kde-apps/kget/kget-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Advanced download manager by KDE"
HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug bittorrent mms sqlite"
RDEPEND="
diff --git a/kde-apps/kgoldrunner/kgoldrunner-16.12.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-16.12.3.ebuild
index af2cabfd293e..c6a69cf41e90 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-16.12.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kgoldrunner/
https://games.kde.org/game.php?game=kgoldrunner
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/khangman/khangman-16.12.3.ebuild b/kde-apps/khangman/khangman-16.12.3.ebuild
index e861b7b13744..e2b54d5bfe98 100644
--- a/kde-apps/khangman/khangman-16.12.3.ebuild
+++ b/kde-apps/khangman/khangman-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Classical hangman game by KDE"
HOMEPAGE="https://www.kde.org/applications/education/khangman
https://edu.kde.org/khangman"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-16.12.3.ebuild b/kde-apps/khelpcenter/khelpcenter-16.12.3.ebuild
index 2942fd52f99e..34551dda7d5a 100644
--- a/kde-apps/khelpcenter/khelpcenter-16.12.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="The KDE Help Center"
HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kig/kig-16.12.3.ebuild b/kde-apps/kig/kig-16.12.3.ebuild
index 5f03e64dcbb3..49d6e3d5e580 100644
--- a/kde-apps/kig/kig-16.12.3.ebuild
+++ b/kde-apps/kig/kig-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 kde5
DESCRIPTION="KDE Interactive Geometry tool"
HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="geogebra scripting"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kigo/kigo-16.12.3.ebuild b/kde-apps/kigo/kigo-16.12.3.ebuild
index 7b14c158b870..6d1d9a440daa 100644
--- a/kde-apps/kigo/kigo-16.12.3.ebuild
+++ b/kde-apps/kigo/kigo-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Go game by KDE"
HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/killbots/killbots-16.12.3.ebuild b/kde-apps/killbots/killbots-16.12.3.ebuild
index 95e340601ae6..32543694fbeb 100644
--- a/kde-apps/killbots/killbots-16.12.3.ebuild
+++ b/kde-apps/killbots/killbots-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Kill the bots or they kill you!"
HOMEPAGE="https://www.kde.org/applications/games/killbots/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-16.12.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-16.12.3.ebuild
index a7e91dee2df2..e18f4ab83def 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-16.12.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-16.12.3.ebuild
@@ -8,5 +8,5 @@ inherit kde4-base
DESCRIPTION="KDE web development - image map editor"
HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
diff --git a/kde-apps/kio-extras/kio-extras-16.12.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-16.12.3-r1.ebuild
index 13c61c0a0442..9bf0f4a94ebf 100644
--- a/kde-apps/kio-extras/kio-extras-16.12.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-16.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="activities exif +man mtp openexr phonon samba +sftp slp"
COMMON_DEPEND="
diff --git a/kde-apps/kiriki/kiriki-16.12.3.ebuild b/kde-apps/kiriki/kiriki-16.12.3.ebuild
index ff86b80920f4..9ea92999b43e 100644
--- a/kde-apps/kiriki/kiriki-16.12.3.ebuild
+++ b/kde-apps/kiriki/kiriki-16.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kiriki/
https://games.kde.org/game.php?game=kiriki
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kiten/kiten-16.12.3.ebuild b/kde-apps/kiten/kiten-16.12.3.ebuild
index 47f90136cd90..2e259921fa26 100644
--- a/kde-apps/kiten/kiten-16.12.3.ebuild
+++ b/kde-apps/kiten/kiten-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="KDE Japanese dictionary and reference"
HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kjumpingcube/kjumpingcube-16.12.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-16.12.3.ebuild
index 6649385b7a0d..4763f01bfa2c 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-16.12.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kjumpingcube/
https://games.kde.org/game.php?game=kjumpingcube
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/klettres/klettres-16.12.3.ebuild b/kde-apps/klettres/klettres-16.12.3.ebuild
index d7fc88c0652f..cccc6ca05b17 100644
--- a/kde-apps/klettres/klettres-16.12.3.ebuild
+++ b/kde-apps/klettres/klettres-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Alphabet learning application"
HOMEPAGE="https://www.kde.org/applications/education/klettres
https://edu.kde.org/klettres"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/klickety/klickety-16.12.3.ebuild b/kde-apps/klickety/klickety-16.12.3.ebuild
index 596a33318a19..c0959d226dfa 100644
--- a/kde-apps/klickety/klickety-16.12.3.ebuild
+++ b/kde-apps/klickety/klickety-16.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_SELINUX_MODULE="games"
inherit kde5
DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/klines/klines-16.12.3.ebuild b/kde-apps/klines/klines-16.12.3.ebuild
index 1f5c03cffde3..2997236c148a 100644
--- a/kde-apps/klines/klines-16.12.3.ebuild
+++ b/kde-apps/klines/klines-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/klines/
https://games.kde.org/game.php?game=klines
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/klinkstatus/klinkstatus-16.12.3.ebuild b/kde-apps/klinkstatus/klinkstatus-16.12.3.ebuild
index ec5b66ba4170..a66a52ea5df9 100644
--- a/kde-apps/klinkstatus/klinkstatus-16.12.3.ebuild
+++ b/kde-apps/klinkstatus/klinkstatus-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE web development - link validity checker"
HOMEPAGE="https://www.kde.org/applications/development/klinkstatus/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug tidy"
DEPEND="
diff --git a/kde-apps/kmag/kmag-16.12.3.ebuild b/kde-apps/kmag/kmag-16.12.3.ebuild
index 5644e18262ff..db7f3875cf1b 100644
--- a/kde-apps/kmag/kmag-16.12.3.ebuild
+++ b/kde-apps/kmag/kmag-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE screen magnifier"
HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-16.12.3.ebuild b/kde-apps/kmahjongg/kmahjongg-16.12.3.ebuild
index 60ac087c5289..76c9f338c4d5 100644
--- a/kde-apps/kmahjongg/kmahjongg-16.12.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kmahjongg/
https://games.kde.org/game.php?game=kmahjongg
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kmines/kmines-16.12.3.ebuild b/kde-apps/kmines/kmines-16.12.3.ebuild
index e424e7318190..9d448fe935f1 100644
--- a/kde-apps/kmines/kmines-16.12.3.ebuild
+++ b/kde-apps/kmines/kmines-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kmines/
https://games.kde.org/game.php?game=kmines
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kmix/kmix-16.12.3.ebuild b/kde-apps/kmix/kmix-16.12.3.ebuild
index 088ab3364de8..e0048aadc19a 100644
--- a/kde-apps/kmix/kmix-16.12.3.ebuild
+++ b/kde-apps/kmix/kmix-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Plasma mixer gui"
HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa pulseaudio"
DEPEND="
diff --git a/kde-apps/kmousetool/kmousetool-16.12.3.ebuild b/kde-apps/kmousetool/kmousetool-16.12.3.ebuild
index 2beb60b06431..d6afa2b183ac 100644
--- a/kde-apps/kmousetool/kmousetool-16.12.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE program that clicks the mouse for you"
HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kmouth/kmouth-16.12.3.ebuild b/kde-apps/kmouth/kmouth-16.12.3.ebuild
index 06aa77ed34d9..2f6d0e313dfa 100644
--- a/kde-apps/kmouth/kmouth-16.12.3.ebuild
+++ b/kde-apps/kmouth/kmouth-16.12.3.ebuild
@@ -8,5 +8,5 @@ inherit kde4-base
DESCRIPTION="Text-to-speech synthesizer front end"
HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
diff --git a/kde-apps/kmplot/kmplot-16.12.3.ebuild b/kde-apps/kmplot/kmplot-16.12.3.ebuild
index 0bb87680aa8d..2470b5e6163a 100644
--- a/kde-apps/kmplot/kmplot-16.12.3.ebuild
+++ b/kde-apps/kmplot/kmplot-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Mathematical function plotter"
HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/knavalbattle/knavalbattle-16.12.3.ebuild b/kde-apps/knavalbattle/knavalbattle-16.12.3.ebuild
index aaa4822b65cb..1eddcad15d02 100644
--- a/kde-apps/knavalbattle/knavalbattle-16.12.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/navalbattle/
https://games.kde.org/game.php?game=kbattleship
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/knetwalk/knetwalk-16.12.3.ebuild b/kde-apps/knetwalk/knetwalk-16.12.3.ebuild
index 01666eebf7a8..daf9b8b18abf 100644
--- a/kde-apps/knetwalk/knetwalk-16.12.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-16.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/knetwalk/
https://games.kde.org/game.php?game=knetwalk
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kolf/kolf-16.12.3.ebuild b/kde-apps/kolf/kolf-16.12.3.ebuild
index 7d15cdd7faae..eeae20d10166 100644
--- a/kde-apps/kolf/kolf-16.12.3.ebuild
+++ b/kde-apps/kolf/kolf-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kolf/
https://games.kde.org/game.php?game=kolf
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kollision/kollision-16.12.3.ebuild b/kde-apps/kollision/kollision-16.12.3.ebuild
index aae846f81376..9a8bdffe180a 100644
--- a/kde-apps/kollision/kollision-16.12.3.ebuild
+++ b/kde-apps/kollision/kollision-16.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kollision/
https://games.kde.org/game.php?game=kollision
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kolourpaint/kolourpaint-16.12.3.ebuild b/kde-apps/kolourpaint/kolourpaint-16.12.3.ebuild
index 90d7b8a1f223..c4c3fe5b586d 100644
--- a/kde-apps/kolourpaint/kolourpaint-16.12.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Paint Program by KDE"
HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
IUSE="scanner"
diff --git a/kde-apps/kommander/kommander-16.12.3.ebuild b/kde-apps/kommander/kommander-16.12.3.ebuild
index 24848c95b5f8..0e850f411715 100644
--- a/kde-apps/kommander/kommander-16.12.3.ebuild
+++ b/kde-apps/kommander/kommander-16.12.3.ebuild
@@ -8,5 +8,5 @@ inherit kde4-base
DESCRIPTION="KDE dialog system for scripting"
HOMEPAGE="https://www.kde.org/applications/development/kommander/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
diff --git a/kde-apps/kompare/kompare-16.12.3.ebuild b/kde-apps/kompare/kompare-16.12.3.ebuild
index b7f1eb8f2604..122708ad70ba 100644
--- a/kde-apps/kompare/kompare-16.12.3.ebuild
+++ b/kde-apps/kompare/kompare-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="A program to view the differences between files"
HOMEPAGE="https://www.kde.org/applications/development/kompare
http://www.caffeinated.me.uk/kompare"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/konqueror/konqueror-16.12.3.ebuild b/kde-apps/konqueror/konqueror-16.12.3.ebuild
index 05b84f7964f0..f6b9e0318c78 100644
--- a/kde-apps/konqueror/konqueror-16.12.3.ebuild
+++ b/kde-apps/konqueror/konqueror-16.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="activities speech tidy X"
# 4 of 4 tests fail. Last checked for 4.0.3
RESTRICT+=" test"
diff --git a/kde-apps/konquest/konquest-16.12.3.ebuild b/kde-apps/konquest/konquest-16.12.3.ebuild
index de515bf0ed6a..34556496fa55 100644
--- a/kde-apps/konquest/konquest-16.12.3.ebuild
+++ b/kde-apps/konquest/konquest-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/konquest/
https://games.kde.org/game.php?game=konquest
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/konsole/konsole-16.12.3.ebuild b/kde-apps/konsole/konsole-16.12.3.ebuild
index 81724e17fc06..dee0a19e148c 100644
--- a/kde-apps/konsole/konsole-16.12.3.ebuild
+++ b/kde-apps/konsole/konsole-16.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="KDE's terminal emulator"
HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X"
DEPEND="
diff --git a/kde-apps/kopete/kopete-16.12.3-r1.ebuild b/kde-apps/kopete/kopete-16.12.3-r1.ebuild
index 8f994e59f0e3..aca4d3f14f69 100644
--- a/kde-apps/kopete/kopete-16.12.3-r1.ebuild
+++ b/kde-apps/kopete/kopete-16.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE multi-protocol IM client"
HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug ssl v4l"
# tests hang, last checked for 4.2.96
diff --git a/kde-apps/kpat/kpat-16.12.3.ebuild b/kde-apps/kpat/kpat-16.12.3.ebuild
index 5edb022ec6e5..1ead726d7ea3 100644
--- a/kde-apps/kpat/kpat-16.12.3.ebuild
+++ b/kde-apps/kpat/kpat-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KDE patience game"
HOMEPAGE="https://games.kde.org/game.php?game=kpat"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kppp/kppp-16.12.3.ebuild b/kde-apps/kppp/kppp-16.12.3.ebuild
index 180c1a212825..dedff12c5f83 100644
--- a/kde-apps/kppp/kppp-16.12.3.ebuild
+++ b/kde-apps/kppp/kppp-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="A dialer and front-end to pppd"
HOMEPAGE="https://www.kde.org/applications/internet/kppp"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-16.12.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-16.12.3.ebuild
index 1c0761d87a07..42e5357925da 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-16.12.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5
DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/krdc/krdc-16.12.3.ebuild b/kde-apps/krdc/krdc-16.12.3.ebuild
index 380567e5d0f1..3f6e6de748a5 100644
--- a/kde-apps/krdc/krdc-16.12.3.ebuild
+++ b/kde-apps/krdc/krdc-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Remote desktop connection (RDP and VNC) client"
HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+rdp vnc"
#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/kremotecontrol/kremotecontrol-16.12.3.ebuild b/kde-apps/kremotecontrol/kremotecontrol-16.12.3.ebuild
index 526ae54b937f..b179a672051f 100644
--- a/kde-apps/kremotecontrol/kremotecontrol-16.12.3.ebuild
+++ b/kde-apps/kremotecontrol/kremotecontrol-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
HOMEPAGE="https://www.kde.org/applications/utilities/kremotecontrol
https://utils.kde.org/projects/kremotecontrol"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kreversi/kreversi-16.12.3.ebuild b/kde-apps/kreversi/kreversi-16.12.3.ebuild
index 9bd7cab08727..b166161fc555 100644
--- a/kde-apps/kreversi/kreversi-16.12.3.ebuild
+++ b/kde-apps/kreversi/kreversi-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kreversi/
https://games.kde.org/game.php?game=kreversi
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/krfb/krfb-16.12.3-r1.ebuild b/kde-apps/krfb/krfb-16.12.3-r1.ebuild
index 3fd4fb3c7423..9f9d043bf792 100644
--- a/kde-apps/krfb/krfb-16.12.3-r1.ebuild
+++ b/kde-apps/krfb/krfb-16.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="VNC-compatible server to share KDE desktops"
HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kross-interpreters/kross-interpreters-16.12.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-16.12.3.ebuild
index 2d9f5a047735..b342a6aea706 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-16.12.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-16.12.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit python-single-r1 kde5
DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kruler/kruler-16.12.3.ebuild b/kde-apps/kruler/kruler-16.12.3.ebuild
index ba3f9732ec28..2b75cb6e2c40 100644
--- a/kde-apps/kruler/kruler-16.12.3.ebuild
+++ b/kde-apps/kruler/kruler-16.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Screen ruler for Plasma"
HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X"
DEPEND="
diff --git a/kde-apps/ksaneplugin/ksaneplugin-16.12.3.ebuild b/kde-apps/ksaneplugin/ksaneplugin-16.12.3.ebuild
index 2495b2307fa5..28630fde8965 100644
--- a/kde-apps/ksaneplugin/ksaneplugin-16.12.3.ebuild
+++ b/kde-apps/ksaneplugin/ksaneplugin-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde4-base
DESCRIPTION="SANE Plugin by KDE"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kscd/kscd-16.12.3.ebuild b/kde-apps/kscd/kscd-16.12.3.ebuild
index 212247acbe05..38e8c1d5ea82 100644
--- a/kde-apps/kscd/kscd-16.12.3.ebuild
+++ b/kde-apps/kscd/kscd-16.12.3.ebuild
@@ -7,7 +7,7 @@ inherit kde4-base
DESCRIPTION="KDE CD player"
HOMEPAGE="https://www.kde.org/applications/multimedia/kscd/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kshisen/kshisen-16.12.3.ebuild b/kde-apps/kshisen/kshisen-16.12.3.ebuild
index 192579cae71c..5078d19a1617 100644
--- a/kde-apps/kshisen/kshisen-16.12.3.ebuild
+++ b/kde-apps/kshisen/kshisen-16.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kshisen/
https://games.kde.org/game.php?game=kshisen
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/ksirk/ksirk-16.12.3.ebuild b/kde-apps/ksirk/ksirk-16.12.3.ebuild
index b55d87ab508c..671cca3cf2ba 100644
--- a/kde-apps/ksirk/ksirk-16.12.3.ebuild
+++ b/kde-apps/ksirk/ksirk-16.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/ksirk/
https://games.kde.org/game.php?game=ksirk
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-16.12.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-16.12.3.ebuild
index 8995db27248e..5fecdccc4329 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-16.12.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE Tron game"
HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-16.12.3.ebuild b/kde-apps/kspaceduel/kspaceduel-16.12.3.ebuild
index c9de776f33d6..676d2eb4c225 100644
--- a/kde-apps/kspaceduel/kspaceduel-16.12.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kspaceduel/
https://games.kde.org/game.php?game=kspaceduel
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/ksquares/ksquares-16.12.3.ebuild b/kde-apps/ksquares/ksquares-16.12.3.ebuild
index b5fcc83dd784..facad51e7b0f 100644
--- a/kde-apps/ksquares/ksquares-16.12.3.ebuild
+++ b/kde-apps/ksquares/ksquares-16.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/ksquares/
https://games.kde.org/game.php?game=ksquares
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kstars/kstars-16.12.3-r1.ebuild b/kde-apps/kstars/kstars-16.12.3-r1.ebuild
index 620860d6f692..703124e2556c 100644
--- a/kde-apps/kstars/kstars-16.12.3-r1.ebuild
+++ b/kde-apps/kstars/kstars-16.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5 python-single-r1
DESCRIPTION="Desktop Planetarium"
HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="fits indi raw wcs xplanet"
REQUIRED_USE="indi? ( fits )"
diff --git a/kde-apps/ksudoku/ksudoku-16.12.3.ebuild b/kde-apps/ksudoku/ksudoku-16.12.3.ebuild
index c732b161869c..f327dbee5b28 100644
--- a/kde-apps/ksudoku/ksudoku-16.12.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/ksudoku/
https://games.kde.org/game.php?game=ksudoku
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/ksystemlog/ksystemlog-16.12.3.ebuild b/kde-apps/ksystemlog/ksystemlog-16.12.3.ebuild
index 6ca98353f4be..399e2a9d2ea5 100644
--- a/kde-apps/ksystemlog/ksystemlog-16.12.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="System log viewer by KDE"
HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="systemd"
# bug 378101
diff --git a/kde-apps/kteatime/kteatime-16.12.3.ebuild b/kde-apps/kteatime/kteatime-16.12.3.ebuild
index 932383260da2..de618f54b60e 100644
--- a/kde-apps/kteatime/kteatime-16.12.3.ebuild
+++ b/kde-apps/kteatime/kteatime-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="KDE timer for making a fine cup of tea"
HOMEPAGE="https://www.kde.org/applications/games/kteatime"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/ktimer/ktimer-16.12.3.ebuild b/kde-apps/ktimer/ktimer-16.12.3.ebuild
index ff491103bae2..06b5b778bded 100644
--- a/kde-apps/ktimer/ktimer-16.12.3.ebuild
+++ b/kde-apps/ktimer/ktimer-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KDE Timer"
HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
https://utils.kde.org/projects/ktimer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/ktouch/ktouch-16.12.3.ebuild b/kde-apps/ktouch/ktouch-16.12.3.ebuild
index 026fbda75eb9..6e0a090d7874 100644
--- a/kde-apps/ktouch/ktouch-16.12.3.ebuild
+++ b/kde-apps/ktouch/ktouch-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Program that helps to learn and practice touch typing"
HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.12.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.12.3.ebuild
index bf41762c000e..787f91d2b4aa 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.12.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy account management kcm"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="experimental"
COMMON_DEPEND="
diff --git a/kde-apps/ktp-approver/ktp-approver-16.12.3.ebuild b/kde-apps/ktp-approver/ktp-approver-16.12.3.ebuild
index e5ce85096ebc..4efa03734c61 100644
--- a/kde-apps/ktp-approver/ktp-approver-16.12.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy notification handler"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.12.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.12.3.ebuild
index d38074bb2672..f8fa7f149fea 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.12.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy authentication handler"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-16.12.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-16.12.3.ebuild
index e58b70e54df4..91919fc968e7 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-16.12.3.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy audio/video conferencing ui"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-16.12.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-16.12.3.ebuild
index 6d6301301654..45a441389781 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-16.12.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-16.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy common library"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="otr +sso"
COMMON_DEPEND="
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-16.12.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-16.12.3.ebuild
index f4ea74e2d012..5ca7828b132e 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-16.12.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy contact list"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-16.12.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-16.12.3.ebuild
index 7d578376505d..0271cf67d937 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-16.12.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy krunner plugin"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.12.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.12.3.ebuild
index 114edc9a8685..08cde3f6f67d 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.12.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.12.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.12.3.ebuild
index a5c4486c9c7f..2d99f7685330 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.12.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy file transfer handler"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-16.12.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-16.12.3.ebuild
index 4acbd24d756a..a01e9591ced2 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-16.12.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy workspace integration"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/ktp-send-file-16.12.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-16.12.3.ebuild
index 577af19da90b..d07f123dd694 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-16.12.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-16.12.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-16.12.3.ebuild
index 1deab7b91d45..70d49a575177 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-16.12.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Telepathy text chat window"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="speech"
DEPEND="
diff --git a/kde-apps/ktuberling/ktuberling-16.12.3.ebuild b/kde-apps/ktuberling/ktuberling-16.12.3.ebuild
index 5f492fe60bf3..59c9f9af89ca 100644
--- a/kde-apps/ktuberling/ktuberling-16.12.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/ktuberling/
https://games.kde.org/game.php?game=ktuberling
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kturtle/kturtle-16.12.3.ebuild b/kde-apps/kturtle/kturtle-16.12.3.ebuild
index b589148f1d93..cf8155422726 100644
--- a/kde-apps/kturtle/kturtle-16.12.3.ebuild
+++ b/kde-apps/kturtle/kturtle-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Educational programming environment using the Logo programming language"
HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kubrick/kubrick-16.12.3.ebuild b/kde-apps/kubrick/kubrick-16.12.3.ebuild
index 602b5f5e68db..4c62c1fd3ce8 100644
--- a/kde-apps/kubrick/kubrick-16.12.3.ebuild
+++ b/kde-apps/kubrick/kubrick-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="A game based on the \"Rubik's Cube\" puzzle"
HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
RDEPEND="$(add_kdeapps_dep libkdegames)
diff --git a/kde-apps/kwalletmanager/kwalletmanager-16.12.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-16.12.3.ebuild
index 9698efe0e967..48d54cdb21d2 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-16.12.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="KDE Wallet management tool"
HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kwave/kwave-16.12.3.ebuild b/kde-apps/kwave/kwave-16.12.3.ebuild
index 19a6449c641e..40e02f495b68 100644
--- a/kde-apps/kwave/kwave-16.12.3.ebuild
+++ b/kde-apps/kwave/kwave-16.12.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="
handbook? ( FDL-1.2 )
opus? ( BSD-2 )
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa flac mp3 +qtmedia opus oss pulseaudio vorbis"
COMMON_DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-16.12.3.ebuild b/kde-apps/kwordquiz/kwordquiz-16.12.3.ebuild
index 274dbf62c043..6cab7276dd29 100644
--- a/kde-apps/kwordquiz/kwordquiz-16.12.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="A powerful flashcard and vocabulary learning program"
HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kwrite/kwrite-16.12.3.ebuild b/kde-apps/kwrite/kwrite-16.12.3.ebuild
index b89ab64c9c92..96d1784e517a 100644
--- a/kde-apps/kwrite/kwrite-16.12.3.ebuild
+++ b/kde-apps/kwrite/kwrite-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KDE simple text editor"
HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
$(add_frameworks_dep kactivities)
diff --git a/kde-apps/libkcddb/libkcddb-16.12.3.ebuild b/kde-apps/libkcddb/libkcddb-16.12.3.ebuild
index e3e7e3002854..027f4e30d44f 100644
--- a/kde-apps/libkcddb/libkcddb-16.12.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="KDE library for CDDB"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="musicbrainz"
# tests require network access and compare static data with online data
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild
index 97b111d8dc51..45341b1850cc 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Library for playing & ripping CDs"
LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="alsa"
RDEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-16.12.3.ebuild b/kde-apps/libkdcraw/libkdcraw-16.12.3.ebuild
index 17a23d1e8261..7e7580158fdd 100644
--- a/kde-apps/libkdcraw/libkdcraw-16.12.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Digital camera raw image library wrapper"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-16.12.3.ebuild b/kde-apps/libkdegames/libkdegames-16.12.3.ebuild
index 7ca0f87903f1..ee7df204fd14 100644
--- a/kde-apps/libkdegames/libkdegames-16.12.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-16.12.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-16.12.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-16.12.3.ebuild
index 6242031c473e..0d15f01d536e 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-16.12.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-16.12.3.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
inherit kde5
DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkexiv2/libkexiv2-16.12.3.ebuild b/kde-apps/libkexiv2/libkexiv2-16.12.3.ebuild
index 4df9f95d5bc1..01366139dad4 100644
--- a/kde-apps/libkexiv2/libkexiv2-16.12.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="+xmp"
DEPEND="
diff --git a/kde-apps/libkface/libkface-16.12.3.ebuild b/kde-apps/libkface/libkface-16.12.3.ebuild
index 3560ecdfd198..414a7dfed27a 100644
--- a/kde-apps/libkface/libkface-16.12.3.ebuild
+++ b/kde-apps/libkface/libkface-16.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detec
HOMEPAGE="https://projects.kde.org/projects/kde/kdegraphics/libs/libkface"
LICENSE="BSD GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkgeomap/libkgeomap-16.12.3.ebuild b/kde-apps/libkgeomap/libkgeomap-16.12.3.ebuild
index d00adcf19dfa..bb3d6ffba2cf 100644
--- a/kde-apps/libkgeomap/libkgeomap-16.12.3.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-16.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Wrapper library for world map components as marble, openstreetmap a
HOMEPAGE="https://www.digikam.org/"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkipi/libkipi-16.12.3.ebuild b/kde-apps/libkipi/libkipi-16.12.3.ebuild
index b49cfe2e954c..7ca9680542d1 100644
--- a/kde-apps/libkipi/libkipi-16.12.3.ebuild
+++ b/kde-apps/libkipi/libkipi-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="A library for image plugins accross KDE applications"
LICENSE="GPL-2+"
SLOT="5/32"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-16.12.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-16.12.3.ebuild
index 624aee878c5f..50d425ef43f8 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-16.12.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-16.12.3.ebuild
@@ -7,7 +7,7 @@ KDE_BLOCK_SLOT4="false"
inherit kde5
DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-16.12.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-16.12.3.ebuild
index a5dcbf8ff861..767d86deebc0 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-16.12.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-16.12.3.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
inherit kde5
DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libksane/libksane-16.12.3.ebuild b/kde-apps/libksane/libksane-16.12.3.ebuild
index 2dbc53db05e7..9452ff08666f 100644
--- a/kde-apps/libksane/libksane-16.12.3.ebuild
+++ b/kde-apps/libksane/libksane-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="SANE Library interface based on KDE Frameworks"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/lokalize/lokalize-16.12.3.ebuild b/kde-apps/lokalize/lokalize-16.12.3.ebuild
index 83096b5681fb..698fc0444b15 100644
--- a/kde-apps/lokalize/lokalize-16.12.3.ebuild
+++ b/kde-apps/lokalize/lokalize-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 kde5
DESCRIPTION="KDE Applications 5 translation tool"
HOMEPAGE="https://www.kde.org/applications/development/lokalize
http://l10n.kde.org/tools"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/lskat/lskat-16.12.3.ebuild b/kde-apps/lskat/lskat-16.12.3.ebuild
index 9799ddd168c9..0271150efe85 100644
--- a/kde-apps/lskat/lskat-16.12.3.ebuild
+++ b/kde-apps/lskat/lskat-16.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/lskat/
https://games.kde.org/game.php?game=lskat
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/marble/marble-16.12.3-r1.ebuild b/kde-apps/marble/marble-16.12.3-r1.ebuild
index c70a32fb99d0..a1ce8d3658ff 100644
--- a/kde-apps/marble/marble-16.12.3-r1.ebuild
+++ b/kde-apps/marble/marble-16.12.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
diff --git a/kde-apps/okteta/okteta-16.12.3.ebuild b/kde-apps/okteta/okteta-16.12.3.ebuild
index 20278280fd74..82c539fb8c79 100644
--- a/kde-apps/okteta/okteta-16.12.3.ebuild
+++ b/kde-apps/okteta/okteta-16.12.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="KDE hexeditor"
HOMEPAGE="https://www.kde.org/applications/utilities/okteta
https://utils.kde.org/projects/okteta"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="crypt"
DEPEND="
diff --git a/kde-apps/okular/okular-16.12.3.ebuild b/kde-apps/okular/okular-16.12.3.ebuild
index 2742d7f76d5d..c8b88eb87b42 100644
--- a/kde-apps/okular/okular-16.12.3.ebuild
+++ b/kde-apps/okular/okular-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Universal document viewer based on KDE Frameworks"
HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
DEPEND="
diff --git a/kde-apps/palapeli/palapeli-16.12.3.ebuild b/kde-apps/palapeli/palapeli-16.12.3.ebuild
index f9886337af55..ac57e8d1ae25 100644
--- a/kde-apps/palapeli/palapeli-16.12.3.ebuild
+++ b/kde-apps/palapeli/palapeli-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE jigsaw puzzle game"
HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/parley/parley-16.12.3.ebuild b/kde-apps/parley/parley-16.12.3.ebuild
index 9f5a93007794..e9c214b011eb 100644
--- a/kde-apps/parley/parley-16.12.3.ebuild
+++ b/kde-apps/parley/parley-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="A vocabulary trainer to help you memorize things"
HOMEPAGE="https://www.kde.org/applications/education/parley
https://edu.kde.org/applications/school/parley"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/picmi/picmi-16.12.3.ebuild b/kde-apps/picmi/picmi-16.12.3.ebuild
index 5c1ec74ec1cd..8d2c0b19f33b 100644
--- a/kde-apps/picmi/picmi-16.12.3.ebuild
+++ b/kde-apps/picmi/picmi-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Nonogram logic game by KDE"
HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.12.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.12.3.ebuild
index 3531dae06ef4..39cea12f7db5 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.12.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Plasma Telepathy client"
HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gstreamer nls"
[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/poxml/poxml-16.12.3.ebuild b/kde-apps/poxml/poxml-16.12.3.ebuild
index 42bba9fb1dc3..e57c28298d0d 100644
--- a/kde-apps/poxml/poxml-16.12.3.ebuild
+++ b/kde-apps/poxml/poxml-16.12.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
inherit kde5
DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/print-manager/print-manager-16.12.3.ebuild b/kde-apps/print-manager/print-manager-16.12.3.ebuild
index 93601e97ce42..a214bd391288 100644
--- a/kde-apps/print-manager/print-manager-16.12.3.ebuild
+++ b/kde-apps/print-manager/print-manager-16.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit kde5
DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+gtk"
DEPEND="
diff --git a/kde-apps/rocs/rocs-16.12.3.ebuild b/kde-apps/rocs/rocs-16.12.3.ebuild
index b300a8543cb2..6c39c5bb97be 100644
--- a/kde-apps/rocs/rocs-16.12.3.ebuild
+++ b/kde-apps/rocs/rocs-16.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Interface to work with Graph Theory"
HOMEPAGE="https://www.kde.org/applications/education/rocs
https://edu.kde.org/applications/mathematics/rocs"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.12.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.12.3.ebuild
index 8bd6eb392c5d..61c4c1572fd6 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.12.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.12.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5
DESCRIPTION="KWallet extension for signond"
HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="GPL-2+"
DEPEND="
diff --git a/kde-apps/spectacle/spectacle-16.12.3.ebuild b/kde-apps/spectacle/spectacle-16.12.3.ebuild
index 68b156b846d6..0f060a3d6713 100644
--- a/kde-apps/spectacle/spectacle-16.12.3.ebuild
+++ b/kde-apps/spectacle/spectacle-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Screenshot capture utility"
LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="kipi share"
DEPEND="
diff --git a/kde-apps/step/step-16.12.3.ebuild b/kde-apps/step/step-16.12.3.ebuild
index f1790035f57e..47384f0b5705 100644
--- a/kde-apps/step/step-16.12.3.ebuild
+++ b/kde-apps/step/step-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Interactive physics simulator"
HOMEPAGE="https://edu.kde.org/step"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+gsl +qalculate"
DEPEND="
diff --git a/kde-apps/svgpart/svgpart-16.12.3.ebuild b/kde-apps/svgpart/svgpart-16.12.3.ebuild
index e28bd2efec04..c9eca91f001e 100644
--- a/kde-apps/svgpart/svgpart-16.12.3.ebuild
+++ b/kde-apps/svgpart/svgpart-16.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Kpart for viewing SVGs"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/sweeper/sweeper-16.12.3.ebuild b/kde-apps/sweeper/sweeper-16.12.3.ebuild
index aa33b0d6aa3a..4084bbb217bd 100644
--- a/kde-apps/sweeper/sweeper-16.12.3.ebuild
+++ b/kde-apps/sweeper/sweeper-16.12.3.ebuild
@@ -9,5 +9,5 @@ inherit kde4-base
DESCRIPTION="KDE Privacy Settings Widget"
HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
https://utils.kde.org/projects/sweeper"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
diff --git a/kde-apps/thumbnailers/thumbnailers-16.12.3.ebuild b/kde-apps/thumbnailers/thumbnailers-16.12.3.ebuild
index 04745975827f..1dab24164714 100644
--- a/kde-apps/thumbnailers/thumbnailers-16.12.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-16.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="raw"
DEPEND="
diff --git a/kde-apps/umbrello/umbrello-16.12.3.ebuild b/kde-apps/umbrello/umbrello-16.12.3.ebuild
index af8e354d4393..167ca3257705 100644
--- a/kde-apps/umbrello/umbrello-16.12.3.ebuild
+++ b/kde-apps/umbrello/umbrello-16.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/development/umbrello
https://umbrello.kde.org
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.12.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.12.3.ebuild
index 80968a165944..f7b3b0f5d0ee 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.12.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.12.3.ebuild
@@ -6,5 +6,5 @@ EAPI=6
inherit kde4-base
DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug"
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
index de7eaf793e2d..a4952a4ca7d8 100644
--- a/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/zimg/zimg-2.5.ebuild b/media-libs/zimg/zimg-2.5.ebuild
index 443ee4d9f9ce..fc4f3cd58d8d 100644
--- a/media-libs/zimg/zimg-2.5.ebuild
+++ b/media-libs/zimg/zimg-2.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
if [ "${PV#9999}" = "${PV}" ] ; then
SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
S="${WORKDIR}/${PN}-release-${PV}/"
fi
diff --git a/net-firewall/ferm/ferm-2.3.1.ebuild b/net-firewall/ferm/ferm-2.3.1.ebuild
index da664812726b..b068b2e01a1b 100644
--- a/net-firewall/ferm/ferm-2.3.1.ebuild
+++ b/net-firewall/ferm/ferm-2.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ferm.foo-projects.org/download/${MY_PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
# does not install any perl libs
diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index 05d9f5111008..6a444ac1e40b 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 755456d09c48..80d1baa2f127 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256 3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512 3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c WHIRLPOOL 011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74
DIST webkitgtk-2.16.1.tar.xz 14675996 SHA256 eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 SHA512 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010 WHIRLPOOL c9deacbd229804aaaba88f9fcabdcde1a460430bb60258dfc8d7393723401d7e74d645ba8bf2dcf60e87c30739e45558b747911a4671a8950efe271cb7b86586
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
deleted file mode 100644
index 49af4484604e..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-2015-08-24 Alexandre Rostovtsev <tetromino@gentoo.org>
-
- webkit2gtkinjectedbundle requires forwarding headers
- https://bugs.webkit.org/show_bug.cgi?id=148379
-
- Fixes GTK build with -j1
-
- * PlatformGTK.cmake:
-
-Index: Source/WebKit2/PlatformGTK.cmake
-===================================================================
---- a/Source/WebKit2/PlatformGTK.cmake (revision 188859)
-+++ b/Source/WebKit2/PlatformGTK.cmake (working copy)
-@@ -860,7 +860,7 @@ include_directories(
- )
-
- add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp")
--add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
-+add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings WebKit2-forwarding-headers)
- add_webkit2_prefix_header(webkit2gtkinjectedbundle)
-
- # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
deleted file mode 100644
index 62b0b0e9c57b..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
- geolocation? ( introspection )
- gles2? ( egl )
- introspection? ( gstreamer )
- nsplugin? ( X )
- webgl? ( ^^ ( gles2 opengl ) )
- !webgl? ( ?? ( gles2 opengl ) )
- webgl? ( gstreamer )
- wayland? ( egl )
- || ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
- dev-db/sqlite:3=
- >=dev-libs/glib-2.36:2
- dev-libs/hyphen
- >=dev-libs/icu-3.8.1-r1:=
- >=dev-libs/libxml2-2.8:2
- >=dev-libs/libxslt-1.1.7
- >=media-libs/fontconfig-2.8:1.0
- >=media-libs/freetype-2.4.2:2
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- >=media-libs/libpng-1.4:0=
- media-libs/libwebp:=
- >=net-libs/gnutls-3
- >=net-libs/libsoup-2.42:2.4[introspection?]
- >=x11-libs/cairo-1.10.2:=
- >=x11-libs/gtk+-3.14:3[introspection?]
- >=x11-libs/pango-1.30.0
- virtual/jpeg:0=
-
- aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
- egl? ( media-libs/mesa[egl] )
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
- gles2? ( media-libs/mesa[gles2] )
- gnome-keyring? ( app-crypt/libsecret )
- gstreamer? (
- >=media-libs/gstreamer-1.2:1.0
- >=media-libs/gst-plugins-base-1.2:1.0
- >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
- libnotify? ( x11-libs/libnotify )
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
- opengl? ( virtual/opengl
- x11-libs/cairo[opengl] )
- spell? ( >=app-text/enchant-0.22:= )
- wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
- webgl? (
- x11-libs/cairo[opengl]
- x11-libs/libXcomposite
- x11-libs/libXdamage )
- X? (
- x11-libs/cairo[X]
- >=x11-libs/gtk+-3.14:3[X]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXrender
- x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- ${RUBY_DEPS}
- >=dev-lang/perl-5.10
- >=app-accessibility/at-spi2-core-2.5.3
- >=dev-libs/atk-2.8.0
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/gperf-3.0.1
- >=sys-devel/bison-2.4.3
- >=sys-devel/flex-2.5.34
- || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
- sys-devel/gettext
- virtual/pkgconfig
-
- doc? ( >=dev-util/gtk-doc-1.10 )
- geolocation? ( dev-util/gdbus-codegen )
- introspection? ( jit? ( sys-apps/paxctl ) )
- test? (
- dev-lang/python:2.7
- dev-python/pygobject:3[python_targets_python2_7]
- x11-themes/hicolor-icon-theme
- jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-PATCHES=(
- # https://bugs.gentoo.org/show_bug.cgi?id=555504
- "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
- # https://bugs.gentoo.org/show_bug.cgi?id=564352
- # https://bugs.webkit.org/show_bug.cgi?id=167283
- "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
- # https://bugs.webkit.org/show_bug.cgi?id=148379
- "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
- fi
-
- if ! test-flag-CXX -std=c++11 ; then
- die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
- die 'The active compiler needs to be gcc 4.9 (or newer)'
- fi
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # Arches without JIT support also need this to really disable it in all places
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
- # It does not compile on alpha without this in LDFLAGS
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
- use ia64 && append-ldflags "-Wl,--no-as-needed"
-
- # Sigbuses on SPARC with mcpu and co., bug #???
- use sparc && filter-flags "-mvis"
-
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
- use ppc64 && append-flags "-mminimal-toc"
-
- # Try to use less memory, bug #469942 (see Fedora .spec for reference)
- # --no-keep-memory doesn't work on ia64, bug #502492
- if ! use ia64; then
- append-ldflags "-Wl,--no-keep-memory"
- fi
-
- # We try to use gold when possible for this package
-# if ! tc-ld-is-gold ; then
-# append-ldflags "-Wl,--reduce-memory-overheads"
-# fi
-
- # older glibc needs this for INTPTR_MAX, bug #533976
- if has_version "<sys-libs/glibc-2.18" ; then
- append-cppflags "-D__STDC_LIMIT_MACROS"
- fi
-
- # Multiple rendering bugs on youtube, github, etc without this, bug #547224
- append-flags $(test-flags -fno-strict-aliasing)
-
- local ruby_interpreter=""
-
- if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
- else
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
- fi
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # FTL_JIT requires llvm
- #
- # opengl needs to be explicetly handled, bug #576634
-
- local opengl_enabled
- if use opengl || use gles2; then
- opengl_enabled=ON
- else
- opengl_enabled=OFF
- fi
-
- # support for webgl (aka 2d-canvas accelerating)
- local canvas_enabled
- if use webgl && ! use gles2 ; then
- canvas_enabled=ON
- else
- canvas_enabled=OFF
- fi
-
- local mycmakeargs=(
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_API_TESTS=$(usex test)
- -DENABLE_GTKDOC=$(usex doc)
- -DENABLE_GEOLOCATION=$(usex geolocation)
- $(cmake-utils_use_find_package gles2 OpenGLES2)
- -DENABLE_GLES2=$(usex gles2)
- -DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DENABLE_JIT=$(usex jit)
- -DUSE_LIBNOTIFY=$(usex libnotify)
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
- -DENABLE_SPELLCHECK=$(usex spell)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DENABLE_WEBGL=$(usex webgl)
- $(cmake-utils_use_find_package egl EGL)
- $(cmake-utils_use_find_package opengl OpenGL)
- -DENABLE_X11_TARGET=$(usex X)
- -DENABLE_OPENGL=${opengl_enabled}
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
- -DCMAKE_BUILD_TYPE=Release
- -DPORT=GTK
- ${ruby_interpreter}
- )
-
- # Allow it to use GOLD when possible as it has all the magic to
- # detect when to use it and using gold for this concrete package has
- # multiple advantages and is also the upstream default, bug #585788
-# if tc-ld-is-gold ; then
-# mycmakeargs+=( -DUSE_LD_GOLD=ON )
-# else
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-# fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_test() {
- # Prevents test failures on PaX systems
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Prevents crashes on PaX systems, bug #522808
- use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
index f2ed4bbbbec4..96cc4e992324 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 25c2ed44634f..ac23ebed5b35 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -27,3 +27,7 @@ VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx voodoo"
# Defaults for audio drivers. These are copied from x86 (minus modems), since
# Alpha supports the same busses.
ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index 9a7a23bf7abb..af7d30ae1564 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Tobias Klausmann <klausman@gentoo.org> (17 Mar 2016)
# Webkit itself is enormous (~13h compile+test on our fastest dev machine), so
# it will remain not-stable forever. Mask the USE flag accordingly.
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index a9d2cc0549dc..897169d6b165 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -63,3 +63,7 @@ USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
# by non-multilib ebuilds when non-native ABIs are disabled.
IUSE_IMPLICIT="abi_x86_64"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index f61ff941c456..d4d153d53c19 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
# sys-libs/libapparmor
apparmor
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 48822043d21e..58207017b755 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -22,3 +22,7 @@ VIDEO_CARDS="exynos fbdev omap"
# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
# Unhide the ARM-specific USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index fd610057d048..451a350a2896 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Andrey Grozin <grozin@gentoo.org> (16 May 2014)
# No stable gcl
gcl
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 5dff71b14826..f985ef0637e5 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -20,3 +20,7 @@ VIDEO_CARDS="fbdev"
# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
# Unhide the ARM-specific USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 8b37228640cc..6b0c085c24df 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Mart Raudsepp <leio@gentoo.org> (04 Feb 2017)
# dev-vcs/subversion not marked stable yet
subversion
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 0a3820884b6c..6b8185a2832c 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}"
# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
# Defaults for video drivers
VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
new file mode 100644
index 000000000000..339a497f6129
--- /dev/null
+++ b/profiles/arch/hppa/use.stable.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# This file requires eapi 5 or later. New entries go on top.
+# Please use the same syntax as in use.mask
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 476c229a5a63..906372e964be 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -26,3 +26,7 @@ VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx vesa voodoo"
# 2006/12/23 - Diego Pettenò <flameeyes@gentoo.org>
# Defaults for audio drivers - Took from x86 profile
ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 88f33d5ae7be..b9adc5d7e448 100644
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Not stable
mkl
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 57c5d7770ef5..6ba3076feda9 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -35,3 +35,7 @@ IUSE_IMPLICIT="abi_ppc_32"
# Enable abi_ppc_32 for packages that don't have it forced.
ABI_PPC="32"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index ab73cb222f1a..39ca1020ef10 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,7 @@
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
# no stable versions on ppc
clisp
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index fe54e02e4ef5..a02b5076f66e 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mach64 mga nv r128 radeon vesa"
# Enable abi_ppc_64 for packages that don't have it forced.
ABI_PPC="64"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
new file mode 100644
index 000000000000..339a497f6129
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# This file requires eapi 5 or later. New entries go on top.
+# Please use the same syntax as in use.mask
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 0053c3734d92..7abf4172ffee 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -39,3 +39,7 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
# Defaults for video drivers
VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
suncg6 sunffb sunleo tdfx voodoo"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index a1ef089a866d..054384207e15 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
# no stable version on sparc
ecls
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index f3347ce31a71..0709d43356a1 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -42,3 +42,7 @@ IUSE_IMPLICIT="abi_x86_32"
# Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
# Default to abi_x86_32 for packages that don't have it forced.
ABI_X86="32"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 3a096d726fc7..91ad03654007 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
# Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
# sys-libs/libapparmor
apparmor
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index acf5b268cd1c..d5afdb04eb4a 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -96,7 +96,7 @@ USE="${USE} modules"
# Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
# Default Ruby build targets
-RUBY_TARGETS="ruby21"
+RUBY_TARGETS="ruby21 ruby22"
# Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
# Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 0a75a2528e5c..5bc36ff52361 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -34,7 +34,6 @@ libressl
# Hans de Graaff <graaff@gentoo.org> (25 Dec 2016)
# Currently in testing and not ready to go stable yet.
-ruby_targets_ruby22
ruby_targets_ruby23
ruby_targets_ruby24
diff --git a/sci-libs/indilib/indilib-1.3.1.ebuild b/sci-libs/indilib/indilib-1.3.1.ebuild
index 6e60ac3ea252..accd09d2328b 100644
--- a/sci-libs/indilib/indilib-1.3.1.ebuild
+++ b/sci-libs/indilib/indilib-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN/lib/}/${PN/lib/}-${PV}.zip"
LICENSE="LGPL-2"
SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/sys-power/powertop/powertop-2.8.ebuild b/sys-power/powertop/powertop-2.8.ebuild
index 8a16c7e18131..6b7cd4d5cc4c 100644
--- a/sys-power/powertop/powertop-2.8.ebuild
+++ b/sys-power/powertop/powertop-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
else
SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 arm ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm ppc ~sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="tool that helps you find what software is using the most power"
diff --git a/x11-wm/xpra/xpra-1.0.4-r1.ebuild b/x11-wm/xpra/xpra-1.0.4-r1.ebuild
index 02f9f1483671..39eccb30ba88 100644
--- a/x11-wm/xpra/xpra-1.0.4-r1.ebuild
+++ b/x11-wm/xpra/xpra-1.0.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}