Merge updates from master

50 files changed, 435 insertions, 189 deletions

diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 6612c190c892..47d43eb360fe 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,2 +1 @@
 DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
-DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
diff --git a/app-admin/pwman3/metadata.xml b/app-admin/pwman3/metadata.xml
index 9bb7c2866116..9b3b7313abcd 100644
--- a/app-admin/pwman3/metadata.xml
+++ b/app-admin/pwman3/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Oz Tiram</name>
-	<email>oz.tiram@gmail.com</email>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<use>
-	<flag name="mongodb">Add support for MongoDB</flag>
-</use>
-<longdescription lang="en">
+	<maintainer type="person">
+		<name>Oz Tiram</name>
+		<email>oz.tiram@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
 	A lightweight command line password manager, which can use different
 	databases to store your passwords (currently, SQLite, MySQL, Postgresql
 	and MongoDB are supported). Pwman3 can also copy passwords to the
@@ -20,8 +17,8 @@
 	Pwman3 can also generate passwords using different algorithms.
 	Per default pwman3 uses a strong AES encryption algorithm to store the
 	data.
-</longdescription>
-<upstream>
-	<remote-id type="github">pwman3/pwman3</remote-id>
-</upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pwman3/pwman3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
index bbacc08b8c4c..d86b04e68b18 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
@@ -1,39 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite?"
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils
 
 DESCRIPTION="A lightweight password-manager with multiple database backends"
 HOMEPAGE="https://pwman3.github.io/pwman3/"
 SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="mongodb mysql postgres +sqlite test"
 RESTRICT="!test? ( test )"
 
-COMMON="
+RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
-	"
-
-DEPEND="
-	${COMMON}
-	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
-	"
+"
+BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
 
