Merge updates from master

60 files changed, 50 insertions, 49 deletions

diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index 0013ae876aea..d7a76689d03d 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="|| ( CDDL LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE=""
 
 BDEPEND="dev-lang/perl
diff --git a/dev-libs/elfutils/elfutils-0.181.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
index 80b9641cdabb..f726b77dd7f0 100644
--- a/dev-libs/elfutils/elfutils-0.181.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
index 6f45b8bc56cb..0f38ad093d89 100644
--- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="python static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libxls/libxls-1.6.1.ebuild b/dev-libs/libxls/libxls-1.6.1.ebuild
index 62b7241386cd..632b5ee3a3ec 100644
--- a/dev-libs/libxls/libxls-1.6.1.ebuild
+++ b/dev-libs/libxls/libxls-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index d110e4d7d91a..d7fb132613a9 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -23,6 +23,7 @@ BDEPEND="
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pylama[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
 	)
 "
 
diff --git a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
index 677afeb84b7f..8161a58ca9ee 100644
--- a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
+++ b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jinglemansweep/${PN}/archive/${EGIT_COMMIT}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="app-misc/lcdproc"
 
diff --git a/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
index b5e77f3dc0be..dcfc3fc0b03b 100644
--- a/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
+++ b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rbarrois/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-python/python-mpd"
 
