Merge updates from master

38 files changed, 147 insertions, 50 deletions

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 3439dfdd4e15..4c468733de52 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -39,6 +39,7 @@
 		<flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="tci">Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
+		<flag name="jemalloc">Enable jemalloc allocator support</flag>
 		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
 		<flag name="png">Enable png image support for the VNC console server</flag>
 		<flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index d547b37ab845..cc99fdbbcc18 100644
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
+	+fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
 	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
 	spice ssh static static-user systemtap tci test usb usbredir vde
@@ -108,6 +108,7 @@ SOFTMMU_TOOLS_DEPEND="
 		sys-fabric/librdmacm:=[static-libs(+)]
 	)
 	iscsi? ( net-libs/libiscsi )
+	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? (
@@ -436,6 +437,7 @@ qemu_src_configure() {
 		$(conf_notuser gtk)
 		$(conf_notuser infiniband rdma)
 		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jemalloc jemalloc)
 		$(conf_notuser jpeg vnc-jpeg)
 		$(conf_notuser kernel_linux kvm)
 		$(conf_notuser lzo)
diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild
index b79cb23ab0f7..f4991a5e13ad 100644
--- a/app-emulation/qemu/qemu-4.1.0.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
+	+fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
 	+png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
 	spice ssh static static-user systemtap tci test usb usbredir vde
@@ -114,6 +114,7 @@ SOFTMMU_TOOLS_DEPEND="
 		sys-fabric/librdmacm:=[static-libs(+)]
 	)
 	iscsi? ( net-libs/libiscsi )
+	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? (
@@ -445,6 +446,7 @@ qemu_src_configure() {
 		$(conf_notuser gtk)
 		$(conf_notuser infiniband rdma)
 		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jemalloc jemalloc)
 		$(conf_notuser jpeg vnc-jpeg)
 		$(conf_notuser kernel_linux kvm)
 		$(conf_notuser lzo)
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index b26d0b2869df..51deb16ff036 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
+	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg jemalloc kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
 	+png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
 	spice ssh static static-user systemtap tci test usb usbredir vde
@@ -114,6 +114,7 @@ SOFTMMU_TOOLS_DEPEND="
 		sys-fabric/librdmacm:=[static-libs(+)]
 	)
 	iscsi? ( net-libs/libiscsi )
+	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? (
@@ -443,6 +444,7 @@ qemu_src_configure() {
 		$(conf_notuser gtk)
 		$(conf_notuser infiniband rdma)
 		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jemalloc jemalloc)
 		$(conf_notuser jpeg vnc-jpeg)
 		$(conf_notuser kernel_linux kvm)
 		$(conf_notuser lzo)
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
index d62b552d79d0..30ce2ee207e0 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
@@ -22,6 +22,7 @@ CDEPEND="
 	>=app-emulation/spice-protocol-0.14.0
 	media-libs/alsa-lib
 	>=x11-libs/libpciaccess-0.10
+	x11-libs/libdrm
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libX11
diff --git a/app-emulation/spice/spice-0.14.2.ebuild b/app-emulation/spice/spice-0.14.2.ebuild
index 464cb7d9c62e..58de3c678521 100644
--- a/app-emulation/spice/spice-0.14.2.ebuild
+++ b/app-emulation/spice/spice-0.14.2.ebuild
@@ -33,22 +33,22 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	>=app-emulation/spice-protocol-0.14.0
+	smartcard? ( app-emulation/qemu[smartcard] )"
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	$(python_gen_any_dep '
 		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-	')
-	smartcard? ( app-emulation/qemu[smartcard] )"
+	')"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.0-openssl1.1_fix.patch
 )
 
 python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 48cf0c3fa264..d4bf02488571 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -34,18 +34,18 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	~app-emulation/spice-protocol-9999
+	smartcard? ( app-emulation/qemu[smartcard] )"
+BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	$(python_gen_any_dep '
 		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-	')
-	smartcard? ( app-emulation/qemu[smartcard] )"
+	')"
 
 python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -55,6 +55,10 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Delete repo-only Makefile that causes build to fail.
+	# https://gitlab.freedesktop.org/spice/spice/issues/35
+	rm GNUmakefile || die
+
 	eautoreconf
 }
 
diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index 62904a2c9586..3311e82897cd 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
 	<use>
+		<flag name="libvirt">Support connecting to virtual machines
+			managed by libvirt.</flag>
 		<flag name="spice">Support connecting to SPICE-enabled virtual
 			machines.</flag>
 		<flag name="vnc">Support connecting to VNC-enabled virtual
diff --git a/app-emulation/virt-viewer/virt-viewer-8.0.ebuild b/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
index bff9034cfbdb..9e3cc152d67e 100644
--- a/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
@@ -5,18 +5,20 @@ EAPI=6
 inherit gnome2
 
 DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+HOMEPAGE="https://virt-manager.org/"
+SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="sasl +spice +vnc"
+IUSE="+libvirt sasl +spice +vnc"
 
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
-	app-emulation/libvirt-glib
-	>=dev-libs/libxml2-2.6
+RDEPEND=">=dev-libs/libxml2-2.6
 	x11-libs/gtk+:3
+	libvirt? (
+		>=app-emulation/libvirt-0.10.0[sasl?]
+		app-emulation/libvirt-glib
+	)
 	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
 	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
 DEPEND="${RDEPEND}
@@ -31,6 +33,7 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-update-mimedb \
 		--without-ovirt \
+		$(use_with libvirt) \
 		$(use_with vnc gtk-vnc) \
 		$(use_with spice spice-gtk)
 }
