Merge updates from master

22 files changed, 52 insertions, 153 deletions

diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild
index bd2603c469aa..0eca44f066cd 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-portage/pfl/pfl-3.0.1-r3.ebuild b/app-portage/pfl/pfl-3.0.1-r3.ebuild
index 359c3f8f43dd..d120db740bfa 100644
--- a/app-portage/pfl/pfl-3.0.1-r3.ebuild
+++ b/app-portage/pfl/pfl-3.0.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/dev-python/certifi/certifi-2019.11.28.ebuild b/dev-python/certifi/certifi-2019.11.28.ebuild
index 217f48bd96ea..a4b36b8dedf7 100644
--- a/dev-python/certifi/certifi-2019.11.28.ebuild
+++ b/dev-python/certifi/certifi-2019.11.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 ~sh ~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=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/crcmod/crcmod-1.7-r3.ebuild b/dev-python/crcmod/crcmod-1.7-r3.ebuild
index 66999019a6c3..1ecb24061d8b 100644
--- a/dev-python/crcmod/crcmod-1.7-r3.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 arm ~x86"
 IUSE=""
 
 DOCS=( changelog test/examples.py )
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 5886f5c15dd9..b0f8d25bc760 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,3 +1 @@
-DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a4d0275a77e6365201ccffae955a8f505a1cd5e739145e1fc5551c3b956ff9a51bb57cede819f2886ee36637f7f9e SHA512 276bc21b4e6898e379be88f3582135a21314460ad20d4b6c3e12825ac1a72082b2c08bb62099e704c3222f879a1098d0b305132fac1095aaa60ca239b9763a2d
-DIST pycodestyle-2.4.0.tar.gz 96665 BLAKE2B 9c847aa9c9ffa1f401595d1c2c3f81f971f69628fb34d4e572ccb99203f8e9abe8101302d61c4ae7d330c03e7d0dd5e252d658065b7ed6660dea186880030529 SHA512 cb35238291fed30f1a4363e65b754165772d01e6006e19ce31769691aed17411cd893899fcd22dfca0455401bee899097fff6f3d63825c7656f186e37b7da3a0
 DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