diff --git a/dev-python/pgspecial/pgspecial-1.11.9.ebuild b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
index 4f2e362cbe18..0a13bd8ec7af 100644
--- a/dev-python/pgspecial/pgspecial-1.11.9.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
index 4d3183b1591b..edac4c6caf91 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
index 5a706a8fdf00..1f25224ecd8e 100644
--- a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
+++ b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
index cb0c73adee24..18951d2f5133 100644
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/testfixtures/testfixtures-6.14.2.ebuild b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
index e5277b293383..1c445c878270 100644
--- a/dev-python/testfixtures/testfixtures-6.14.2.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/ujson-3.2.0.ebuild b/dev-python/ujson/ujson-3.2.0.ebuild
index 580474477867..c1da7da79460 100644
--- a/dev-python/ujson/ujson-3.2.0.ebuild
+++ b/dev-python/ujson/ujson-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ros/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
index 4a8b2afeaf1d..8e1e1146e32f 100644
--- a/dev-ros/console_bridge_vendor/Manifest
+++ b/dev-ros/console_bridge_vendor/Manifest
@@ -1 +1 @@
-DIST console_bridge_vendor-1.2.1.tar.gz 7403 BLAKE2B d18f2ccb352c04b1c84a2c8ed5bb4fb790cddd3adf9667a6e9e99cdfb7da3f24931c653ffd0c8175131799d08086d110ad9ad33660ffc307a3a21a7dbf54ebef SHA512 12b611ff578b4a9e20fc894789985056b1b396f7085d4d6f0848fbe1a926ddc47ee6cc2c65bf3289041573b48bad75e2ce5a6d1b3f94aa8049429faece44d6a2
+DIST console_bridge_vendor-1.2.2.tar.gz 7570 BLAKE2B 2b690d20851cf38554fcfa8645eb0c8bd7b226dcdf1e43ac379f5164d1aa8133bd4e75654b3354153985015d46a7cb2b71195cf123a982eadd1a91bbf6172624 SHA512 e44090cec050af7681892bfc4cb71d7f127b467845a1ec0d103678322c9482ce6ede0b5e914fd472380381906e350b3f64ead4d67e4c514a3c7c7e4d6fc24c22
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
index 1e45c2388a63..1e45c2388a63 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
diff --git a/dev-ros/filters/Manifest b/dev-ros/filters/Manifest
index 862155312fe4..80cfa9540608 100644
--- a/dev-ros/filters/Manifest
+++ b/dev-ros/filters/Manifest
@@ -1 +1 @@
-DIST filters-1.9.0.tar.gz 18865 BLAKE2B 0ef5508cbd32d2af42c38655aef0075b0d16339c4264bac6b3356b96a08b1344a4002c60c9c57af61846615ed28bfbfcd8cff74677e0f70e78778b3cc643c7bc SHA512 df1823a2a2a3e49bdc6c22c7bacfe696bed4eb9fa1f1339854e47e6b2757c8d7a8256c3bbf83154d22f47ae6d79af4a2fc4b878b83ad6eb9445072481326b3d3
+DIST filters-1.9.1.tar.gz 19633 BLAKE2B 1ce27734145e04546d90cd802721aa5b8003b366227161e64451d7ac656628d0178b3ea5cab5f9ca5b054bc81ff5cefd00beaeea855c5c6507ecabc40bc27985 SHA512 ed66211b6e66d7c303a72bce4b9b06abd29d9101ae46b9bd4cb5dee26867d7d7e8b9bfcc6feffc83ac15a4780e62577665e9ce9881f836931f361258a12cf127
diff --git a/dev-ros/filters/filters-1.9.0.ebuild b/dev-ros/filters/filters-1.9.1.ebuild
index 5fdc9dc5d689..5fdc9dc5d689 100644
--- a/dev-ros/filters/filters-1.9.0.ebuild
+++ b/dev-ros/filters/filters-1.9.1.ebuild
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index 5fe9a51b138d..ef9f3f5f91eb 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1 +1 @@
-DIST geometric_shapes-0.7.0.tar.gz 84518 BLAKE2B 948f84959c526f6155bc9769a264cc631e04171ee22bedb435667668c621c3ca2d983d7b2b964690735b3b48b8ed71058c32aefc67d6370da3cc0528ed448f3e SHA512 9f5886841dfc23db40e68d69a386879ec0b93c03faea6f2e6e33d92b303c314fbba6cfdf548e6236424d5d0131209824e0a8bc116bd64015688c2fd477eb44f0
+DIST geometric_shapes-0.7.2.tar.gz 84443 BLAKE2B bcfcfeb08cbd60c889a2a801855eddd85a3ac42752991c0721ea0aee19a5650493e390d80a8ed99610a40efb5ca1fe0c1a49329471368b335483f8ceb193ca8a SHA512 5c1a05c0166c32c0d5ac9d22dd6feb784845342d7cde8d642731a08aafa54ed0b1545864f42b7de7641031bf7f0e353a632404799051770d55c7855b57d78027
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
index 6fed36fb4824..6fed36fb4824 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
diff --git a/dev-ros/object_recognition_msgs/Manifest b/dev-ros/object_recognition_msgs/Manifest
index c2522ddb1023..c75baaced7db 100644
--- a/dev-ros/object_recognition_msgs/Manifest
+++ b/dev-ros/object_recognition_msgs/Manifest
@@ -1 +1 @@
-DIST object_recognition_msgs-0.4.1.tar.gz 4756 BLAKE2B 9d6c919b82d4e9300eebc9ba36498414f62a9a6392649adb7db011e315eb64d2810b1c8eab6f647a58d8ab60dfa1dfae77d98164b9f97d9f4a9c47716a0d3cc4 SHA512 4e2d48795b0376640dbb6eb82ca3d0cdf5e2d4a2e7ec8d723ce7613c678fc2dc037fceafe8b37a905d9bb2f0a283e84e4adbf986dd6e5322ae96d43de120a3cf
+DIST object_recognition_msgs-0.4.2.tar.gz 4810 BLAKE2B 004087f2f7982b2cffca52023061a5f05830fb2e10e4d62683ca171f3c36926c912d9c6e07ab5ae2a694a07fe2a3d8dac040d8f0c3abb9640e8c07462084c416 SHA512 20a2e1d05f5610c0102340a6f6fe725d47134bf6a69e018a607dde68a2d980455fc0b7d848202259801cfd7d9671a80a3f4f1bd3f571df73240e4885f5eb9d34
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
index 9af6f1bdaa76..9af6f1bdaa76 100644
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
+++ b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
diff --git a/dev-ros/rqt_bag/Manifest b/dev-ros/rqt_bag/Manifest
index 5b1c5033321f..d6594ebc8291 100644
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@@ -1 +1 @@
-DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
+DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
index 51bedaaa5154..51bedaaa5154 100644
--- a/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild
+++ b/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
diff --git a/dev-ros/rqt_bag_plugins/Manifest b/dev-ros/rqt_bag_plugins/Manifest
index 5b1c5033321f..d6594ebc8291 100644
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@@ -1 +1 @@
-DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
+DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
index f0c32428d755..f0c32428d755 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
diff --git a/dev-ros/rqt_image_view/Manifest b/dev-ros/rqt_image_view/Manifest
index d46f10052856..72769075fafa 100644
--- a/dev-ros/rqt_image_view/Manifest
+++ b/dev-ros/rqt_image_view/Manifest
@@ -1 +1 @@
-DIST rqt_image_view-0.4.15.tar.gz 14817 BLAKE2B 00c196bac88eb18f039e88e34d9a943a8e5b052f038682297ecf4c1a31bbb3f25b28a252a6034b774186518a33684f82d94fe89ec2cf6a9449aa961dd2b60435 SHA512 347abc44f930ca2a2d72ed9b8a3c825caf23e0643c80a394c8f74b4452d9549bab8ecc91cf5231d8d51b4be345f3c44783a266cd22c0b1197d3376698b849989
+DIST rqt_image_view-0.4.16.tar.gz 14850 BLAKE2B 9e5c9017166db13f3c2c28d851b932a9854718170da51c840a52c17031bd7604eeb4097d2d60d5504d8d0430efc908a0629bb6d9c986884c6bb63449225b6e44 SHA512 62ee991bd613577f0676d55305c6c95f4687aee7990feebc1178dcaa40e85c61e7a76c11b9393e83aaddba4347a16016a126edffb4511c3d38902136eac62752
diff --git a/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild b/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
index 6ed30f7ba659..6ed30f7ba659 100644
--- a/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild
+++ b/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
diff --git a/dev-ros/rqt_robot_monitor/Manifest b/dev-ros/rqt_robot_monitor/Manifest
index ab5b4862611d..57e98594241f 100644
--- a/dev-ros/rqt_robot_monitor/Manifest
+++ b/dev-ros/rqt_robot_monitor/Manifest
@@ -1 +1 @@
-DIST rqt_robot_monitor-0.5.12.tar.gz 14917 BLAKE2B 8864165fc491bad7a77e12a769d63e5b404d02cd96ef4dfa33c87ed9e2417ba4bd9a0dfc0cf53507c32e5216e16c8b9f89ee4bb5e762fa4049d846f98d0872c4 SHA512 f354e30a85d6bf8e3f15bbd7b97051b02a3348b37a559a53c8942f5939525e046295f5c6e03902850b137dc705bfad94b5e2fd0554ecfe32e24296c2656ee1b5
+DIST rqt_robot_monitor-0.5.13.tar.gz 15140 BLAKE2B 6c59e7a65cc709d48148df1f757261e5fe70872106b6fe2fc5b1d809340a62321c9d56bf245b5d9fedc87113fd18b5e0ce279245794b2a678f405ea409d72531 SHA512 68b9c57130fed3c4e16a437038c5498ec069440c5064470cc442c051387988f1075dec5dd65191d332c68554d76d2be091d90f5cbc9e2218e849a42ace069045
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
index a0787380331e..a0787380331e 100644
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild
+++ b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
diff --git a/dev-ros/rqt_tf_tree/Manifest b/dev-ros/rqt_tf_tree/Manifest
index 714233023adc..81a0131f8bc2 100644
--- a/dev-ros/rqt_tf_tree/Manifest
+++ b/dev-ros/rqt_tf_tree/Manifest
@@ -1 +1 @@
-DIST rqt_tf_tree-0.6.1.tar.gz 8469 BLAKE2B 0ff1291f982ba0338b75997df868f623682007cbff29b90465aef550463ab8082ca1c068fe4cbca3cfa4a5b46c132cfef089af948300a7e8f1f919933cc1ade6 SHA512 22441bd7313c250f786060d09eb170a42b85ec5414b24be2db1ecdb6d1336acef6a879513793f6a60ddd875ca7fbd1c6b0ac2bde759968440c6c638c62c6c89b
+DIST rqt_tf_tree-0.6.2.tar.gz 8513 BLAKE2B 31207aaa5152c82fd0f728f12348110c7b161b2b36b74330876ccfd8044c98d177341d1ab08860275c6db2f1a043f934b9c2354efa431ea46697fa6af8f29d4e SHA512 1aa03dd674dbb0122c24dcac363850d08b04f2b1aebbfa0c1d3baa3c4b1c9e802a45dabb638d149c03386415601c4751e67b0edae00a577792a37867fb76b69b
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
index 29eb0bd0e67a..29eb0bd0e67a 100644
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild
+++ b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest
index 3a9b6a734ea6..296808c1e794 100644
--- a/dev-ros/urg_node/Manifest
+++ b/dev-ros/urg_node/Manifest
@@ -1 +1 @@
-DIST urg_node-0.1.13.tar.gz 20949 BLAKE2B e85653ec46dd85aa62e4e5f06c4d4c775a2d616f0b4daa80584bf81010ad06acbec7f73e0b4a238618c36ec83d07e4dd513fafa9b29e197ad21b56ec02fe4452 SHA512 be503538a293fa0cdf6e7902c0faa5c866a2298193f4ad6cce705dab90220955d4cb21087d84d10ff7d2daf29f362391f17a038496f3036934c57e12f3270a30
+DIST urg_node-0.1.14.tar.gz 20987 BLAKE2B ee358a238f0886c3eeee213467c44d3e721f4e6fb6c9d887393bdd3eab16d36eb07a62f705256d2a81314afaf29119608a874e26b19afa190a3033e84d3a987d SHA512 2614d614ee88cc5c9087f0ddff5cb991f6707452b42bc00f1c7b0bcbbc6a8fd1915b94fd041526e93ac8b0a481d1b45eeddea32d71a1034362b37e1f458217fb
diff --git a/dev-ros/urg_node/urg_node-0.1.13.ebuild b/dev-ros/urg_node/urg_node-0.1.14.ebuild
index cd680c30f62e..cd680c30f62e 100644
--- a/dev-ros/urg_node/urg_node-0.1.13.ebuild
+++ b/dev-ros/urg_node/urg_node-0.1.14.ebuild
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 87b6a6cf4910..2a4408a351b7 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1 +1 @@
-DIST xacro-1.14.1.tar.gz 80879 BLAKE2B 6ce62c42e194d41bc2c0af322497f2ade2d4ac9e788cd15f3b7b6c976abae575b3bbb1224085d4e2d68cd10d3fbb665b9b333f91a38bdefe4a22f71d9270f005 SHA512 fb2272a4c4da47dcee26860ec94a5b4921401c6a4f0544181c7a9ae188c0cf6bb8ee2c0c0eb6e7fabd3f323c10d391dbafcc2b118384a32ecd18da6c8075ae10
+DIST xacro-1.14.4.tar.gz 80200 BLAKE2B 4e61ff4c55a9ce5687815d7650d392ef239a3d872e6dac36d717d429a9c7d0c62dd7f589d362a3059f4e712147c5ae1828f5cf63810a7ec92d6898fce85bbed2 SHA512 7a97353a3ab5126146eb73e428c50aa74765b46058c59143e6d91f984040d6abbf58813e528d93bfe69e5c3a7b3698430e68f3800f117ee836115f7b3c465a05
diff --git a/dev-ros/xacro/xacro-1.14.1.ebuild b/dev-ros/xacro/xacro-1.14.4.ebuild
index 8383de0334c5..8383de0334c5 100644
--- a/dev-ros/xacro/xacro-1.14.1.ebuild
+++ b/dev-ros/xacro/xacro-1.14.4.ebuild
diff --git a/dev-util/rbtools/rbtools-1.0.3.ebuild b/dev-util/rbtools/rbtools-1.0.3.ebuild
index 4ef4c539a64b..84f79e4541d8 100644
--- a/dev-util/rbtools/rbtools-1.0.3.ebuild
+++ b/dev-util/rbtools/rbtools-1.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
index 7b3bf740d42b..4ebfdd79108d 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/mail-filter/milter-regex/milter-regex-2.7.ebuild b/mail-filter/milter-regex/milter-regex-2.7.ebuild
index b8a5df416985..03a754b72b50 100644
--- a/mail-filter/milter-regex/milter-regex-2.7.ebuild
+++ b/mail-filter/milter-regex/milter-regex-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
 SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="acct-user/milter-regex
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
index 55f079f74824..6bbf5eded0bc 100644
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 87c54a14bfc1..fd275844e2f1 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"
 
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index 64d6a490a586..f284b8597bd5 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/liblscp/liblscp-0.6.2.ebuild b/media-libs/liblscp/liblscp-0.6.2.ebuild
index 30ab5c789415..42b207f10318 100644
--- a/media-libs/liblscp/liblscp-0.6.2.ebuild
+++ b/media-libs/liblscp/liblscp-0.6.2.ebuild
@@ -10,7 +10,7 @@ https://download.linuxsampler.org/packages/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libmpdclient/libmpdclient-2.19.ebuild b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
index cb44ec2a3919..b8ac71b8c473 100644
--- a/media-libs/libmpdclient/libmpdclient-2.19.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpgf/libpgf-7.19.3.ebuild b/media-libs/libpgf/libpgf-7.19.3.ebuild
index 494a98b72c9f..1b9f473c7402 100644
--- a/media-libs/libpgf/libpgf-7.19.3.ebuild
+++ b/media-libs/libpgf/libpgf-7.19.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}-latest/li
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 
 BDEPEND="
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
index 81ad80dcdc9b..676e63ad46d8 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libtimidity/libtimidity-0.2.6.ebuild b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
index 1df379021615..14fc66562e1a 100644
--- a/media-libs/libtimidity/libtimidity-0.2.6.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="ao debug"
 
 RESTRICT="test"
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
index 49ca6245f945..6931138ac693 100644
--- a/media-plugins/live/live-2020.05.15.ebuild
+++ b/media-plugins/live/live-2020.05.15.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl ssl"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/qsynth/qsynth-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild
index 3978c5523060..2e469dea3b30 100644
--- a/media-sound/qsynth/qsynth-0.6.3.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/quimup/quimup-1.4.4.ebuild b/media-sound/quimup/quimup-1.4.4.ebuild
index 83803313c370..074276e6cf8e 100644
--- a/media-sound/quimup/quimup-1.4.4.ebuild
+++ b/media-sound/quimup/quimup-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN^}_${PV}_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/yoshimi/yoshimi-1.7.2.ebuild b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
index 04681dc2a67a..0d9ef3eefcc6 100644
--- a/media-sound/yoshimi/yoshimi-1.7.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/net-misc/httpie/httpie-2.2.0.ebuild b/net-misc/httpie/httpie-2.2.0.ebuild
index e3773e796fbe..3cbeefe8e2b1 100644
--- a/net-misc/httpie/httpie-2.2.0.ebuild
+++ b/net-misc/httpie/httpie-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-news/quiterss/quiterss-0.19.4.ebuild b/net-news/quiterss/quiterss-0.19.4.ebuild
index 2563e58e165a..54ecba18be8e 100644
--- a/net-news/quiterss/quiterss-0.19.4.ebuild
+++ b/net-news/quiterss/quiterss-0.19.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
index e71b20d39d6f..815680f34379 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.10.9.ebuild
index 14cb6a77eff3..65bdc947394e 100644
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-libs/libint/libint-2.6.0.ebuild b/sci-libs/libint/libint-2.6.0.ebuild
index a81caff037d7..774bdc758b4a 100644
--- a/sci-libs/libint/libint-2.6.0.ebuild
+++ b/sci-libs/libint/libint-2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
index d19788a0a630..7d84a5c58773 100644
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
index 3d73d2db78ad..c224d7fb69e3 100644
--- a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxhw/hw-probe/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild b/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
index 265725ac2bef..4c10dbcce096 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 2366fe02e7d1..60818cfbafa8 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -42,7 +42,7 @@ else
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
 		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
-	KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
diff --git a/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
index ac0c6c8fc956..49c2f106174a 100644
--- a/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 MY_USE="perl python ruby"
 MY_USE_PHP="php7-2 php7-3 php7-4"
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"