Merge updates from master

39 files changed, 39 insertions, 39 deletions

diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index cd070c50051d..3eccfaf4b8a3 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3
diff --git a/dev-vcs/git/git-2.20.1.ebuild b/dev-vcs/git/git-2.20.1.ebuild
index 1b32a8338352..13ee8b89646f 100644
--- a/dev-vcs/git/git-2.20.1.ebuild
+++ b/dev-vcs/git/git-2.20.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.21.0.ebuild b/dev-vcs/git/git-2.21.0.ebuild
index 7f9badb1427e..f34c3bc00aad 100644
--- a/dev-vcs/git/git-2.21.0.ebuild
+++ b/dev-vcs/git/git-2.21.0.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild
index bd1663f53e1c..06e50b203808 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for akonadi calendar integration"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.12.3-r1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.3-r1.ebuild
index d3db863486fb..d0a220e6f351 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.3-r1.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.3-r1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.3-r1.ebuild
index 0b35592cc341..6721e5b3ed72 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.12.3-r1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.12.3-r1.ebuild
index 68f5043c6e2f..4cdabfc3519a 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.12.3-r1.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.12.3-r1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.12.3-r1.ebuild
index 112657463a7d..8400cdfcb47c 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.12.3-r1.ebuild
@@ -7,7 +7,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild b/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild
index c834565402af..94495abb7c6b 100644
--- a/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
 HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild b/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild
index 8b3713c95d81..65170e255b10 100644
--- a/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.3-r1.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.12.3-r1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.12.3-r1.ebuild
index 81c979002689..c11c1d76982b 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-18.12.3-r1.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Application for debugging Akonadi Resources"
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
 HOMEPAGE="https://www.kde.org/"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild
index 63d93e77fd4a..e42d1a9c2e7d 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/calendarsupport/calendarsupport-18.12.3-r1.ebuild b/kde-apps/calendarsupport/calendarsupport-18.12.3-r1.ebuild
index acf8cee8c040..05acf3aa7191 100644
--- a/kde-apps/calendarsupport/calendarsupport-18.12.3-r1.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Calendar support library"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/eventviews/eventviews-18.12.3-r1.ebuild b/kde-apps/eventviews/eventviews-18.12.3-r1.ebuild
index 164ec4df1c7e..da7d4922fbc4 100644
--- a/kde-apps/eventviews/eventviews-18.12.3-r1.ebuild
+++ b/kde-apps/eventviews/eventviews-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Calendar viewer for KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.12.3-r1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.12.3-r1.ebuild
index c93ce22de9e5..4700223c87ea 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-18.12.3-r1.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Incidence editor for korganizer"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-18.12.3-r1.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.3-r1.ebuild
index 89a5fb7f0393..ce9c060914c4 100644
--- a/kde-apps/kaddressbook/kaddressbook-18.12.3-r1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.3-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Address book application based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kalarm/kalarm-18.12.3-r1.ebuild b/kde-apps/kalarm/kalarm-18.12.3-r1.ebuild
index 4b00d5065b82..e17cb552e5e6 100644
--- a/kde-apps/kalarm/kalarm-18.12.3-r1.ebuild
+++ b/kde-apps/kalarm/kalarm-18.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
 HOMEPAGE+=" https://userbase.kde.org/KAlarm"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="X"
 
 BDEPEND="
diff --git a/kde-apps/kalarmcal/kalarmcal-18.12.3-r1.ebuild b/kde-apps/kalarmcal/kalarmcal-18.12.3-r1.ebuild
index c80eda47017e..a12a1089630c 100644
--- a/kde-apps/kalarmcal/kalarmcal-18.12.3-r1.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Client library to access and handling of KAlarm calendar data"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild
index f6a000bd4d7e..65f58478619f 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plugins for KDE Personal Information Management Suite"
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="importwizard markdown"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.3-r1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.3-r1.ebuild
index 6ced0e708e53..7dd83a133d09 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.3-r1.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Libraries for KDE PIM applications"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild
index 30f15b29e772..d8be36607f34 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+oauth"
 
 # TODO kolab
diff --git a/kde-apps/kgpg/kgpg-18.12.3-r1.ebuild b/kde-apps/kgpg/kgpg-18.12.3-r1.ebuild
index e0a9dedb3627..00b4ab7ffee6 100644
--- a/kde-apps/kgpg/kgpg-18.12.3-r1.ebuild
+++ b/kde-apps/kgpg/kgpg-18.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
 HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
 https://utils.kde.org/projects/kgpg/"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.3-r1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.3-r1.ebuild
