Merge updates from master

37 files changed, 71 insertions, 88 deletions

diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
index 34e74b4e4cdd..287529f92f3a 100644
--- a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+++ b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils readme.gentoo-r1 systemd
 
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
index c05b47ef15e6..012faf0a92fb 100644
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
index 8d1ac2a54db1..043e7e6232d7 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 384742d7c7f7..f40bbfb62d2f 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild
index 52ab90d95289..c2f5f37a528c 100644
--- a/app-arch/rpm/rpm-4.14.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
index e611ac291b4c..f0a7f10fd44c 100644
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index 6275cdc3a4ce..f7082d549fe6 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild b/app-editors/pluma/pluma-1.24.0.ebuild
index b4b41684ccc9..ae1a569e5bee 100644
--- a/app-editors/pluma/pluma-1.24.0.ebuild
+++ b/app-editors/pluma/pluma-1.24.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MATE_LA_PUNT="yes"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit mate python-single-r1 virtualx
 
diff --git a/app-emulation/virtualbox/virtualbox-5.2.40.ebuild b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
index 32fb07ec21ef..306436546bc2 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
 
 MY_PV="${PV/beta/BETA}"
diff --git a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
index 73d398156286..f16c7450b105 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
 
 MY_PV="${PV/beta/BETA}"
diff --git a/app-forensics/afflib/afflib-3.7.18.ebuild b/app-forensics/afflib/afflib-3.7.18.ebuild
index c604c4223373..fefac350f3bc 100644
--- a/app-forensics/afflib/afflib-3.7.18.ebuild
+++ b/app-forensics/afflib/afflib-3.7.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-single-r1
 
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 313a6e04ac42..25f4cbcc3d49 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
 
diff --git a/app-misc/byobu/byobu-5.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
index 2719fbfec1c4..9529149bb4e5 100644
--- a/app-misc/byobu/byobu-5.129.ebuild
+++ b/app-misc/byobu/byobu-5.129.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1
 
diff --git a/app-misc/evemu/evemu-2.7.0.ebuild b/app-misc/evemu/evemu-2.7.0.ebuild
index 68ce761f6232..64f996d75f11 100644
--- a/app-misc/evemu/evemu-2.7.0.ebuild
+++ b/app-misc/evemu/evemu-2.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit ltprune python-single-r1
 
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
index 2c8b4c6db6a6..bdc28fb3778b 100644
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Resolve GCC flag -march=native"
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
index 2c8b4c6db6a6..bdc28fb3778b 100644
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Resolve GCC flag -march=native"
diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
index 562153663745..c32b7c75024f 100644
--- a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
index 5a53b2fe11d2..933874ddec7a 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1
@@ -16,14 +16,10 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+blake2 bzip2 +gpg lzma sha3 tools"
+IUSE="+gpg tools"
 
 RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
+	gpg? ( app-crypt/gnupg )"
 
 distutils_enable_tests setup.py
 
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index a52943c5d571..9dbc15846eda 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit distutils-r1 git-r3
@@ -17,15 +17,10 @@ EGIT_REPO_URI="https://github.com/mgorny/gemato.git"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-RESTRICT="!test? ( test )"
+IUSE="+gpg tools"
 
 RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy) )"
+	gpg? ( app-crypt/gnupg )"
 
 distutils_enable_tests setup.py
 
diff --git a/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
index 6533a387cb42..23aaa1f5ca30 100644
--- a/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
+++ b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-r1
 
diff --git a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
index 4e06bb3c0bb5..ef106fe6ef4d 100644
--- a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
+++ b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit vim-plugin python-r1
 