-RDEPEND="
-	${COMMON}
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/pymysql[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-	"
+distutils_enable_tests setup.py
 
-python_test() {
-	esetup.py test
+pkg_postinst() {
+	optfeature "Support for mongodb" dev-python/pymongo
+	optfeature "Support for postgresql" dev-python/psycopg
+	optfeature "Support for mysql" dev-python/pymysql
 }
diff --git a/app-admin/pwman3/pwman3-0.10.0.ebuild b/app-admin/pwman3/pwman3-0.10.0.ebuild
deleted file mode 100644
index f10173d499f0..000000000000
--- a/app-admin/pwman3/pwman3-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite?"
-inherit distutils-r1
-
-DESCRIPTION="A lightweight password-manager with multiple database backends"
-HOMEPAGE="https://pwman3.github.io/pwman3/"
-SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="mongodb mysql postgres +sqlite test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
-	"
-
-DEPEND="
-	${CDEPEND}
-	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
-	"
-
-RDEPEND="
-	${CDEPEND}
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/pymysql[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-	"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-cdr/xfburn/xfburn-0.6.2.ebuild b/app-cdr/xfburn/xfburn-0.6.2.ebuild
index 2c2ec427c64d..d81b8d65fea4 100644
--- a/app-cdr/xfburn/xfburn-0.6.2.ebuild
+++ b/app-cdr/xfburn/xfburn-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 arm ~ppc x86"
 IUSE="gstreamer +udev"
 
 RDEPEND=">=dev-libs/glib-2.32:=
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index 90e8eb2288f3..ac1aaac38ef7 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1 +1 @@
-DIST virtio-win-0.1.160.iso 322842624 BLAKE2B baa1475055c2df609931e48cc4a18a2e24fcbf07ec9df80a94b1bdb77ca76c1278c5269a95422ea5c2363df424a30b8395b539689982d609096823ebc880afaf SHA512 71c9de9086fa5b5d764d210b5f7d0238c8b294aaf17704eabe16fe65c5649944126924870f0e2eb05d030c2f521770cb5760f4016d29319f5f1bd5deb7955e50
+DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a
diff --git a/app-emulation/virtio-win/metadata.xml b/app-emulation/virtio-win/metadata.xml
index 4ded5b79f93d..d155fdbc0406 100644
--- a/app-emulation/virtio-win/metadata.xml
+++ b/app-emulation/virtio-win/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">crobinso/virtio-win-pkg-scripts</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtio-win/virtio-win-0.1.160.ebuild b/app-emulation/virtio-win/virtio-win-0.1.160.ebuild
deleted file mode 100644
index d241154f4ed5..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.160.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
-SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-1/${PN}-${PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild b/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
new file mode 100644
index 000000000000..8f43008b5179
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_cut 1-3)
+MY_DW=$(ver_rs 3 -)
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
+SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
+}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
index c6bd15ddbe1e..5914671097eb 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-portage/portpeek/portpeek-2.1.27-r1.ebuild b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
index b1d71ca0c29f..77591f2240e8 100644
--- a/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ppc sparc x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
new file mode 100644
index 000000000000..c272c9c89ab2
--- /dev/null
+++ b/app-shells/fzf/Manifest
@@ -0,0 +1,45 @@
+DIST fzf-0.21.0.tar.gz 161819 BLAKE2B 2da6b62425e88c10fa8d3ce3b7d2d25c67a9bd99bf3c402a8e0c84e567f931393fb914e365d0840d4a21409b06b6c76b7f622b68fe99fa5edd9fba8817eefea7 SHA512 8c3b7eb14ac98b386c26bd6621c54a27e904985f2e87c37ae8f31c3596196f32a817be17aa5e7dd399757cb90b5f25c35ce4a240453eb28f7d1d2fd837d8900d
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.zip 19769 BLAKE2B 0e0f4d4ad5d19d5a0c7ffec0007cb04d9703c8d27f90db5f5c5a367477bdff68feb50278ce3d9f01be1b6e44f579c15e9f65a88b0e9bfb83b4ad4beac6a62ca3 SHA512 e34dcc87f0141e505d455ef9ccb83c11fb0d4625bdef6f30ed3ed21957dc4356cbcd370b005c2c9aac25763e36b367866690682c0bb4ae4cab24b799e70f2b99
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.zip 8150 BLAKE2B 50fbd50001b69238741ba79fc1021387ebdfcfe54fb4853c0e3c2c551d5e427b4311d9fa2062860fb26e42573367442ae58446cb8823f3fabca8228d9df47288 SHA512 896aed87f7b0c4c30c2e8e37e3cd290cd6bc1a427a4ea03c7189bb59cae8a4447754b20e51e6bb9002245365cc5c03ae019e7090d8e08a028c40ee080e997c6d
+DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.0.0-20191201085201-324a081bae7e.mod 164 BLAKE2B c6b2db494ca0da1bb96078d7fd39d30237562fe19609be4436df562afed900c63fc3cee28198a27327fd0f64f1e2bab529ac38ca57d51df48ba1ed6e5d0369a1 SHA512 22f6ea96071109063fd7bceb7295a56bc4da40d603cee238bd969b95dc74b4c6a93a3a88b8474a83dc9082ddc4fb0607e987e79ab7c1f3839578bc6c998936d6
+DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.0.0-20191201085201-324a081bae7e.zip 18356 BLAKE2B 9bb0230c260701c5294153c7a0b98e1886e12110289395e6e7a9bb613682e0036bc5e2156372b9b1e5cdc34b8e5cb50e1526e7e6350e5b7d3bdc17428bd70d46 SHA512 17969e66c37a990b2c761dfd8b93a3fa51d12be201e4576e35d805e5aa7c0d75a9f8bfb826f55d6ce5fae18c7d2bf11a7952f6d9940326003db5fde4954a905a
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip 1859245 BLAKE2B e33051036e462284bf672b92f35863014e4740917c856eaf5aeaea6530dc5ff77fcbac4d797aeb8131cd013bac525e502e582f7139ccea4d3c226fdcff83ba0b SHA512 7c0734618d52ac2f0e2fe9245fc15208d13f05e6ab3e89b4a76bbb94e2895376f3d5a7d71d36a020c8861a0ed94a344a534f4d3b6bd9003d153e4e4b80abaf05
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550 BLAKE2B e0bcc6235d88e1728797c178d10261e851b18814ecad679674349596f5fc0aa2784b0b4fee440488ffe8188b47dbf8474e5a5078b1220188ac6c25b0c371068d SHA512 98442115bb11ccc8061eb7c39e2e7efcc809d45ed6051456d6ec5439e20823b4b4d2ce16f4ba02530b58f74e9c1b9f3bf0d3dd0b4327b1b8158f395022ab2d80
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip 1916427 BLAKE2B e6030582f47eb0fc2049d9fbf73b03afae4d95a506988d9538d1f094a27ae63c20d5a5ce79d63f09cdd8c0bdf80e80c6de498960c0173e170dd31c8060f89f30 SHA512 62ce13928c6379717545387d68beba5106ef3b745ae7b458ea457889e5c6d186bf96dbbcf8cf4e81f9e6180260b8c60ca34a4bc58c434d7e9150d51fc72540b5
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 2877934 BLAKE2B 193ec7c3e8b82001b06f630dbda8afb9383ac66d7a23fdfe27414f91a2f2e17490b98605023a8a990f5f9fc5f10144fd01b1854fdb1a39d608cd305b0243dceb SHA512 553de87d4a0fdf45e1ce5128ee704ef92c23d0dce1182671c80e324c0f0ef680732bd82b02d8d202d2c1ae7d4d1bb61a944b60d92d0f99f716a5dcc09ea4701d
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
diff --git a/app-shells/fzf/files/fzf-0.21.0-makefile.patch b/app-shells/fzf/files/fzf-0.21.0-makefile.patch
new file mode 100644
index 000000000000..24653a7b8219
--- /dev/null
+++ b/app-shells/fzf/files/fzf-0.21.0-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 037b19b..60283d0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ ROOT_DIR       := $(shell dirname $(MAKEFILE))
+ SOURCES        := $(wildcard *.go src/*.go src/*/*.go) $(MAKEFILE)
+ 
+ REVISION       := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES))
+-BUILD_FLAGS    := -a -ldflags "-X main.revision=$(REVISION) -w -extldflags=$(LDFLAGS)" -tags "$(TAGS)"
++BUILD_FLAGS    := -a -ldflags "-X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)"
+ 
+ BINARY32       := fzf-$(GOOS)_386
+ BINARY64       := fzf-$(GOOS)_amd64
diff --git a/app-shells/fzf/fzf-0.21.0.ebuild b/app-shells/fzf/fzf-0.21.0.ebuild
new file mode 100644
index 000000000000..854e90d08e55
--- /dev/null
+++ b/app-shells/fzf/fzf-0.21.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils go-module
+
+DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+EGO_SUM=(
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM="
+	"github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko="
+	"github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg="
+	"github.com/gdamore/tcell v1.3.0 h1:r35w0JBADPZCVQijYebl6YMWWtHRqVEGt7kL2eBADRM="
+	"github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM="
+	"github.com/lucasb-eyer/go-colorful v1.0.2 h1:mCMFu6PgSozg9tDNMMK3g18oJBX7oYGrC09mS6CXfO4="
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s="
+	"github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac="
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0="
+	"github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY="
+	"github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
+	"github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y="
+	"github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU="
+	"github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0="
+	"github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI="
+	"github.com/mattn/go-shellwords v1.0.9 h1:eaB5JspOwiKKcHdqcjbfe5lA9cNn/4NRRtddXJCimqk="
+	"github.com/mattn/go-shellwords v1.0.9/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y="
+	"github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e h1:NO86zOn5ScSKW8wRbMaSIcjDZUFpWdCQQnexRqZ9h9A="
+	"github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e/go.mod h1:G0Z6yVPru183i2MuRJx1DcR4dgIZtLcTdaaE/pC1BJU="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M="
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U="
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI="
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10="
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0="
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
+	"golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg="
+	"golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
+	"golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
+	"golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
+	"golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e h1:1o2bDs9pCd2xFhdwqJTrCIswAeEsn4h/PCNelWpfcsI="
+	"golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
+)
+go-module_set_globals
+
+EGO_PN="github.com/junegunn/${PN}"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	# Temporary fix for upstream building issue: https://github.com/junegunn/fzf/issues/1994
+	eapply "${FILESDIR}"/${P}-makefile.patch
+	eapply_user
+}
+
+src_install() {
+	default
+	# Install fzf binary
+	dobin bin/*
+
+	# Install TMUX utils
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	# Install Neovim plugin
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	# Install VIM plugin
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	# Install zsh completion file and key-bindings
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	# Install bash completion file
+	newbashcomp shell/completion.bash ${PN}
+
+	# Install key-bindings for Fish, Zsh and Bash
+	insinto /usr/share/fzf/
+	newins shell/key-bindings.fish ${PN}.fish
+	newins shell/key-bindings.zsh ${PN}.zsh
+	newins shell/key-bindings.bash ${PN}.sh
+}
+
+pkg_postinst() {
+	optfeature "bash-completion support" app-shells/bash-completion
+	optfeature "fish-completion support" app-shells/fish
+	optfeature "fzf plugin for vim" app-editors/vim
+	optfeature "neovim support" app-editors/neovim
+	optfeature "tmux support" app-misc/tmux
+	optfeature "zsh-completion support" app-shells/zsh
+	einfo ""
+	einfo "To use the fzf key-binding for your shell, make sure to use"
+	einfo "the right file for your shell from /usr/share/fzf/"
+	einfo "For bash, add the following line to ~/.bashrc"
+	einfo "# source /usr/share/fzf/fzf.sh"
+	einfo ""
+	einfo "Or symlink the fzf bash script"
+	einfo "# ln -s /usr/share/fzf/fzf.sh /etc/bash/bashrc.d/fzf.sh"
+}
diff --git a/app-shells/fzf/metadata.xml b/app-shells/fzf/metadata.xml
new file mode 100644
index 000000000000..aedb67ebbf2d
--- /dev/null
+++ b/app-shells/fzf/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafspiny@gmail.com</email>
+		<name>Raffaele Spinelli</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		fzf is a general-purpose command-line fuzzy finder. It's an interactive Unix filter for command-line
+		that can be used with any list; files, command history, processes, hostnames, bookmarks, git commits, etc.
+		Fuzzy completion for files and directories can be triggered if the word before the cursor ends with the
+		trigger sequence which is by default **.
+		To use the fzf key-binding for your shell, make sure to source the right file for your shell
+		from /usr/share/fzf/
+
+		For bash, add the following line to ~/.bashrc
+		# source /usr/share/fzf/fzf.sh
+
+		Or symlink the fzf bash script
+		# ln -s /usr/share/fzf/fzf.sh /etc/bash/bashrc.d/fzf.sh
+
+		For fish, make sure to symlink the file
+		# ln -s /usr/share/fzf/fzf.fish /usr/share/fish/functions/fzf.fish
+
+		For zsh, make sure to symlink the file
+		# ln -s /usr/share/fzf/fzf.fish /usr/share/zsh/site-contrib/fzf.fish
+
+		Or add the following line to your ~/.zshrc
+		# source /usr/share/fzf/fzf.zsh
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">junegunn/fzf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-db/sadisplay/Manifest b/dev-db/sadisplay/Manifest
index 9c5c9390de75..eac76e7c8d52 100644
--- a/dev-db/sadisplay/Manifest
+++ b/dev-db/sadisplay/Manifest
@@ -1 +1 @@
-DIST sadisplay-0.4.8.tar.gz 9063 BLAKE2B a6b965d6703102000510ae6100a6bb4d0ad5b42543408aea520476128897bf8f38fda276ea39ac066e9b6621ecf2634d20e82ca21543b8c0bb472ac5d804b2a1 SHA512 c3707f90a20028fdb164caa3037f4ffff3da3f4bc763c400f8204dae4d7d71862e65902892d8ad0fe3bbe636cf87e4f96a475e01e8ce0ac55bed4e17073e3308
+DIST sadisplay-0.4.9.tar.gz 9536 BLAKE2B 0265eb470ab600b761cf6d0e1872c3225e863de8aa602fbcdb1839c33ced8825318d4e4f8ee24de420847c077d1830af069af37ea8d3e3e6c76f47dc2335e1b3 SHA512 30fe8dd2a6247328bc4d7640e5a34b15a062322729cb8a2ffb66c740145475a95ac924f752017fda8f347268ce598957cfe78e8fd6f80413267c72b143b3e8b8
diff --git a/dev-db/sadisplay/sadisplay-0.4.8.ebuild b/dev-db/sadisplay/sadisplay-0.4.8.ebuild
deleted file mode 100644
index 19ebf572af20..000000000000
--- a/dev-db/sadisplay/sadisplay-0.4.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="SqlAlchemy schema display script"
-HOMEPAGE="https://bitbucket.org/estin/sadisplay/wiki/Home"
-COMMIT_ID="d67d12894ebd"
-SRC_URI="https://bitbucket.org/estin/sadisplay/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )
-	"
-S="${WORKDIR}/estin-${PN}-${COMMIT_ID}"
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-db/sadisplay/sadisplay-0.4.9.ebuild b/dev-db/sadisplay/sadisplay-0.4.9.ebuild
new file mode 100644
index 000000000000..648efe4ed064
--- /dev/null
+++ b/dev-db/sadisplay/sadisplay-0.4.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="SqlAlchemy schema display script"
+HOMEPAGE="https://bitbucket.org/estin/sadisplay/wiki/Home"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild
index 647023740d07..0bd7295e539b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
index 2fb70f36de13..4d0bf5c4de6e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-lang/python/python-3.8.2-r1.ebuild b/dev-lang/python/python-3.8.2-r1.ebuild
index d178dfda4b85..b229eb6a9a88 100644
--- a/dev-lang/python/python-3.8.2-r1.ebuild
+++ b/dev-lang/python/python-3.8.2-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
index 997ed7605226..d5fdf7db6f08 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
 
 LICENSE="NPL-1.1"
 SLOT="60"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="debug +jit minimal +system-icu test"
 
 RESTRICT="!test? ( test ) ia64? ( test )"
diff --git a/dev-libs/libical/libical-3.0.8.ebuild b/dev-libs/libical/libical-3.0.8.ebuild
index 661f5b79510c..600bb9f4c53f 100644
--- a/dev-libs/libical/libical-3.0.8.ebuild
+++ b/dev-libs/libical/libical-3.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
index feba68d45a7f..a9b61adfcaff 100644
--- a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/ntl/ntl-11.4.3.ebuild b/dev-libs/ntl/ntl-11.4.3.ebuild
index ff46212b8526..b19d42f860c2 100644
--- a/dev-libs/ntl/ntl-11.4.3.ebuild
+++ b/dev-libs/ntl/ntl-11.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/43"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
diff --git a/dev-libs/openssl/openssl-1.1.1g.ebuild b/dev-libs/openssl/openssl-1.1.1g.ebuild
index 49c888837e2f..203ff855746d 100644
--- a/dev-libs/openssl/openssl-1.1.1g.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1g.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
new file mode 100644
index 000000000000..7b0a76718152
--- /dev/null
+++ b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=1.14
+inherit perl-module
+
+DESCRIPTION="A Module::Build subclass for building Alien:: modules and their libraries"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Alien-Build for Alien::Base::PkgConfig
+RDEPEND="
+	>=dev-perl/Alien-Build-1.200.0
+	dev-perl/Archive-Extract
+	>=virtual/perl-Archive-Tar-1.400.0
+	>=dev-perl/Capture-Tiny-0.170.0
+	>=dev-perl/File-chdir-0.100.500
+	>=virtual/perl-HTTP-Tiny-0.44.0
+	>=dev-perl/Module-Build-0.400.400
+	>=dev-perl/Path-Tiny-0.77.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	dev-perl/Shell-Config-Generate
+	dev-perl/Shell-Guess
+	dev-perl/Sort-Versions
+	>=virtual/perl-Text-ParseWords-3.260.0
+	dev-perl/URI
+	virtual/perl-parent
+	dev-perl/HTML-Parser
+	virtual/perl-JSON-PP
+"
+DEPEND="
+	dev-perl/Module-Build
+"
+# Test2-Suite for Test2::Require::Module and Test2::V0
+BDEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-perl/Test2-Suite-0.0.60
+	)
+"
diff --git a/dev-perl/Alien-Base-ModuleBuild/Manifest b/dev-perl/Alien-Base-ModuleBuild/Manifest
index edd6623f8180..1107d1a1bf4c 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Manifest
+++ b/dev-perl/Alien-Base-ModuleBuild/Manifest
@@ -1 +1,2 @@
 DIST Alien-Base-ModuleBuild-1.06.tar.gz 64694 BLAKE2B 1c73045def6b1e0c936e25db07a087040c1b67b93182429963bd0d2918ad150b04b746d9bd5019ca4b3faf01efd06f945d2859c644e0a4d8d5ff8ef0ec66c01c SHA512 f9388fc7834e303a82b8ad408a6de7b04ce74a26674111c53103e17600e7b3f231885fa3557ad55677afc54f282d080d33542ae7659fc9e0a88c342c3c11652f
+DIST Alien-Base-ModuleBuild-1.14.tar.gz 62072 BLAKE2B 64a94621b36b13ad32861c228e787ca44ae8fbec5f1a2fcd65ade8188c44021dbca45fc7f62aa390d10920f670779511ceb96f214b41c4cce2a6424a0f72b47e SHA512 6fcfb7e5525972d5ca565441717143b036ed9c4079700426df2e96d76a91baeaf103ac406a8fa86dfd820929041525d7bb66c32762258cfb7752fb7634171fbf
diff --git a/dev-perl/Alien-Base-ModuleBuild/metadata.xml b/dev-perl/Alien-Base-ModuleBuild/metadata.xml
index 90abeff271a0..e1a03e037f7a 100644
--- a/dev-perl/Alien-Base-ModuleBuild/metadata.xml
+++ b/dev-perl/Alien-Base-ModuleBuild/metadata.xml
@@ -12,5 +12,12 @@
   <upstream>
     <remote-id type="cpan">Alien-Base-ModuleBuild</remote-id>
     <remote-id type="cpan-module">Alien::Base::ModuleBuild</remote-id>
+    <remote-id type="cpan-module">Alien::Base::ModuleBuild::Cabinet</remote-id>
+    <remote-id type="cpan-module">Alien::Base::ModuleBuild::File</remote-id>
+    <remote-id type="cpan-module">Alien::Base::ModuleBuild::Repository</remote-id>
+    <remote-id type="cpan-module">Alien::Base::ModuleBuild::Repository::FTP</remote-id>
+    <remote-id type="cpan-module">Alien::Base::ModuleBuild::Repository::HTTP</remote-id>
+    <remote-id type="cpan-module">Alien::Base::ModuleBuild::Repository::Local</remote-id>
+    <remote-id type="cpan-module">Alien::Base::ModuleBuild::Utils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Alien-Build/Alien-Build-2.210.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.210.0.ebuild
new file mode 100644
index 000000000000..552c3ef6fdb8
--- /dev/null
+++ b/dev-perl/Alien-Build/Alien-Build-2.210.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=2.21
+DIST_EXAMPLES=("example/*")
+inherit perl-module
+
+DESCRIPTION="Build external dependencies for use in CPAN"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test zip"
+RESTRICT="!test? ( test )"
+
+# No, pkgconfig is not suspect, it actually uses it at runtime, and this module
+# is somewhat a wrapper for pkgconfig :/
+RDEPEND="
+	zip? ( dev-perl/Archive-Zip )
+	virtual/perl-Archive-Tar
+	>=dev-perl/Capture-Tiny-0.170.0
+	virtual/perl-ExtUtils-CBuilder
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	>=virtual/perl-ExtUtils-ParseXS-3.300.0
+	>=dev-perl/FFI-CheckLib-0.110.0
+	>=dev-perl/File-Which-1.100.0
+	dev-perl/File-chdir
+	virtual/perl-JSON-PP
+	>=dev-perl/Path-Tiny-0.77.0
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	>=virtual/perl-Test-Simple-1.302.96
+	>=virtual/perl-Text-ParseWords-3.260.0
+	virtual/pkgconfig
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-perl/Devel-Hide
+		>=dev-perl/Test2-Suite-0.0.60
+	)
+"
diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index 7b5f73157edd..08a9f2993315 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -1 +1,2 @@
 DIST Alien-Build-1.79.tar.gz 266020 BLAKE2B 265a42ea001b2adad24c3f8164bf795da9923f02e95440ae1bc52aa60a1dd06e48d888b4af5deb3f9b9911e9092117f51bc09c420d690cabc454b21505746030 SHA512 8b270ec1b914aead651c81d2c513496e31bfa6086c0e5731e6ada17079ede868d65a7c70e29a0762f65ba8c120fd605662122de7f9d715b726be4a503b552808
+DIST Alien-Build-2.21.tar.gz 304297 BLAKE2B 28ac1f0da64d26456606fa95c4a3d48f393f9ab8cdfafd3785a62d9a450c6a1f2deeb7421ebbc4289a63a6718c05fccd6b0db1ca47c7641c6778886e82cf1b39 SHA512 f78ffbb8d7198707c7bebbf281daa53fb701dd5b35417939020c95c20e2805333998ed2011c8c6049a09516bbe4d228facd827fcbbad660474c0195b99905108
diff --git a/dev-perl/Alien-Build/metadata.xml b/dev-perl/Alien-Build/metadata.xml
index 42afeb71792e..32e3d63a9d7e 100644
--- a/dev-perl/Alien-Build/metadata.xml
+++ b/dev-perl/Alien-Build/metadata.xml
@@ -12,14 +12,19 @@
     <remote-id type="cpan-module">Alien::Base::Wrapper</remote-id>
     <remote-id type="cpan-module">Alien::Build</remote-id>
     <remote-id type="cpan-module">Alien::Build::CommandSequence</remote-id>
+    <remote-id type="cpan-module">Alien::Build::Helper</remote-id>
     <remote-id type="cpan-module">Alien::Build::Interpolate</remote-id>
     <remote-id type="cpan-module">Alien::Build::Interpolate::Default</remote-id>
     <remote-id type="cpan-module">Alien::Build::Interpolate::Helper</remote-id>
+    <remote-id type="cpan-module">Alien::Build::Log</remote-id>
+    <remote-id type="cpan-module">Alien::Build::Log::Abbreviate</remote-id>
+    <remote-id type="cpan-module">Alien::Build::Log::Default</remote-id>
     <remote-id type="cpan-module">Alien::Build::MM</remote-id>
     <remote-id type="cpan-module">Alien::Build::Meta</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Build::Autoconf</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Build::CMake</remote-id>
+    <remote-id type="cpan-module">Alien::Build::Plugin::Build::Copy</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Build::MSYS</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Build::Make</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Build::SearchDep</remote-id>
@@ -59,8 +64,10 @@
     <remote-id type="cpan-module">Alien::Build::Plugin::Prefer::SortVersions</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Probe::CBuilder</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Probe::CommandLine</remote-id>
+    <remote-id type="cpan-module">Alien::Build::Plugin::Probe::Vcpkg</remote-id>
     <remote-id type="cpan-module">Alien::Build::Plugin::Test::Mock</remote-id>
     <remote-id type="cpan-module">Alien::Build::PluginMeta</remote-id>
+    <remote-id type="cpan-module">Alien::Build::Temp</remote-id>
     <remote-id type="cpan-module">Alien::Build::TempDir</remote-id>
     <remote-id type="cpan-module">Alien::Build::Util</remote-id>
     <remote-id type="cpan-module">Alien::Build::Version::Basic</remote-id>
@@ -70,6 +77,7 @@
     <remote-id type="cpan-module">Test::Alien::Build</remote-id>
     <remote-id type="cpan-module">Test::Alien::CanCompile</remote-id>
     <remote-id type="cpan-module">Test::Alien::CanPlatypus</remote-id>
+    <remote-id type="cpan-module">Test::Alien::Diag</remote-id>
     <remote-id type="cpan-module">Test::Alien::Run</remote-id>
     <remote-id type="cpan-module">Test::Alien::Synthetic</remote-id>
     <remote-id type="cpan-module">alienfile</remote-id>
diff --git a/dev-vcs/git/git-2.23.3.ebuild b/dev-vcs/git/git-2.23.3.ebuild
index 4b34a50f554b..a34dbe298d99 100644
--- a/dev-vcs/git/git-2.23.3.ebuild
+++ b/dev-vcs/git/git-2.23.3.ebuild
@@ -46,7 +46,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 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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.24.3.ebuild b/dev-vcs/git/git-2.24.3.ebuild
index a81e3a3bcefe..b4cba1683a7a 100644
--- a/dev-vcs/git/git-2.24.3.ebuild
+++ b/dev-vcs/git/git-2.24.3.ebuild
@@ -46,7 +46,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 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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.25.4.ebuild b/dev-vcs/git/git-2.25.4.ebuild
index a81e3a3bcefe..b4cba1683a7a 100644
--- a/dev-vcs/git/git-2.25.4.ebuild
+++ b/dev-vcs/git/git-2.25.4.ebuild
@@ -46,7 +46,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 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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.26.2.ebuild b/dev-vcs/git/git-2.26.2.ebuild
index a81e3a3bcefe..b4cba1683a7a 100644
--- a/dev-vcs/git/git-2.26.2.ebuild
+++ b/dev-vcs/git/git-2.26.2.ebuild
@@ -46,7 +46,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 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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/mail-client/alpine/alpine-2.22.ebuild b/mail-client/alpine/alpine-2.22.ebuild
index 154a0afb7650..66f123bdd622 100644
--- a/mail-client/alpine/alpine-2.22.ebuild
+++ b/mail-client/alpine/alpine-2.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND=">=sys-libs/ncurses-5.1:0=
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 84eb6ab00544..a13f819f5f27 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,2 +1,2 @@
-DIST img2pdf-0.3.1.tar.gz 67954 BLAKE2B d0d6a9927e9b3e7087e562a108157677a46a17a896beddcc424dd2c234fd7c4f1376b824dbf814b42d9a314a8495b149bc9df65ab2864405b9dde0054e7bafdf SHA512 25f788f78e93ed336ed8e31e88350d89263b82477c8d9c36103dfa522a5e661922fc09b59e1d5104161fe1be15114f843172555efa942722d8b093900d38bae1
 DIST img2pdf-0.3.3.tar.gz 80523 BLAKE2B 39e372f1ab82d9f521cf2c512b173680afe6463dd041283b336af49c41b12d12261fe5947ad9f03d489b7898d3c8d161faedb2b3366cb75bd1bc0666f905f60c SHA512 234e0031d75727d2f5d2b82603bb447d9101ace81e604b6d5eb358d0b4681e209dbd737775b90b44096cf84239aac9e87e2369e0c6112a17f24ccbf10a20cdd5
+DIST img2pdf-0.3.4.tar.gz 83729 BLAKE2B c595ca7eebfcb91cfe076822836ce07ec0036a510645aae54e495798765df91cddf5de292245c623b2e23918d7862271cdca5d7b8dd76573dc40d8ba7807865a SHA512 0e81e3ee06c62f0ee732b87776f6bc2d066ebce6c23dbcb85b2497518ba43fa3813b3e15f0c476c1203ae6d2b1f4f3e2f1b70215033dddb889fafd75b3671420
diff --git a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild b/media-gfx/img2pdf/img2pdf-0.3.4.ebuild
index 364ece521a93..d6e18fd6a2fa 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.4.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -14,13 +15,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pdfrw[${PYTHON_USEDEP}] )"
+BDEPEND="test? (
+		dev-python/pdfrw[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,zlib]
+	)"
 RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/media-gfx/img2pdf/metadata.xml b/media-gfx/img2pdf/metadata.xml
index e2dc940bfb61..ca964c7924b5 100644
--- a/media-gfx/img2pdf/metadata.xml
+++ b/media-gfx/img2pdf/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 	Losslessly convert raster images to PDF. The file size will not
 	unnecessarily increase. It can for example be used to create a PDF
diff --git a/media-libs/virglrenderer/virglrenderer-0.8.2.ebuild b/media-libs/virglrenderer/virglrenderer-0.8.2.ebuild
index d65f9a5cec75..d095ab97034b 100644
--- a/media-libs/virglrenderer/virglrenderer-0.8.2.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.8.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/virgl/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
diff --git a/media-plugins/live/live-2020.03.06.ebuild b/media-plugins/live/live-2020.03.06.ebuild
index e0234e8bdca6..c1ab7d6f306a 100644
--- a/media-plugins/live/live-2020.03.06.ebuild
+++ b/media-plugins/live/live-2020.03.06.ebuild
@@ -8,7 +8,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"
 
 DEPEND="
diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
index a113998fd1cf..4f79b9951215 100644
--- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
diff --git a/net-p2p/syncthing/syncthing-1.3.4-r1.ebuild b/net-p2p/syncthing/syncthing-1.3.4-r1.ebuild
index 8027187afc57..b318a0d7bbb3 100644
--- a/net-p2p/syncthing/syncthing-1.3.4-r1.ebuild
+++ b/net-p2p/syncthing/syncthing-1.3.4-r1.ebuild
@@ -279,7 +279,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc64 x86"
+KEYWORDS="amd64 arm ppc64 x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
index 12f746378588..ad70e9cb1f9a 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/88"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
diff --git a/sys-power/intel-undervolt/files/confd b/sys-power/intel-undervolt/files/confd
deleted file mode 100644
index 0911f6a58995..000000000000
--- a/sys-power/intel-undervolt/files/confd
+++ /dev/null
@@ -1 +0,0 @@
-# /etc/conf.d/intel-undervolt: config file for /etc/init.d/intel-undervolt
diff --git a/sys-power/intel-undervolt/files/initd b/sys-power/intel-undervolt/files/initd
deleted file mode 100644
index 0a43656ea79f..000000000000
--- a/sys-power/intel-undervolt/files/initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after thermald
-}
-
-command="/usr/bin/intel-undervolt"
-command_args="daemon"
-command_background="true"
-pidfile="/run/${RC_SVCNAME}.pid"
-required_files="/etc/intel-undervolt.conf"
-
-start_pre() {
-	if service_started thermald; then
-		eerror "thermald conflits with ${RC_SVCNAME}, exiting"
-	fi
-
-	ebegin "${RC_SVCNAME} -> apply initial voltage"
-		"${command}" apply
-	eend $?
-}
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
index 9c07a9421472..6c1e6cc23f97 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild
index 56b7fc0a5c17..f6cfb28f8a8e 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="qrcode"
 
 RDEPEND=">=dev-libs/glib-2.32:2=
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild
index 13f01123a3a1..d7dfec5646af 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="kernel_linux networkmanager +panel-plugin policykit"
 
 COMMON_DEPEND=">=dev-libs/glib-2.42