diff --git a/dev-lang/julia-bin/Manifest b/dev-lang/julia-bin/Manifest
index 4e00969e4218..331644b75345 100644
--- a/dev-lang/julia-bin/Manifest
+++ b/dev-lang/julia-bin/Manifest
@@ -1,6 +1,6 @@
 DIST julia-1.1.0-freebsd-x86_64.tar.gz 80298415 BLAKE2B ec07fd0ee0504b744891b102ee936aac0550656cea96d2b342f39382a3df899a9fb3c6426ee18ff6febfe935ac595d6c66018a7e05f0bc091da3f5e166ee45fd SHA512 75460446a6278e56cf75e056ddcbd71715bc35b762d88199ef4065e29b101756ea386c979962b6243df549508b6618364203f48293012ce0b147987b94f0663c
 DIST julia-1.1.0-linux-i686.tar.gz 85843858 BLAKE2B 574001002297a94b8a26fe772c11312fe8fdc6bf09ddb969f291f604288f941a151f356d9f22f2a953822a290a49977e8fb76cc4d74c819e0572fcce8ae218b2 SHA512 e2465e20024f98e1b64ba5c799b1825c24f88c4a9b6e8b07b9214722389bf9dd8a59a2b624fde75439dbcdeb437743903da7c86e721e75bc69b0d7a5ed8457e4
 DIST julia-1.1.0-linux-x86_64.tar.gz 89632491 BLAKE2B 11987a54e87e167747ba2bc87d359981084fb1c91eab32e7498ee554b485c75fdc85e126c4d706fdf2e203bfbf143fba85e2f4e4bed81aeedbafbd2f099741c1 SHA512 bc47fe1ba304b6f083ba858c0d0318f684a19902b4c4937901d97f1a19ba19d60a6145a143ef742159fe6b40810ac39978d7574bdc29446da38c61d26ff8ef33