index 24c613d28073..a1b0736cd559 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.3-r1.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Assistant for KMail accounts configuration"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail/kmail-18.12.3-r1.ebuild b/kde-apps/kmail/kmail-18.12.3-r1.ebuild
index 27af04091178..544c756eec35 100644
--- a/kde-apps/kmail/kmail-18.12.3-r1.ebuild
+++ b/kde-apps/kmail/kmail-18.12.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild b/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
index d93372afbacb..5509a10284d9 100644
--- a/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Mail transport service"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/knotes/knotes-18.12.3-r1.ebuild b/kde-apps/knotes/knotes-18.12.3-r1.ebuild
index 5d97b2769050..3d17cc603365 100644
--- a/kde-apps/knotes/knotes-18.12.3-r1.ebuild
+++ b/kde-apps/knotes/knotes-18.12.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Note taking application"
 HOMEPAGE="https://www.kde.org/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.12.3-r1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.3-r1.ebuild
index 4899c006bb6c..4df2b91daa1d 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-18.12.3-r1.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.3-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/kontact-18.12.3-r1.ebuild b/kde-apps/kontact/kontact-18.12.3-r1.ebuild
index 132e17e27d1b..e2cbceaa972f 100644
--- a/kde-apps/kontact/kontact-18.12.3-r1.ebuild
+++ b/kde-apps/kontact/kontact-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Container application to unify several major PIM applications within one"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/korganizer/korganizer-18.12.3-r1.ebuild b/kde-apps/korganizer/korganizer-18.12.3-r1.ebuild
index 8605bc751cf2..ff9cb77e4a5a 100644
--- a/kde-apps/korganizer/korganizer-18.12.3-r1.ebuild
+++ b/kde-apps/korganizer/korganizer-18.12.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
 HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="X"
 
 BDEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-18.12.3-r1.ebuild b/kde-apps/libkdepim/libkdepim-18.12.3-r1.ebuild
index da72328bbf16..30f297a14309 100644
--- a/kde-apps/libkdepim/libkdepim-18.12.3-r1.ebuild
+++ b/kde-apps/libkdepim/libkdepim-18.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkleo/libkleo-18.12.3-r1.ebuild b/kde-apps/libkleo/libkleo-18.12.3-r1.ebuild
index afc64c02e7cf..cf12e5ca7d2e 100644
--- a/kde-apps/libkleo/libkleo-18.12.3-r1.ebuild
+++ b/kde-apps/libkleo/libkleo-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for encryption handling"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+fancyviewer"
 
 COMMON_DEPEND="
diff --git a/kde-apps/mailcommon/mailcommon-18.12.3-r1.ebuild b/kde-apps/mailcommon/mailcommon-18.12.3-r1.ebuild
index 188d394c8f53..3164525a1744 100644
--- a/kde-apps/mailcommon/mailcommon-18.12.3-r1.ebuild
+++ b/kde-apps/mailcommon/mailcommon-18.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common mail library"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/mailimporter/mailimporter-18.12.3-r1.ebuild b/kde-apps/mailimporter/mailimporter-18.12.3-r1.ebuild
index abf7c60e8c7c..0bfe13d9d0e8 100644
--- a/kde-apps/mailimporter/mailimporter-18.12.3-r1.ebuild
+++ b/kde-apps/mailimporter/mailimporter-18.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library to import mail from various sources"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mbox-importer/mbox-importer-18.12.3-r1.ebuild b/kde-apps/mbox-importer/mbox-importer-18.12.3-r1.ebuild
index e4e3960c7a27..a80a57ad17a7 100644
--- a/kde-apps/mbox-importer/mbox-importer-18.12.3-r1.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild b/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild
index 52a01fdc8e1d..fdac0bab4b79 100644
--- a/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild
+++ b/kde-apps/messagelib/messagelib-18.12.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Libraries for messaging functions"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.12.3-r1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.12.3-r1.ebuild
index 4f60146325bd..f19b356ee41f 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-18.12.3-r1.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.12.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Assistant to backup and archive PIM data and configuration"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.3-r1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.3-r1.ebuild
index 12dc8339260e..cb7f8e3763d9 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.3-r1.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pimcommon/pimcommon-18.12.3-r1.ebuild b/kde-apps/pimcommon/pimcommon-18.12.3-r1.ebuild
index 7f2e1e6f863a..e91dbe9da6df 100644
--- a/kde-apps/pimcommon/pimcommon-18.12.3-r1.ebuild
+++ b/kde-apps/pimcommon/pimcommon-18.12.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="share"
 
 BDEPEND="
diff --git a/sys-fs/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r2.ebuild
index 3ee741ee0951..608abfbe1dbf 100644
--- a/sys-fs/quota/quota-4.04-r2.ebuild
+++ b/sys-fs/quota/quota-4.04-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="