diff --git a/app-vim/pydoc/pydoc-2.0-r1.ebuild b/app-vim/pydoc/pydoc-2.0-r1.ebuild
index c77c33197839..db83486ae1ac 100644
--- a/app-vim/pydoc/pydoc-2.0-r1.ebuild
+++ b/app-vim/pydoc/pydoc-2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
index 517d6a36c565..4bea6a6dc884 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vimpython/vimpython-1.13-r2.ebuild b/app-vim/vimpython/vimpython-1.13-r2.ebuild
index 0102860bdeda..2976870dc7b2 100644
--- a/app-vim/vimpython/vimpython-1.13-r2.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vimpython/vimpython-1.13-r3.ebuild b/app-vim/vimpython/vimpython-1.13-r3.ebuild
index 9f704f796ebc..d7f3f5dee1b5 100644
--- a/app-vim/vimpython/vimpython-1.13-r3.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit vim-plugin python-single-r1
 
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index 3ab85dc3dcf8..7a21cde057ad 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
index 3dcdc2d8ae46..f1231d0905e5 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 multilib prefix
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
index d9cb43c17f6d..e43396d777cf 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
deleted file mode 100644
index 3cec1c0230b0..000000000000
--- a/dev-python/cryptography-vectors/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cryptography_vectors-2.6.1.tar.gz 35097785 BLAKE2B cf5784e97d288b464d79d0aa13bcd19fed3e1c585c1589b52092d654a9988dd52e64c317c50774d4dc54f535d37296df8e5da070fbaa5f38d4eef3cade671a87 SHA512 44d318d5f983955f42791cf182dd80070a87c3c05f7353e204a520588243041fec97367c6fb6d9febcdab0ce7bcf1d135a8e6b44a7387b599752b7c87fc81d9a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
deleted file mode 100644
index 6fefe5c34efb..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/metadata.xml b/dev-python/cryptography-vectors/metadata.xml
deleted file mode 100644
index 95a300692f26..000000000000
--- a/dev-python/cryptography-vectors/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">cryptography-vectors</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild
index 38e55dcac3e8..308686b6fb8f 100644
--- a/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild
@@ -107,7 +107,7 @@ else
 		https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( ${EGO_SUM_SRC_URI} )
 	"
-	KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~amd64-linux ~x86-linux"
 fi
 
 HOMEPAGE="https://git-lfs.github.com/"
diff --git a/profiles/package.mask b/profiles/package.mask
index de5ebf89d0a1..69f4024cf912 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -700,13 +700,6 @@ dev-tcltk/tcl-mccp
 # Masked for testing
 >=dev-libs/libressl-3.1.0
 
-# Michał Górny <mgorny@gentoo.org> (2020-04-04)
-# Package that used to provide test data for dev-python/cryptography.
-# The modern versions fetch it via SRC_URI and the last version
-# needing split vectors has been removed.
-# Removal in 30 days.  Bug #716204.
-dev-python/cryptography-vectors
-
 # Mikle Kolyada <zlogene@gentoo.org> (2020-04-04)
 # py27-only vim plugins. Masked for removal in 30 days.
 app-vim/automatictexplugin
diff --git a/sys-libs/libapparmor/libapparmor-2.13.4.ebuild b/sys-libs/libapparmor/libapparmor-2.13.4.ebuild
index 0ccd35241d42..eff2e356a719 100644
--- a/sys-libs/libapparmor/libapparmor-2.13.4.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.13.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
index ac0c6c8fc956..49c2f106174a 100644
--- a/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 MY_USE="perl python ruby"
 MY_USE_PHP="php7-2 php7-3 php7-4"
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 47e184a4530e..f6e9dfcbe101 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,3 +1,4 @@
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
 DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
 DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951
+DIST xvkbd-4.1.tar.gz 408704 BLAKE2B 45667706005f508e22dcd6d24631b5488ffd32b0bba2cb14e67ce1f77c5fdf3f667ca1431a0833e311bbffbc5baf08daed8ff736158c72178ae5d079f694d9d7 SHA512 6a27a659bacc0f78d70c0afab7ae0f6301f0e7f0c9ed12c581fb4fd5040791536aed50c82ccbd703377244156aade80136567276193f2789a23f05c341b6c0e9
diff --git a/x11-misc/xvkbd/xvkbd-4.1.ebuild b/x11-misc/xvkbd/xvkbd-4.1.ebuild
new file mode 100644
index 000000000000..a4291a7738c9
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_install() {
+	dodir /usr/share/X11/app-defaults
+
+	default
+
+	dodoc ChangeLog README
+	newman ${PN}.man ${PN}.1
+}