summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild2
-rw-r--r--dev-erlang/epam/Manifest4
-rw-r--r--dev-erlang/epam/epam-1.0.2.ebuild33
-rw-r--r--dev-erlang/epam/epam-1.0.6.ebuild33
-rw-r--r--dev-erlang/epam/epam-1.0.9.ebuild (renamed from dev-erlang/epam/epam-1.0.7.ebuild)0
-rw-r--r--dev-erlang/ezlib/Manifest3
-rw-r--r--dev-erlang/ezlib/ezlib-1.0.2.ebuild21
-rw-r--r--dev-erlang/ezlib/ezlib-1.0.8.ebuild (renamed from dev-erlang/ezlib/ezlib-1.0.6.ebuild)2
-rw-r--r--dev-erlang/mqtree/Manifest3
-rw-r--r--dev-erlang/mqtree/mqtree-1.0.10.ebuild (renamed from dev-erlang/mqtree/mqtree-1.0.5.ebuild)6
-rw-r--r--dev-erlang/mqtree/mqtree-1.0.4.ebuild21
-rw-r--r--dev-erlang/p1_acme/Manifest1
-rw-r--r--dev-erlang/p1_acme/p1_acme-1.0.8.ebuild31
-rw-r--r--dev-erlang/p1_mysql/Manifest3
-rw-r--r--dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild20
-rw-r--r--dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild20
-rw-r--r--dev-erlang/pkix/Manifest3
-rw-r--r--dev-erlang/pkix/pkix-1.0.4.ebuild20
-rw-r--r--dev-erlang/pkix/pkix-1.0.6.ebuild (renamed from dev-erlang/pkix/pkix-1.0.3.ebuild)7
-rw-r--r--dev-erlang/stringprep/Manifest1
-rw-r--r--dev-erlang/stringprep/stringprep-1.0.22.ebuild (renamed from dev-erlang/p1_mysql/p1_mysql-1.0.14.ebuild)9
-rw-r--r--dev-erlang/xmpp/Manifest1
-rw-r--r--dev-erlang/xmpp/xmpp-1.4.9.ebuild30
-rw-r--r--dev-libs/elfutils/elfutils-0.181.ebuild2
-rw-r--r--dev-libs/libdnet/libdnet-1.14-r1.ebuild2
-rw-r--r--dev-libs/libxls/libxls-1.6.1.ebuild2
-rw-r--r--dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild2
-rw-r--r--dev-python/mpdlcd/mpdlcd-0.5.2.ebuild2
-rw-r--r--dev-python/pgspecial/pgspecial-1.11.9.ebuild2
-rw-r--r--dev-python/ujson/ujson-3.2.0.ebuild2
-rw-r--r--dev-util/rbtools/rbtools-1.0.3.ebuild2
-rw-r--r--kde-misc/kdiff3/kdiff3-1.8.4.ebuild2
-rw-r--r--mail-filter/milter-regex/milter-regex-2.7.ebuild2
-rw-r--r--media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild2
-rw-r--r--media-libs/libaom/libaom-2.0.0.ebuild2
-rw-r--r--media-libs/libpgf/libpgf-7.19.3.ebuild2
-rw-r--r--media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild2
-rw-r--r--net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild2
-rw-r--r--net-irc/znc-palaver/znc-palaver-1.2.1.ebuild2
-rw-r--r--net-misc/electrum/electrum-4.0.2.ebuild2
-rw-r--r--net-misc/httpie/httpie-2.2.0.ebuild2
-rw-r--r--net-news/quiterss/quiterss-0.19.4.ebuild2
-rw-r--r--sys-apps/dtc/dtc-1.6.0.ebuild2
-rw-r--r--sys-apps/hw-probe/hw-probe-1.5-r1.ebuild2
-rw-r--r--sys-devel/gcc-config/gcc-config-2.3.2.ebuild2
-rw-r--r--sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild2
46 files changed, 103 insertions, 217 deletions
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index d7a76689d03d..d5ea9fe82f68 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-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index 6c8ff9be278e..e5e3b0447ac5 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -1,4 +1,2 @@
-DIST epam-1.0.2.tar.gz 43720 BLAKE2B 39a1056d068bdceb7ff640a498b0766aa59649228b03e03f9385bfc106f45aa210315162d4386907a1e9cbc8f177289adebf72f527a4eaf270cd62413f1daa13 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030
-DIST epam-1.0.6.tar.gz 47494 BLAKE2B 8120e4f10222468ee2adf2f0ec9cffcaaea8c1fc92faf9889de0f970562631cb54cd9ba34d01994dcf657108c4232158d5617e4b9c884bc84e5eb383028b8e3f SHA512 2c316a46ac734be2c74a86e767b413fa8ff1b296622b85de4828fdd60c84e5b3962f8b76004fcb39ab43a345ec967e3f3db4ac6d0e7335dc982dbcf1edf02c4b
-DIST epam-1.0.7.tar.gz 47506 BLAKE2B 8ac8026623a653c4d0f897fb08044003c2426ca1309b1e57cbdb6f6ece4662fd15143293e1dae1f806cbc3d6cf028712701e2587750de15f44304ed7e28c17bd SHA512 ddfcb6a0ef955e6ef0fba2c98e25fbc8532c829b80c4150d0545bb9b5114773184af0adba49921cf6e2363a0224dedccd7bf81b5da292dda74f8966a8e73e1b2
DIST epam-1.0.8.tar.gz 47334 BLAKE2B be914b0a5e4657e3ddb3e9bcb607448b14451e112c0b929159a962ca8bdc778e6d7d358fb4053b500e71fddc2fbd16ce6d5b543a5f592c9037d71b4ec09aacc7 SHA512 b09624b7d1650ae741bcfcdddceacf5bfd29bb3e00a4044498d6eaec328f8762423f71025fb89a8242c76934c56b8d60f1910fc390766382468f3d844723bef2
+DIST epam-1.0.9.tar.gz 47548 BLAKE2B b0a8c6e07d788160e153c75e6d8c6535f68279f1f404b25c0fe5ad1559251059a6efd38a9a30c5b180513f69fb22674ba772c29fa598bed5ddc6dcacd9f0f419 SHA512 f537dbfdba09b3f65775e2235e90e2e91951908d95cd10df05581c740d7254cce53a3a2f4131df75f5c6400b3b2cdf6b37651a554076e9cfa66fb3c627d8562c
diff --git a/dev-erlang/epam/epam-1.0.2.ebuild b/dev-erlang/epam/epam-1.0.2.ebuild
deleted file mode 100644
index f718c6eefb54..000000000000
--- a/dev-erlang/epam/epam-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar user
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
- sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-pkg_setup() {
- enewgroup "${PN}"
-}
-
-src_install() {
- rebar_src_install
-
- local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
- fowners root:"${PN}" "${epam_path}"
- fperms 4750 "${epam_path}"
-}
diff --git a/dev-erlang/epam/epam-1.0.6.ebuild b/dev-erlang/epam/epam-1.0.6.ebuild
deleted file mode 100644
index 529ffdd2798f..000000000000
--- a/dev-erlang/epam/epam-1.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar user
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
- sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-pkg_setup() {
- enewgroup "${PN}"
-}
-
-src_install() {
- rebar_src_install
-
- local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
- fowners root:"${PN}" "${epam_path}"
- fperms 4750 "${epam_path}"
-}
diff --git a/dev-erlang/epam/epam-1.0.7.ebuild b/dev-erlang/epam/epam-1.0.9.ebuild
index bc3c599bafe4..bc3c599bafe4 100644
--- a/dev-erlang/epam/epam-1.0.7.ebuild
+++ b/dev-erlang/epam/epam-1.0.9.ebuild
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index 74bf3d5705d4..9e291ec9e744 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,3 +1,2 @@
-DIST ezlib-1.0.2.tar.gz 45369 BLAKE2B d2d23cf9fcd530a76ed4a386df15401cd9598e158f20cba3eff19332e25532fdaba8cae93e576f5756559e74f169f6a01f9d09c41e844d3af4a9d9d3cac15185 SHA512 90671fdf0bbc23a7f54da665dfb31a3ed2d92180ff5c58d872001481584e6c8b39cd84b3dc947f1efdae10792c2547218017381cbc7056070d22b140e941c9bb
-DIST ezlib-1.0.6.tar.gz 49136 BLAKE2B 596e3580a20d7b8174ded16656fd5f15b8558ffe16a1278e76a25dcff935c258b2df37fb5be0c4e78de566823c41c58941fffa95cdae8b02a21bf6ea5d6f5417 SHA512 6f2a459f773eeba9a7d1316a5c38c686b54c5c68bb3d90e38ac4698fb1140c2d1b961e981af5013711fbfd854f3b3f206a828b6eda9071fd437ccdf4871d8e39
DIST ezlib-1.0.7.tar.gz 49143 BLAKE2B 51a1bd0972024dd6dc905266c375d7097fd3f9e45d00ca23d16f11d335b3511b29202db2c6a64e4d0727bd0c447205be857bc9291ea5e771e0fe081829bfc25b SHA512 25fdc429c8d1216756b9c048058c711176a3292670dcd9ee156038362b49b7d5f4be325a3f67da5f24e462f188429d2247e42eca12da806748298a9966494382
+DIST ezlib-1.0.8.tar.gz 49200 BLAKE2B d4147ae45f91619342e82c25efdd29fd25e5528aee52f2a79636c0492cb50a2e49b5c7c6c5737aedba0001df4c0798cf30e8043fa5274b4818c1754f80ae4a20 SHA512 49b2e7d03995d4e43c023b8910e7644f3332e444b194bc7621cc35fd4d41e10692649250875462b1eca9a606312138c6f50812a32c9224f72e70ce4f2a9e6422
diff --git a/dev-erlang/ezlib/ezlib-1.0.2.ebuild b/dev-erlang/ezlib/ezlib-1.0.2.ebuild
deleted file mode 100644
index 8f0b847b543e..000000000000
--- a/dev-erlang/ezlib/ezlib-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Native zlib driver for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/ezlib"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1:=
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/ezlib/ezlib-1.0.6.ebuild b/dev-erlang/ezlib/ezlib-1.0.8.ebuild
index e3d64871c7f0..f9b2e9950f08 100644
--- a/dev-erlang/ezlib/ezlib-1.0.6.ebuild
+++ b/dev-erlang/ezlib/ezlib-1.0.8.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=6
diff --git a/dev-erlang/mqtree/Manifest b/dev-erlang/mqtree/Manifest
index 774af7c0c01c..1fe0bc7440a1 100644
--- a/dev-erlang/mqtree/Manifest
+++ b/dev-erlang/mqtree/Manifest
@@ -1,3 +1,2 @@
-DIST mqtree-1.0.4.tar.gz 227872 BLAKE2B 756542c77cecd3da12917c43c5c1a36f54af0bc18b66d1571d1a7428378fcd3c643168c182c3215ab5f7890b8292ef89248424567f6aa608c074548b055e0774 SHA512 5033c89bfbaba34a357bfd8d7981c75c362f7e9d039ef6035aad66e3562f848ff047fbbd612b51dfde79a0f7233337afb4a47dac5df369fa1c5e14b5d5b1911f
-DIST mqtree-1.0.5.tar.gz 227940 BLAKE2B db8edddfb91b52bced394221ed3c3a91cc552f45165f78f1bc0177e80f54a97d9d8843037e59f8c5fdc70bbf04f7016276c3667da4bc54055e9ca2aa9ecbe9df SHA512 c624ffbd97bd0bb0076ca246ad9bcf0a443ea1334dc3b8f553c5559e6ee07d134ea275c3bd121dfddabed5ff9a90ee8dd21d1283663f8e4252fa4eeb105eba62
+DIST mqtree-1.0.10.tar.gz 228863 BLAKE2B c8a0a611ec125c5e1dbe56677975cdae4da14e2c01ff0a6b6356d85886563c3cc60c7364ad5a3cc584bff9d891a7f4982341a0ce62ae5b9cad4c7bdcc80bbbb2 SHA512 89ab5e9a30028b5539d522d90951a92bbee93e91cac103127323d0d79a11ea13df3210cf61ae6bcb64b4f6d1d557562a03f651754b1f15f8d31f1e8015b31859
DIST mqtree-1.0.7.tar.gz 227967 BLAKE2B 72cad70ab53038eed09ba4444f0c21c9767405aac4b573c60a6ae0ef84737c1da248189e4dc5b08f0f197ca0f6cfd66a51bed1867d6cba591a9aec8ce8298501 SHA512 efca5119bfbdaab5637855ff20016061fadeed6b9ebc6b3db03686b37daba1b36b1ddafe805c953eadc77f8cbde3c6c4943d1aa39ae4c9a96eed3f97f64ca37f
diff --git a/dev-erlang/mqtree/mqtree-1.0.5.ebuild b/dev-erlang/mqtree/mqtree-1.0.10.ebuild
index 3af65b751547..06bfc2fc63d4 100644
--- a/dev-erlang/mqtree/mqtree-1.0.5.ebuild
+++ b/dev-erlang/mqtree/mqtree-1.0.10.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=6
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
DEPEND=">=dev-lang/erlang-17.5
- >=dev-erlang/p1_utils-1.0.16"
+ >=dev-erlang/p1_utils-1.0.20"
RDEPEND="${DEPEND}"
DOCS=( README.md )
diff --git a/dev-erlang/mqtree/mqtree-1.0.4.ebuild b/dev-erlang/mqtree/mqtree-1.0.4.ebuild
deleted file mode 100644
index 3af65b751547..000000000000
--- a/dev-erlang/mqtree/mqtree-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Index tree for MQTT topic filters"
-HOMEPAGE="https://github.com/processone/mqtree"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/erlang-17.5
- >=dev-erlang/p1_utils-1.0.16"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/p1_acme/Manifest b/dev-erlang/p1_acme/Manifest
index 77967a6255c0..34777247480d 100644
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@@ -1 +1,2 @@
DIST p1_acme-1.0.5.tar.gz 220724 BLAKE2B 7f236f9e66dc982342c15c46ebe2a391f72384710b19e1007d1e9ff679a9701190650853b8e67c3a63abba5e6a4107ed921fdc25f5cce984a4333fab98449f37 SHA512 e21907c18311b98cc865cddd155291fae09f739b5429a42810ba93fae77abe3f4e3ecaf9accf0d42d38e21bb823987dea0c3175ea1b7f20b171afa06a932f9e1
+DIST p1_acme-1.0.8.tar.gz 221082 BLAKE2B 1e4b23f638b4f7bb877edf290aa54cdf45733816488ab518acc83bd268c240aa564ba1299674f8f938c059b4f2c0072f95d05b017d79419f3ac55d709eb812fe SHA512 8b2b4c594dc1dcbfcf9bb7a6b98096128791d416092a73109fd74ef7ab715d469c87ac6d66056cc5dcd5692c6e71936dc25afa86445a6ffc8164c5bc4f2b1869
diff --git a/dev-erlang/p1_acme/p1_acme-1.0.8.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.8.ebuild
new file mode 100644
index 000000000000..4351e3e2e95b
--- /dev/null
+++ b/dev-erlang/p1_acme/p1_acme-1.0.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ACME client library for Erlang"
+HOMEPAGE="https://github.com/processone/p1_acme"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/yconf-1.0.7
+ >=dev-erlang/idna-6.0.0
+ >=dev-erlang/jose-1.9.0
+ >=dev-erlang/base64url-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ rebar_src_prepare
+ # otherwise it wants to fetch base64url from git
+ sed -ri 's/\+\+ \[\{base64url.*//' rebar.config.script
+}
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index 4001fe45dfd3..befc1c0beb90 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,4 +1 @@
-DIST p1_mysql-1.0.11.tar.gz 25958 BLAKE2B 6c94287fc584ed530d70e9609cc565c2c66a2b90b8bb47d85e370353e8e56dd9cb8e902406eaf330692f70c264f44977f22534e6805017a12accdcb5828a45e1 SHA512 2929b1e66aa887258b46f7dcda71f935230b9b7ea9fccf0baff2cda0782a5b7da26b9b396ed2bf3b16f07d397c88f5881ea93913a11e262be802654ac46dd9ed
-DIST p1_mysql-1.0.14.tar.gz 26922 BLAKE2B 83b22c454a069fc14f7cfb82a7cb42eb4d43d3f560329159ddf503bbfe19a5f44ee7279489c5c0d028b63285c47d62e1416af24f70ad38927125de466c2b9414 SHA512 ab60ab6b43e3cca9e14e28075f1276cff02dc796a3074662c797ac2e46a38afb2726719de64bfd61e9a27b2d31665f33551d0680e137eb6167b9d32c8721e1e5
DIST p1_mysql-1.0.15.tar.gz 26943 BLAKE2B 191a7dcfae3b5f9e3f7c317aa10ad818147f0fa81b2ab06263ba45eea9c2771133c2c8b43a707d32ea4faf875d711ec63d14882eb58aed7a4715fd27e42fbdf8 SHA512 ef1d94095ef7dbe0e260a85cd0ec9c9449e199456acd991bfa42434126a2d6d731c6068e613de4cd4a9dbc3b3540f14bf85cce127e324475ea8a72f61657acb6
-DIST p1_mysql-1.0.2.tar.gz 19512 BLAKE2B 8cf7cded80d6ca1239019f3d1bbb7d4babbe0336a09b6c8ebb55e116eeb592e35a6f332ee6950c78ac6559a3850bdc1dbfa50ded2d30e008deb8e8d50b5c86d2 SHA512 ac0656b3134cfae47161a4643188784cf71e8ea19bbd5856e58d4f1d508a8771534975a631da51e7574e5adb3f64cdd250ab59ab7e9138fd5cb865e80522bd11
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild
deleted file mode 100644
index 274bc47ea8a6..000000000000
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang MySQL driver"
-HOMEPAGE="https://github.com/processone/p1_mysql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild
deleted file mode 100644
index fde9ce59075d..000000000000
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang MySQL driver"
-HOMEPAGE="https://github.com/processone/p1_mysql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/pkix/Manifest b/dev-erlang/pkix/Manifest
index cd9456dc7396..57354bf005ea 100644
--- a/dev-erlang/pkix/Manifest
+++ b/dev-erlang/pkix/Manifest
@@ -1,3 +1,2 @@
-DIST pkix-1.0.3.tar.gz 391302 BLAKE2B 8ff0403b6beed707afb8cca51c027d140f06273def0cff3588c9ee26673021d1fbb5b7397281c7daa27f076d61a222843251ab626661727f65255012846f9756 SHA512 b45c8fc74a1ef7d61818ba8a72bb141fa28796dadc36829f3456f1a87b5c263a5d708e4512cd91f54efd59dc14a47e31aa67ecb90c378f22fd42e77d6110320f
-DIST pkix-1.0.4.tar.gz 411737 BLAKE2B 5f675adc535a5463d2259c078a5445348bf9901224f78daff5b1b261796888d90f6707a3d6fd199fa611f347a560f8154d8c2122aeeacea6df776e8aec62708a SHA512 2c90bc13dc381f08b250db105eb09729005d1d191a1d6e69e2096f155f40460ebe47cb85a1b157782cb74c5e759b53010bc96fc831a7224f5a3aa30e46775b16
DIST pkix-1.0.5.tar.gz 411755 BLAKE2B bd4b8cd87f1cabff7aa6923007aff9f586bb5e3e322978223a8533087ed2474816b578023a7269f37fb2afabafc4e2ce51606ba420c3b4cfea2e2b4e0f5c0af2 SHA512 b265f4ffb104404d38c9e6c5660e91a720d6b1a85339f82b40fae27727c4edbde585a1427682cf5ca59fe0be775fde26d74cbd4807f45b12b381736d2979595d
+DIST pkix-1.0.6.tar.gz 411903 BLAKE2B d6673421fe8ab96f8521ad6122b3ef5b3fece3b3dfbeafba3a5bb67ff528a158419c132247ac258a8f8adaa9947b132b5589245da0b9a23dbb7f3c91963c1013 SHA512 28bcadf4dfc44f494dedd34b8a37a1e77c76ebb59aaa8113a8886be15f01e6a11bb689278437140513fba9552c507a0b9d7ca7587ec92ccf037641aed55345e8
diff --git a/dev-erlang/pkix/pkix-1.0.4.ebuild b/dev-erlang/pkix/pkix-1.0.4.ebuild
deleted file mode 100644
index 5080a4c93518..000000000000
--- a/dev-erlang/pkix/pkix-1.0.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="PKIX certificates management library for Erlang"
-HOMEPAGE="https://github.com/processone/pkix"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/erlang-17.5"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/pkix/pkix-1.0.3.ebuild b/dev-erlang/pkix/pkix-1.0.6.ebuild
index 5080a4c93518..149b5c02cfe2 100644
--- a/dev-erlang/pkix/pkix-1.0.3.ebuild
+++ b/dev-erlang/pkix/pkix-1.0.6.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=6
@@ -12,9 +12,6 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/erlang-17.5"
-RDEPEND="${DEPEND}"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
DOCS=( README.md )
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 3bf93342aa2d..77ef3e649f4b 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1 +1,2 @@
DIST stringprep-1.0.20.tar.gz 98836 BLAKE2B 8928bbc502f98101d93554430fce240b441ce6eff5c3c8f2f7727d77821ae7f92a63d2a4d9b1883ca8b8e61cdbf07858e1c2d2892cefda15797ae536430fcee5 SHA512 402556387e4467d5770694378c923676fa4a429ee6709c7d6aa94901b1215fc7227dc1ad9d9561ca4d94880175ee64241e6ab1274c2c20212d27fc56faffae8d
+DIST stringprep-1.0.22.tar.gz 98910 BLAKE2B 5885aa58a7201408467afa7ec6c4fda350effaf2c4f0ce3000f036fd67c16e778344e23a71f753abb6337db5e2084b147ef3b24878c1ca2bc0e1e308945a46ba SHA512 3cd687ede237de24476b091d0e871bbb4af42be21cf27ea44936413ba2b643d0c6f92b5c7135b7064b8e111e05f0a0815b0d32e6d33b60e46612bc0f7bfd3b09
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.14.ebuild b/dev-erlang/stringprep/stringprep-1.0.22.ebuild
index ffcadac2a5d6..26bf847cef05 100644
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.14.ebuild
+++ b/dev-erlang/stringprep/stringprep-1.0.22.ebuild
@@ -5,16 +5,17 @@ EAPI=6
inherit rebar
-DESCRIPTION="Pure Erlang MySQL driver"
-HOMEPAGE="https://github.com/processone/p1_mysql"
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
-LICENSE="BSD"
+LICENSE="Apache-2.0 tcltk"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-DEPEND=">=dev-lang/erlang-17.1"
+DEPEND=">=dev-lang/erlang-17.1
+ >=dev-erlang/p1_utils-1.0.20"
RDEPEND="${DEPEND}"
DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index 4d65c276164c..50df0c62f0eb 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -1 +1,2 @@
DIST xmpp-1.4.7.tar.gz 483070 BLAKE2B fae845a165a44c6c43e2f23ebf67a272c9a9b7dabcd221c8be6b83b6f560e7eee896a7906b9d621cba49de1af2163e64cd93d24bfd1341fe1d232c2746f80237 SHA512 37968de29bfeba698424f69a91f11c9adeca3bbac342cb9267ce4012471c10aeb030b691af2c5c01c6eaf9e1f866666982a8660a0e937829f75e0548ae5516cd
+DIST xmpp-1.4.9.tar.gz 483243 BLAKE2B 15cd04d5e99357ab4dac71fe7ee9952059658b56894c205e2d5b6c705b347004e580715c5198fcbc026b34e17033ad08da622eab92c83934de58500a8c64b905 SHA512 9c66ca3099584ea971f863ab24ccdca070bede63bedbf2fc858df762c27c329d07d3d119f7ced8ffcc1c24acf8874a68ee7372f157e81836e46dba27b057b381
diff --git a/dev-erlang/xmpp/xmpp-1.4.9.ebuild b/dev-erlang/xmpp/xmpp-1.4.9.ebuild
new file mode 100644
index 000000000000..de578b6dac81
--- /dev/null
+++ b/dev-erlang/xmpp/xmpp-1.4.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
+HOMEPAGE="https://github.com/processone/xmpp"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-erlang/ezlib-1.0.8
+ >=dev-erlang/fast_tls-1.1.8
+ >=dev-erlang/fast_xml-1.1.43
+ >=dev-erlang/p1_utils-1.0.20
+ >=dev-erlang/stringprep-1.0.22
+ >=dev-erlang/idna-6.0.0"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ rebar_src_prepare
+ rebar_fix_include_path fast_xml
+}
diff --git a/dev-libs/elfutils/elfutils-0.181.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
index f726b77dd7f0..2a16a699b49f 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 0f38ad093d89..aa60351e6e6c 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 632b5ee3a3ec..806445dbf160 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/lcdproc/lcdproc-0.03_p20150508.ebuild b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
index 8161a58ca9ee..3b748ce2122f 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 dcfc3fc0b03b..e3bef8c594d5 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 0a13bd8ec7af..1d69bbdadf42 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/ujson/ujson-3.2.0.ebuild b/dev-python/ujson/ujson-3.2.0.ebuild
index c1da7da79460..dacad4fa08c6 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-util/rbtools/rbtools-1.0.3.ebuild b/dev-util/rbtools/rbtools-1.0.3.ebuild
index 84f79e4541d8..54e4b29bf4d8 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 4ebfdd79108d..17ffac0a4a65 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 03a754b72b50..e2b98ff9e61f 100644
--- a/mail-filter/milter-regex/milter-regex-2.7.ebuild
+++ b/mail-filter/milter-regex/milter-regex-2.7.ebuild
@@ -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/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index d3d7b780a837..35793f715a14 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/libaom/libaom-2.0.0.ebuild b/media-libs/libaom/libaom-2.0.0.ebuild
index baa8a33d2747..a11cb13d5052 100644
--- a/media-libs/libaom/libaom-2.0.0.ebuild
+++ b/media-libs/libaom/libaom-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
else
SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.gz"
S="${WORKDIR}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
fi
DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libpgf/libpgf-7.19.3.ebuild b/media-libs/libpgf/libpgf-7.19.3.ebuild
index 1b9f473c7402..b54109c076ff 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 676e63ad46d8..70b6ee8e597e 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/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
index 58e9d754203b..4c90ad1ec6dd 100644
--- a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
RDEPEND="
>=dev-libs/libdnet-1.14-r1
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index bf8f2d320881..37383594fb1e 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
diff --git a/net-misc/electrum/electrum-4.0.2.ebuild b/net-misc/electrum/electrum-4.0.2.ebuild
index 5f1d63884893..e0a18742e6b5 100644
--- a/net-misc/electrum/electrum-4.0.2.ebuild
+++ b/net-misc/electrum/electrum-4.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli ncurses qrcode +qt5"
REQUIRED_USE="|| ( cli ncurses qt5 )"
diff --git a/net-misc/httpie/httpie-2.2.0.ebuild b/net-misc/httpie/httpie-2.2.0.ebuild
index 3cbeefe8e2b1..bab02d0b537a 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 54ecba18be8e..d77a928c2f35 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/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
index 7d84a5c58773..12c3ff004ae9 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 c224d7fb69e3..5cf31892ccff 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 4c10dbcce096..2c290910c1c9 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 60818cfbafa8..6b7b4fcd3a35 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 )