-DIST julia-1.1.1-freebsd-x86_64.tar.gz 80831400 BLAKE2B a9c542609323ed295b74ac6caab5bf9bf0f007958212b2100329b5b1925fc14c4af80df9cc292e20b418a76373dbbd543f1c9a212a5389a6ccf0836b21cca287 SHA512 22c4e1cf90fb098c109db3e1b1179d9fc7b136e7b646b94e7b2d241881c4a94bf1ccd0fcc807fd3100aa55451b36c816e93a4eff66bdd33bc1be131ade88577f
-DIST julia-1.1.1-linux-i686.tar.gz 85968698 BLAKE2B d92311e80208ce12004317a01fbbbfe6f2edd65ecb805d7102786cf83448c594f46fcb9a2b6de6e82f7b056c4c8c904a4f61ee787bb8e95b3c0373b1cf075b7d SHA512 3cba94e3d94c4f6206d17b8314e1fe441a32084183ec5a7496b4b78a1b3bc4c8d03f0a37937870a09bd020900a56707b9e10329ec86fa2225948baf7fbad26e5
-DIST julia-1.1.1-linux-x86_64.tar.gz 89727957 BLAKE2B a1176ab1fdebfeb212520e9d47fd438f16f1edf247cf22a6f56264ce73f234568453cb6040be7c1f3cdfc4ce34e0d8ea4d3b1e147d143b3076f6d9019d496653 SHA512 b3fdc71379c81399a1f77395287ed833fd23edb5eb9bab3e3dc68381b6d79641e0bd93fa0dedadb551f1761fee3efabcc7f426d0505aba751ae5fd147e0b7bf4
+DIST julia-1.2.0-freebsd-x86_64.tar.gz 82750080 BLAKE2B 2b95fedc8dbbc138c0794f42518cce280c62bb2442d6a0d53b809f21768497937b037e1e886cff19cb40d7a63f3e2ee8da0314250cab52e8b139724baff3ee91 SHA512 9c9af2e2346553ea5658ab5a9fe88539605774cd2737ac9bfb240b7fa3f9fd46f746d5dbdff2dd7405e8fbd33208c12a335b7d80cd0c78c62287ae5eb470fc8e
+DIST julia-1.2.0-linux-i686.tar.gz 87810731 BLAKE2B 1d72bf469f1dd3667ea00d038d18e20c10d9ceb579c61b2f30603bcd7ea55875423e4d54cbb774cfcc20044528f3ccd196131bb17cbaf7bf780fc5667c387e1e SHA512 ecd62047a0e36fe85a0442733949b19ca5d877fc2d2bced80566d1fcd6906345f66fb9114b6e687594e514b8c952d0352de5982f77f127e5196288431a1f64a9
+DIST julia-1.2.0-linux-x86_64.tar.gz 91990555 BLAKE2B 125313e7e53bddfcd64251fa2794e5b9d4bbbadb6100c1dc8f86039e13520859117f8ffcc2611d085805c9a80ad3544e88dd0e37803609e3b8b4097867fa8a5c SHA512 47e966d12204ffbefcdd8a60e850994df2247c37ee601f4147710d80e8e576672daaffe6d35d37fef644ea725f46d893832f096e24d938af856328299ad920d5
diff --git a/dev-lang/julia-bin/julia-bin-1.1.1.ebuild b/dev-lang/julia-bin/julia-bin-1.2.0.ebuild
index 7038a1517336..6f1a552fc9a6 100644
--- a/dev-lang/julia-bin/julia-bin-1.1.1.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.2.0.ebuild
@@ -8,9 +8,9 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
-	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.1/${MY_P}-linux-i686.tar.gz )
-	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.1/${MY_P}-linux-x86_64.tar.gz )
-	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.1/${MY_P}-freebsd-x86_64.tar.gz )
+	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.2/${MY_P}-linux-i686.tar.gz )
+	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.2/${MY_P}-linux-x86_64.tar.gz )
+	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.2/${MY_P}-freebsd-x86_64.tar.gz )
 "
 
 LICENSE="MIT"