deleted file mode 100644
index d96e2d151da5..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ /dev/null
@@ -1,37 +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 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
deleted file mode 100644
index 34a1b6e6bf67..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylibacl/pylibacl-0.5.3.ebuild b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
index fe492631df24..54b04bf275b8 100644
--- a/dev-python/pylibacl/pylibacl-0.5.3.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/iustin/${PN}/archive/${PN}-v${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 RDEPEND="sys-apps/acl"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index e02789d7a13a..c7292c4403ac 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,3 +1,4 @@
 DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
 DIST pyparted-3.11.2.tar.gz 101318 BLAKE2B 0c79535d6f3a269d5dfdd6c31ec80569d8c7432cd058f90999ebfd61ef727762a395d902539c49744108e92ba1a351c1ec939c02188869bed6c808551a843f92 SHA512 de6e7387e3eb9c9cb11e01f475d2749d2ce22ec2f11386df20cafcf83f7e431828f2db936f29c717e42694ff390a592598893633156a21aa7c8d5700a3c9ece9
 DIST pyparted-3.11.3.tar.gz 105305 BLAKE2B 271d0ed91c187c66219f06e91def5e868d81494241a2e9137676162ffa388523f5cccb3ec6dfed655cb59da1ca56e7fde3bb9fafa227b86d8f7b279759fe237b SHA512 b10a89d076a27a074d606101dccb62176299dd8f9da75a5a4bf9c8a6683d2873b649d948736e991e4cfa21d43a54e7d2934da8e539ce8626ae5fd47e892ae286
+DIST pyparted-3.11.4.tar.gz 105345 BLAKE2B 55d41d44e286b6b737aeb65880996f8b69c99286cea672512a2f64118f346b38436de8e15fee45bf5ba8151155142a995e310549c6f3d47600351760d514dd3d SHA512 d0603235a0cfce6c93520eb8577f47f51c76016c396ed85cfa57777dfe0cf06c32605c91d7d0252e8910025347e1d3ebdec8c77d4b9db13ed380b7fdf0113de6
diff --git a/dev-python/pyparted/pyparted-3.11.4.ebuild b/dev-python/pyparted/pyparted-3.11.4.ebuild
new file mode 100644
index 000000000000..5dcdba1e16b1
--- /dev/null
+++ b/dev-python/pyparted/pyparted-3.11.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,8} )
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python bindings for sys-block/parted"
+HOMEPAGE="https://github.com/rhinstaller/pyparted/"
+SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=sys-block/parted-3.1
+	dev-python/decorator[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild
index dba61994f157..b4920302c2b7 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10-r1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
index 9a0a1e26b202..843a5a66c0f0 100644
--- a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pnpnpn/retry-decorator/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 arm ~x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/selenium/selenium-3.141.0.ebuild b/dev-python/selenium/selenium-3.141.0.ebuild
index f5f8260d1b67..8255e9da9cab 100644
--- a/dev-python/selenium/selenium-3.141.0.ebuild
+++ b/dev-python/selenium/selenium-3.141.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Python language binding for Selenium Remote Control"
 HOMEPAGE="http://www.seleniumhq.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
index 757df0f3f8ed..eedba12098c7 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
index 531dfb3b9d94..c38d71b4237e 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/zstandard/zstandard-0.12.0.ebuild b/dev-python/zstandard/zstandard-0.12.0.ebuild
index e1d83cc6a607..b61181edde36 100644
--- a/dev-python/zstandard/zstandard-0.12.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild b/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
index a74776b17caa..ee8fa5a72c4c 100644
--- a/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
+++ b/kde-apps/umbrello/umbrello-19.12.2-r1.ebuild
@@ -16,7 +16,7 @@ https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="php"
 
 RDEPEND="
diff --git a/kde-apps/umbrello/umbrello-19.12.2.ebuild b/kde-apps/umbrello/umbrello-19.12.2.ebuild
deleted file mode 100644
index a285a866eee4..000000000000
--- a/kde-apps/umbrello/umbrello-19.12.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KF5=ON
-		-DBUILD_PHP_IMPORT=OFF
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
-
-	ecm_src_configure
-}
diff --git a/net-print/hplip/hplip-3.19.12-r1.ebuild b/net-print/hplip/hplip-3.19.12-r1.ebuild
index 49cad9be3506..d573c2fef825 100644
--- a/net-print/hplip/hplip-3.19.12-r1.ebuild
+++ b/net-print/hplip/hplip-3.19.12-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 74f67787057b..668eb67cb519 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-02-11)
+# dev-util/kdevelop and dev-util/kdevelop-pg-qt not keyworded, bug #709294
+kde-apps/umbrello php
+
 # Matt Turner <mattst88@gentoo.org> (2020-02-02)
 # dev-libs/mongo-c-driver is not keyworded
 net-dialup/freeradius mongodb
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 7902ae5f7bd9..38d65923ac3e 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,4 +1,4 @@
-DIST adobe-flash-32.0.0.314-npapi.i386.tar.gz 8537211 BLAKE2B 3c16d10039d921659c67c203449258f27f65837f13acfffa8b4b6c73d3543e9bb7f233bdb5ea00cb9bbfdecd3d0505d945a2a5bf151868d5c7e1a5f261c4a015 SHA512 8271fc0062c2fb838c9fb0e6ae5e2cbdd9b314cd1b82304ca88a98151f02be9d67936aa43b7b207a020423240238b501b7ae869eb8470904871cc626ebe07b2d
-DIST adobe-flash-32.0.0.314-npapi.x86_64.tar.gz 9243290 BLAKE2B 86929bdda23d8b747a7c229cb13fa8a2eadcb6df392dea04a6d7db79d4e785b0a24dbaa730e0d1d3eacaa74d8c36da2a0632d20b938a02b8733ca7fc7953a00f SHA512 1d75b37d5f097f91ac1eac44293cb97728c6e50505dcb75e55135b79cb94929908616d51aed34697bf59dc46ffe9b49c2d24bd817c1ee720c0e34390fc6e4678
-DIST adobe-flash-32.0.0.314-ppapi.i386.tar.gz 8574115 BLAKE2B a36ae83bc7cbad7cb1b0828edbce3552a29abc86c13116792b2a3909a80047e9fd1617cdd0136d57b98f86597fa37ca488f85bd7c190c88caa200c36b2c71d6a SHA512 ec2cf8273273f5cdefd800c1555995de2d5ccfc5abd83a7eafa72679a00dab8e283c8bbce35a7e52b20c5d2a7199f2dc33333d8714725b3a74c22c2e8be77b71
-DIST adobe-flash-32.0.0.314-ppapi.x86_64.tar.gz 9491851 BLAKE2B 4fcea8b6101ed634e7952234ffa826503a07085fb26405d2d9bc5f4a8bdd7af36d03f2fac9e19d9186e543d2f5f7fb6b655160ec595c6dc7cdc1514bfc96b98e SHA512 a032db1edc05b8b60c7fbb98af20e55925839a41da2c2d41202f6c9c7c1dc866f15c7908f2049d10a39b52794ba7c82c35cb6a31157040b6cdfdc146c10e9fea
+DIST adobe-flash-32.0.0.330-npapi.i386.tar.gz 8542901 BLAKE2B 5b43a56c8de4462b51c3003877be8aa4c8e85af05202211358a9aed7566c6c1a57e369a933260b452c0f076bee398626214f366bad613d6ca14db08ee5a9fbd2 SHA512 6036edf4a8da513657e4b759f6d9ac1c6e5a78e478c76c1eb42edf35f533cfd95b6feeea488814b2461d7e42ddb345269e7192ac243acf7240d8ced6a5728dc0
+DIST adobe-flash-32.0.0.330-npapi.x86_64.tar.gz 9062340 BLAKE2B 981becbbddb599c17516f73f3e353618eaafbd06e58b4d091a1af776ec8687778949785214b4834f2e70b437ba6085361907278e6156c7fb59da92fc5941890b SHA512 f8cddc25999574e0a7c29151b06339827caed2df7a7b61b2b625d5fc2f6f5c3583808178a5606c13b8e187bb2a29c1e40d6db15412e8aebe66abcc84b5f25525
+DIST adobe-flash-32.0.0.330-ppapi.i386.tar.gz 8579454 BLAKE2B 2c71ee721caa6e6a98ececa89cfcc14f474ae1c862da42dc340d764d8f8db4b9c23172795a035cf839c77d1bac7753a466e6d802e01af7952af811bb274b7e26 SHA512 dcce6b054ae42b6215e4aa48c60b49722737f35dcafa9bf7313019122603981d7e9ec8105cd8f96d6844fa0dbecd775fa7b5a3789da0a9bd3f258545098da2ea
+DIST adobe-flash-32.0.0.330-ppapi.x86_64.tar.gz 9492629 BLAKE2B 1edb4e7c8a8b234c7dbd4a403c9af8046b812b1cc088e1645d4feaf37083215c5436495eff1f6dee2713904bd93e0ced6ba419a44acb22ecb24f7353cd2a5e72 SHA512 0fb58106319fdd0e2483fffe38099d88e470409adedb9b0d54fc9b88c98e66e5f05a2dfb958b10c14a1438e55d5380f397f29bb265dbbf313e10e7c2b66bdaad
diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.314.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.330.ebuild
index 577e3861a09e..577e3861a09e 100644
--- a/www-plugins/adobe-flash/adobe-flash-32.0.0.314.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-32.0.0.330.ebuild