Merge updates from master

22 files changed, 38 insertions, 47 deletions

diff --git a/app-cdr/xfburn/xfburn-0.6.2.ebuild b/app-cdr/xfburn/xfburn-0.6.2.ebuild
index 228b229e74be..ceaac00017fc 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/dev-lang/erlang/erlang-22.3.ebuild b/dev-lang/erlang/erlang-22.3.ebuild
index 2827b168714b..934e8776a576 100644
--- a/dev-lang/erlang/erlang-22.3.ebuild
+++ b/dev-lang/erlang/erlang-22.3.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/php/php-7.2.30.ebuild b/dev-lang/php/php-7.2.30.ebuild
index 41e7df5a0235..5866fee21159 100644
--- a/dev-lang/php/php-7.2.30.ebuild
+++ b/dev-lang/php/php-7.2.30.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.3.17.ebuild b/dev-lang/php/php-7.3.17.ebuild
index fa44d6f4f167..f6ab6f7f6442 100644
--- a/dev-lang/php/php-7.3.17.ebuild
+++ b/dev-lang/php/php-7.3.17.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.5.ebuild b/dev-lang/php/php-7.4.5.ebuild
index 200f73ea3f3e..5bf64f2a6ee5 100644
--- a/dev-lang/php/php-7.4.5.ebuild
+++ b/dev-lang/php/php-7.4.5.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.34.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index 002b6f9a9779..29e214924336 100644
--- a/dev-libs/libpcre2/libpcre2-10.34.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-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"
+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"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
index aaee55cbd0d0..8ee0b1ba39dc 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stevedore/stevedore-1.31.0.ebuild b/dev-python/stevedore/stevedore-1.31.0.ebuild
index 0b42640fbdbb..3f880aad6762 100644
--- a/dev-python/stevedore/stevedore-1.31.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.31.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 hppa ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index ddbb585d593c..af9cbce8cf5f 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 hppa ~ppc ~ppc64 ~sparc x86"
 
 distutils_enable_tests unittest
diff --git a/media-video/celluloid/celluloid-0.18.ebuild b/media-video/celluloid/celluloid-0.18.ebuild
index 503980f3f28b..8bd5b3cba7a5 100644
--- a/media-video/celluloid/celluloid-0.18.ebuild
+++ b/media-video/celluloid/celluloid-0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/celluloid-player/celluloid/releases/download/v${PV}/
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-libs/glib-2.44
 	>=x11-libs/gtk+-3.22.23:3
diff --git a/net-im/poezio/poezio-0.12.ebuild b/net-im/poezio/poezio-0.12.ebuild
index d41241885592..435612e4aec7 100644
--- a/net-im/poezio/poezio-0.12.ebuild
+++ b/net-im/poezio/poezio-0.12.ebuild
@@ -10,8 +10,6 @@ DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
 HOMEPAGE="https://poez.io/"
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://git.poez.io/${PN}.git"
@@ -27,12 +25,8 @@ RDEPEND="
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/slixmpp[${PYTHON_USEDEP}]
 "
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/potr
-		dev-python/pyinotify
-	)"
+
+distutils_enable_tests pytest
 
 DOC_CONTENTS="
 Install these optional runtime dependencies for additional features.
@@ -55,7 +49,3 @@ src_install() {
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index 14be76f1d818..2946371c46b8 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -10,8 +10,6 @@ DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
 HOMEPAGE="https://poez.io/"
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
@@ -27,12 +25,8 @@ RDEPEND="
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/slixmpp[${PYTHON_USEDEP}]
 "
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/potr
-		dev-python/pyinotify
-	)"
+
+distutils_enable_tests pytest
 
 DOC_CONTENTS="
 Install these optional runtime dependencies for additional features.
@@ -55,7 +49,3 @@ src_install() {
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/net-libs/axtls/axtls-2.1.5.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild
index 674385dd40d6..97e0f9f50e3b 100644
--- a/net-libs/axtls/axtls-2.1.5.ebuild
+++ b/net-libs/axtls/axtls-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index f96f9ec2033c..3b9c775abfa1 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Rolf Eike Beer <eike@sf-mail.de> (2020-04-18)
+# dev-ruby/asciidoctor is not keyworded on sparc
+net-misc/chrony html
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-17)
 # net-analyzer/icinga is not keyworded on sparc
 net-analyzer/pnp4nagios icinga
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 0718ef01ea4a..9a891f6d5205 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -12,6 +12,7 @@ mail-filter/maildrop dovecot
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-16)
 # net-misc/pps-tools is not stable on sparc
 net-misc/chrony pps
+net-misc/ntp parse-clocks
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # media-libs/kate not stable on sparc
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 5d08feab7d3d..499da317742f 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -110,12 +110,6 @@ dev-java/oracle-jre-bin
 virtual/emacs
 
 # Michał Górny <mgorny@gentoo.org> (2019-12-09)
-# The pycrypto project is long dead, and has been forked into
-# dev-python/pycryptodome that's not entirely API compatible.  Many
-# upstreams prefer switching to dev-python/cryptography instead.
-dev-python/pycrypto
-
-# Michał Górny <mgorny@gentoo.org> (2019-12-09)
 # Test coverage reporting is not useful for Gentoo ebuilds.  The deps
 # against coverage plugins are either entirely spurious, or the build
 # systems need to be fixed to work without them.
diff --git a/profiles/package.mask b/profiles/package.mask
index 53810d4585d8..36451fc15eef 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-04-18)
+# Long dead, vulnerable.  All revdeps have either been ported away,
+# removed or had their optional deps removed.
+# Removal in 30 days.  Bug #703682.
+dev-python/pycrypto
+
+# Michał Górny <mgorny@gentoo.org> (2020-04-18)
+# Practically dead.  Last blocker for dev-python/pycrypto removal.
+# Upstream is struggling to port away from it for 3 years now.
+# Removal in 30 days.  Bug #611608.
+dev-python/potr
+
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2020-04-17)
 # Very little activity for almost a year and the link to download the
 # "compiled" man-pages is dead.
diff --git a/x11-misc/gigolo/gigolo-0.5.1.ebuild b/x11-misc/gigolo/gigolo-0.5.1.ebuild
index 227fa91f3625..18f4ae80041d 100644
--- a/x11-misc/gigolo/gigolo-0.5.1.ebuild
+++ b/x11-misc/gigolo/gigolo-0.5.1.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 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16
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 d763b3de7d1f..416ede4056e7 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 9df144416fc2..209446460b3c 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
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild
index cf19f7d52b16..c759054a9f7f 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.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="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="upower"
 
 RDEPEND=">=dev-libs/glib-2.42
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
index 14e62615b423..fb208ccaa805 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.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="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="