diff --git a/dev-lang/vala/vala-0.36.20.ebuild b/dev-lang/vala/vala-0.36.20.ebuild
index caa92e8e0a11..1fea01f5e686 100644
--- a/dev-lang/vala/vala-0.36.20.ebuild
+++ b/dev-lang/vala/vala-0.36.20.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.40.16.ebuild b/dev-lang/vala/vala-0.40.16.ebuild
index 9aeb8330fa9e..fe4e83bd450c 100644
--- a/dev-lang/vala/vala-0.40.16.ebuild
+++ b/dev-lang/vala/vala-0.40.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test valadoc"
 
 RDEPEND="
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild
index 989de333118a..1db439551344 100644
--- a/dev-libs/glib/glib-2.60.6.ebuild
+++ b/dev-libs/glib/glib-2.60.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index a0b22e1b18ff..f14cbb58dbba 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
index 6cbcd37f2d0a..af2c62cfe255 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index e02e3364e5df..c895e11b3db4 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index 122bb56cd487..a80b63063dd6 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index 5ec4eaa4d7d2..d4b8e28e62ab 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index fb3970a9acfa..3e42d46ebe0d 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index dddc40bc24ff..0f4c85a656e0 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is stable on amd64
+sys-firmware/seabios -binary
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2018-05-14)
 # Force the host target to avoid dependency hell
 dev-lang/rust llvm_targets_X86
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 758d97f26c8f..82280b43d705 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is stable on amd64
+sys-firmware/seabios -debug
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-28)
 # upstream provides docs and tools for tier-1 arches
 dev-lang/rust-bin -doc
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index ff05064b9ef2..4648105ebeb2 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is keyworded ~arm64
+sys-firmware/seabios -binary
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2018-05-14)
 # Force the host target to avoid dependency hell
 dev-lang/rust llvm_targets_AArch64
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 250a9f78ce22..ae5f9bc1c798 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is keyworded ~arm64
+sys-firmware/seabios -debug
+
 # Aaron Bauman <bman@gentoo.org> (2019-08-05)
 # dep not keyworded here
 media-gfx/gnome-photos upnp-av
diff --git a/profiles/arch/arm64/package.use.stable.force b/profiles/arch/arm64/package.use.stable.force
new file mode 100644
index 000000000000..cee7fbaa8091
--- /dev/null
+++ b/profiles/arch/arm64/package.use.stable.force
@@ -0,0 +1,6 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (19 Nov 2018)
+# iasl is keyworded ~arm64
+sys-firmware/seabios binary
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index dfeac18eaec8..a4b1a650640a 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is keyworded ~arm64
+sys-firmware/seabios debug
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-09-14)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
diff --git a/profiles/arch/base/package.use.force b/profiles/arch/base/package.use.force
new file mode 100644
index 000000000000..c60d96841663
--- /dev/null
+++ b/profiles/arch/base/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (19 Nov 2018)
+# iasl is not keyworded on many platforms yet
+sys-firmware/seabios binary
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 072dbbd336c3..faa9ca3ffc0d 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# Moved from arch/powerpc/ppc64 as it applies to most architectures.
+sys-firmware/seabios debug
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-28)
 # upstream tarballs for tier-2 arches do not ship docs
 # and starting with 1.37 no longer ship extra tools
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index c2ddff2d1185..508ff65b5c70 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is stable on ppc
+sys-firmware/seabios -binary
+
 # Joonas Niilola <juippis@gentoo.org> (2019-01-12)
 # Force 'unwind' on for ppc and ppc64 with dev-libs/efl
 # #668486, #657750
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index fd21d01a649e..7811cc8e24b3 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is stable on ppc
+sys-firmware/seabios -debug
+
 # Conrad Kostecki <ck+gentoo@bl4ckb0x.de> (2019-08-17)
 # app-misc/graphlcd-base won't work on PowerPC/PowerPC64
 app-misc/lcdproc freetype lcd_devices_glcd png
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 8b7962cdc8d1..9f76c95f2473 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is stable on ppc
+sys-firmware/seabios -debug
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-05-15)
 # sys-cluster/hpx, sci-libs/silo, sci-visualization/visit not keyworded
 sci-libs/libgeodecomp hpx silo visit
diff --git a/profiles/arch/powerpc/ppc64/package.use.force b/profiles/arch/powerpc/ppc64/package.use.force
index 49198bc57637..2ccbbdd645cc 100644
--- a/profiles/arch/powerpc/ppc64/package.use.force
+++ b/profiles/arch/powerpc/ppc64/package.use.force
@@ -1,4 +1,7 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-sys-firmware/seabios binary
+# Samuli Suominen <ssuominen@gentoo.org> (30 Oct 2012)
+# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm gets
+# stable keyword, this line can be removed.
+x11-misc/xscreensaver gdm
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 1c3a08553bba..aefdac00ab9a 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -23,11 +23,6 @@ media-sound/hydrogen portmidi
 # missing keyword on dev-python/dbusmock, bug #620024
 >=gnome-base/gnome-settings-daemon-3.24 test
 
