Merge updates from master

30 files changed, 115 insertions, 29 deletions

diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.14.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.14.ebuild
index 4aef97058dd1..9a558be6df92 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.10.14.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="
 	dev-libs/libaio
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index 15d258b1bf05..6eb7307f5e43 100644
--- a/dev-libs/newt/newt-0.52.21.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/univalue/univalue-1.0.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild
index 38bce8052ccd..f4acb09a1f96 100644
--- a/dev-libs/univalue/univalue-1.0.4.ebuild
+++ b/dev-libs/univalue/univalue-1.0.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/dbus-python/dbus-python-1.2.12.ebuild b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
index 494875ffb628..4dd50a911541 100644
--- a/dev-python/dbus-python/dbus-python-1.2.12.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index 7591bced794c..d11f854d1606 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
index 40d98eabbdab..51936a663c73 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/takluyver/pyxdg/archive/rel-${PV}.tar.gz -> ${MY_P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index 4864fcad139b..0beaf87fa516 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-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="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/thread/thread-2.8.2.ebuild b/dev-tcltk/thread/thread-2.8.2.ebuild
index 972cc84775d9..7c1f025e9dc4 100644
--- a/dev-tcltk/thread/thread-2.8.2.ebuild
+++ b/dev-tcltk/thread/thread-2.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/tcl:0=[threads]"
diff --git a/dev-util/byacc/byacc-20190617.ebuild b/dev-util/byacc/byacc-20190617.ebuild
index f96e778f6be8..2d2c0bf8a7b6 100644
--- a/dev-util/byacc/byacc-20190617.ebuild
+++ b/dev-util/byacc/byacc-20190617.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
index a581ac986671..cc49c477cb5b 100644
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="app-misc/pax-utils"
diff --git a/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
index 7a7b6a6f8e09..00621df8fcc7 100644
--- a/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
+++ b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="+dolphin +kaccounts"
 
 DEPEND="
diff --git a/kde-frameworks/purpose/purpose-5.65.0.ebuild b/kde-frameworks/purpose/purpose-5.65.0.ebuild
index 49100275b1f8..77322d1f6f90 100644
--- a/kde-frameworks/purpose/purpose-5.65.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.65.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+dolphin +kaccounts"
 
 DEPEND="
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
index e71d2abf9fe6..bdf6db36c461 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/svofski/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 LICENSE="Unlicense"
 SLOT="0"
 
diff --git a/media-fonts/qomolangma/qomolangma-2012.05.ebuild b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
index 1a9500ce9b27..c726a538fa58 100644
--- a/media-fonts/qomolangma/qomolangma-2012.05.ebuild
+++ b/media-fonts/qomolangma/qomolangma-2012.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ DESCRIPTION="Tibetan Unicode Ucan and Umed fonts"
 HOMEPAGE="http://www.yalasoo.com/English/docs/yalasoo_en_font.html"
 SRC_URI="http://www.yalasoo.com/files/CTRCfonts.rar -> ${P}.rar"
 
-LICENSE="freedist"
+LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index c08fdae5871d..0863e1f9150e 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 	ftp://wm28.csie.ncu.edu.tw/pub/distfiles/${MY_P}.tar.gz
 	https://dev.gentoo.org/~soap/distfiles/${P}-freebsd-aa_ad.patch.gz"
 
-LICENSE="freedist"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index 9f4981864947..1814aa0c0e27 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 
 RDEPEND="dev-libs/popt:="
 DEPEND="
diff --git a/net-dns/ddclient/ddclient-3.9.0-r3.ebuild b/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
index 37f5c129bf93..539a6e306351 100644
--- a/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://sourceforge.net/projects/ddclient/"
 SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
index 9d6b8d494ef0..5aa281911138 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
index f6aa733fa41b..1503d0d6dc26 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libqmi/libqmi-1.22.2.ebuild b/net-libs/libqmi/libqmi-1.22.2.ebuild
index fb1341514c97..d7fb5078343c 100644
--- a/net-libs/libqmi/libqmi-1.22.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.22.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
 else
-	KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
index 91110cbd2aee..d8c82ef94e1a 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-vpn/strongswan/strongswan-5.8.1.ebuild b/net-vpn/strongswan/strongswan-5.8.1.ebuild
index bbc7987d1874..168a76a9f0d3 100644
--- a/net-vpn/strongswan/strongswan-5.8.1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/sci-biology/embassy/embassy-6.6.0-r1.ebuild b/sci-biology/embassy/embassy-6.6.0-r1.ebuild
index 27edbc3fd4f6..b30223eda805 100644
--- a/sci-biology/embassy/embassy-6.6.0-r1.ebuild
+++ b/sci-biology/embassy/embassy-6.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 DESCRIPTION="A meta-package for installing all EMBASSY packages (EMBOSS add-ons)"
 HOMEPAGE="http://emboss.sourceforge.net/embassy/"
 
-LICENSE+=" freedist"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
 
diff --git a/sci-libs/dealii/dealii-9.1.1.ebuild b/sci-libs/dealii/dealii-9.1.1.ebuild
index f4aeb21e9f00..94009ead1838 100644
--- a/sci-libs/dealii/dealii-9.1.1.ebuild
+++ b/sci-libs/dealii/dealii-9.1.1.ebuild
@@ -67,7 +67,7 @@ RDEPEND="dev-libs/boost
 	scalapack? ( sci-libs/scalapack )
 	slepc? ( sci-mathematics/slepc[mpi=] )
 	sparse? ( sci-libs/umfpack )
-	sundials? ( sci-libs/sundials )
+	sundials? ( <sci-libs/sundials-4:= )
 	symengine? ( >=sci-libs/symengine-0.4:= )
 	tbb? ( dev-cpp/tbb )
 	trilinos? ( sci-libs/trilinos )"
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index dbaa10c592be..35dcbc94b523 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -67,7 +67,7 @@ RDEPEND="dev-libs/boost
 	scalapack? ( sci-libs/scalapack )
 	slepc? ( sci-mathematics/slepc[mpi=] )
 	sparse? ( sci-libs/umfpack )
-	sundials? ( sci-libs/sundials )
+	sundials? ( <sci-libs/sundials-4:= )
 	symengine? ( >=sci-libs/symengine-0.4:= )
 	tbb? ( dev-cpp/tbb )
 	trilinos? ( sci-libs/trilinos )"
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index e3e6893d43fc..b98d5eaf31f4 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,3 +1,4 @@
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
 DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
+DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
diff --git a/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
new file mode 100644
index 000000000000..5de76573630a
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5436bf..76b27c5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1122,9 +1122,9 @@ endif()
+ # install license and notice files
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.0.0
+   )
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/NOTICE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.0.0
+   )
diff --git a/sci-libs/sundials/sundials-5.0.0.ebuild b/sci-libs/sundials/sundials-5.0.0.ebuild
new file mode 100644
index 000000000000..9505cbb40bfd
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit cmake-utils toolchain-funcs fortran-2
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? ( virtual/mpi sci-libs/hypre:= )
+	sparse? ( sci-libs/klu:= )
+	superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+		ewarn "OpenMP is not available in your current selected gcc"
+		die "need openmp capable gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DCXX_ENABLE="$(usex cxx)"
+		-DFCMIX_ENABLE="$(usex fortran)"
+		-DF90_ENABLE="$(usex fortran)"
+		-DHYPRE_ENABLE="$(usex hypre)"
+		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+		-DKLU_ENABLE="$(usex sparse)"
+		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+		-DLAPACK_ENABLE="$(usex lapack)"
+		-DMPI_ENABLE="$(usex mpi)"
+		-DOPENMP_ENABLE="$(usex openmp)"
+		-DPTHREAD_ENABLE="$(usex threads)"
+		-DSUPERLUMT_ENABLE="$(usex superlumt)"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+		-DEXAMPLES_ENABLE="$(usex examples)"
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DUSE_GENERIC_MATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc doc/*/*.pdf
+}
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index 9ff17a72e6b3..9591454f67e5 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/x11-themes/e-flat-theme/e-flat-theme-0_pre20191220.ebuild b/x11-themes/e-flat-theme/e-flat-theme-0_pre20191220.ebuild
index 4e739c05533e..0aedbccfbae1 100644
--- a/x11-themes/e-flat-theme/e-flat-theme-0_pre20191220.ebuild
+++ b/x11-themes/e-flat-theme/e-flat-theme-0_pre20191220.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~juippis/distfiles/${P}.edj"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND=""