-# Michał Górny <mgorny@gentoo.org> (2017-08-08)
-# package.use.force forces USE=binary, and USE=debug requires !binary,
-# so it can never be enabled.
-sys-firmware/seabios debug
-
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
 # no point in pursuing it right now.
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index 5d692726f06a..1b862d289ccd 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-11-21)
+# iasl is stable on x86
+sys-firmware/seabios -binary
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2018-05-14)
 # Force the host target to avoid dependency hell
 dev-lang/rust llvm_targets_X86
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 0ff8ea4e2409..ce51c3317fa1 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
+# iasl is stable on x86
+sys-firmware/seabios -debug
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-09-06)
 # dev-qt/qtgamepad is not keyworded yet
 dev-qt/qt3d gamepad
diff --git a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
index 268f57fb990d..b57f37fb2681 100644
--- a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
@@ -34,20 +34,36 @@ LICENSE="LGPL-3 GPL-3"
 SLOT="0"
 IUSE="+binary debug +seavgabios"
 
-REQUIRED_USE="debug? ( !binary )
-	!amd64? ( !x86? ( binary ) )"
+REQUIRED_USE="debug? ( !binary )"
 
-# The amd64/x86 check is needed to workaround #570892.
 SOURCE_DEPEND="
 	>=sys-power/iasl-20060912
 	${PYTHON_DEPS}"
 DEPEND="
 	!binary? (
-		amd64? ( ${SOURCE_DEPEND} )
-		x86? ( ${SOURCE_DEPEND} )
+		${SOURCE_DEPEND}
 	)"
 RDEPEND=""
 
+choose_target_chost() {
+	if [[ -n "${CC}" ]]; then
+		${CC} -dumpmachine
+		return
+	fi
+
+	if use amd64 || use x86; then
+		# Use the native compiler
+		echo "${CHOST}"
+		return
+	fi
+
+	local i
+	for i in x86_64 i686 i586 i486 i386 ; do
+		i=${i}-pc-linux-gnu
+		type -P ${i}-gcc > /dev/null && echo ${i} && return
+	done
+}
+
 pkg_pretend() {
 	if ! use binary; then
 		ewarn "You have decided to compile your own SeaBIOS. This is not"
@@ -58,6 +74,14 @@ pkg_pretend() {
 		ewarn "you will not receive any support if you have compiled your"
 		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
 		ewarn "in SeaBIOS."
+		if [[ -z "$(choose_target_chost)" ]]; then
+			elog
+			eerror "Before you can compile ${PN}[-binary], you need to install a x86 cross-compiler"
+			eerror "Run the following commands:"
+			eerror "  emerge crossdev"
+			eerror "  crossdev --stable -t x86_64-pc-linux-gnu"
+			die "cross-compiler is needed"
+		fi
 	fi
 }
 
@@ -108,10 +132,12 @@ _emake() {
 src_compile() {
 	use binary && return
 
+	local TARGET_CHOST=$(choose_target_chost)
+
 	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
 	_emake oldnoconfig
-	_emake iasl
-	_emake out/bios.bin
+	CHOST="${TARGET_CHOST}" _emake iasl
+	CHOST="${TARGET_CHOST}" _emake out/bios.bin
 	mv out/bios.bin ../bios-256k.bin || die
 
 	if use seavgabios ; then
@@ -127,7 +153,7 @@ src_compile() {
 			emake clean distclean
 			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
 			_emake oldnoconfig
-			_emake out/vgabios.bin
+			CHOST="${TARGET_CHOST}" _emake out/vgabios.bin
 			cp out/vgabios.bin ../vgabios-${t}.bin || die
 		done
 	fi
diff --git a/sys-power/iasl/iasl-20180810.ebuild b/sys-power/iasl/iasl-20180810.ebuild
index 5b69ce4b62ec..7d4945a34e3c 100644
--- a/sys-power/iasl/iasl-20180810.ebuild
+++ b/sys-power/iasl/iasl-20180810.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="sys-devel/bison
diff --git a/sys-power/iasl/iasl-20190215.ebuild b/sys-power/iasl/iasl-20190215.ebuild
index edd9ba4e0f01..fc4d7e040e8d 100644
--- a/sys-power/iasl/iasl-20190215.ebuild
+++ b/sys-power/iasl/iasl-20190215.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="sys-devel/bison