gentoo resync : 30.06.2019

21 files changed, 291 insertions, 29 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ba9ea115b10b..7bffa482834c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index c4eb89857d51..4e1b73fc81e3 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,9 +1,12 @@
+AUX elixir-1.9.0-disable-network-tests.patch 494 BLAKE2B 384ec581931a59912a1f494489310a35031ada9962d847855bc9624fa4b96090f5aede7e21076622dea1e7f5bb3a86968479e203738488de6d79659c6165443a SHA512 1a2d46d81adbc76acc726947dc2c4ed7450a4291071d1cd8c9f351ca41675179bb6d4a3a3215d93556485888c433e73bc64cb074d572e72f1b983d77b64da7ae
 DIST elixir-1.4.5.tar.gz 1829098 BLAKE2B bc8e2beafe53c3af507215d913558e295370ed8d3731c8b013f5d1cd2ad1d8a4fad4b3fe1a7ee3397470916f6f6687436ecbaa06c85c47f4b52aa0331b7dad23 SHA512 3fe659a739ded54bfc7d05a96acf3061c860e44cfd7700651d138c7e21997c5703cc62d2bd3b7a258b27064bb222dfdcdc01e4d017451f522f9658a039073611
 DIST elixir-1.6.6.tar.gz 2078742 BLAKE2B 4a793ac55db97c1d604d5f0012758d039f4a26eff5866a2ad2b90010f8477a8f62cc8f01a391f93133c927c5da5494b6d10b76f087a4af1206da977b0ec14a17 SHA512 62010100274b99423bb6a660e34ef53a702250a09371ef4b49ec03a3afe8761611b3734aea31763afa361560eb74c6d23e022d4d9bc4453c1bdef36bb37f9b4d
 DIST elixir-1.8.1.tar.gz 2177865 BLAKE2B 2f078849eb7ebd8a5b1ac3e894e6340146a0e72c462a251be529d404128478a4e4c913653e85797a3ced035de38ae4de93b84f65df9b6174206e41e00da9e3dd SHA512 114970707505cbf89f8fa55d5c54989dded7feb39cb3674e88f64e19f1a0680086ae49c856fb76fb7eaf0142fa0a0b81b1d5b9570825e05f083a9c580b0ca017
 DIST elixir-1.8.2.tar.gz 2178731 BLAKE2B d96d86f2919556f1f60656e61b0cca121abf9a9de2b31d7d3a17d24f11211107dd9e92ac502cbc9e165aad360ad9a8a20948fa9be73f6cae7ab00eb7dd07fb83 SHA512 0b30fec1cdc85884c1076e10c6e594b1855a325ae8c070bb3bd9af11998b21b273d7185b59954183b1fd525a2852a61be9c2eec54d9adb8ec1fdeb0200714857
+DIST elixir-1.9.0.tar.gz 2247212 BLAKE2B b448e6440a991a22674d5afb047279088bc271972f6bc4d75a2bd95ddd1ef493b34c55dac9d378b569181459a0b374e96cbbdce30541691f74470dbe5563de89 SHA512 3ecdbb2565cdaf51d6119b5dba42b4b180484aea96e9fe1f85febfb7c3f185b869aab94a22b5052dd84073be1a50ecb97d76dd1bc87f7fdc38a12cff65d2caf6
 EBUILD elixir-1.4.5.ebuild 614 BLAKE2B 1d29d2f6ba47804cada038d39347b1b24a0e03fa1bf4d9efd0fe10593dcf7af60f9bc0858ea25a4d889fc4992086d13db193bfcedbb59700e6e2bb1a9b93bb88 SHA512 e35ca3693d2d0c92dc4a4de6327ed7bf8cbeb1d65e82affb9378ce24c6e4b4ae044a7a2ba8094ceaf06a3fac987303aaa73b72b7aa38e7537e0da6f58fa3cbf2
 EBUILD elixir-1.6.6.ebuild 746 BLAKE2B c684140dd07198c8f9594e7ee8b290acdbe34abe989e40a79714c92d002bebfe122c9f2f2111ed55f3c27dff47b0c9d6bd47e82bc3dc01777f942c4e983f056e SHA512 bb58abda1e577b7b966d8acb16b78d02380317ed7f74d4eebd46b78914c83704b3b9b4ee31cb9d1aa3e143d4b8cfddc55353b82b12239dc019a79a23e570ad73
 EBUILD elixir-1.8.1.ebuild 688 BLAKE2B 924c32ce6b2ff150aa9bdcbf74f7448d167711cc44d81a7757cacb810e7d5ad7862846e13235f48f8e0516345f5db8bfbf2e1be28f6846b830d4b5bf8751d7c7 SHA512 6e2f9206f43b4fdfd11636e573cfbe9146da3a9ef6d87de771d09352b7954fd50e8649774dae1821035cc2522deaf3b32e90fe8f5b77bf05e99dbba77c679ae0
 EBUILD elixir-1.8.2.ebuild 691 BLAKE2B 030f157b651da66aa0b97cc7237e0c7b41edd3ecfaf43cb3028961dc2fffd0654e843d6e7bd7b7f91d0dca65cb34eb469459c71fdfb3a76d133fcb633361d8ee SHA512 aa83013a884153a36d4b2aa818d911ae0b13b295aede5ff8c9d1b496817fb146c4e45652c2a3113e0506f210df116f6438dc1c6a701a86787a552ce02df25b45
+EBUILD elixir-1.9.0.ebuild 759 BLAKE2B 90c5d6e8776566294277e8be333a3c26ec26ca8cfcbb7b14c17c077701b9595b22de44d0bc2d7b43748ce752dcb33fd75564866fa4c8756a3809970072f50650 SHA512 1aed67eaa60825115a7785b83e3ad14360e118fd62242573e7529d4d8044a697d3bc419d433708dce87e1bd40501e6b7c71ed144dddc5dc32b935a5c97153f09
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.9.0.ebuild b/dev-lang/elixir/elixir-1.9.0.ebuild
new file mode 100644
index 000000000000..b78f71f1a8c0
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-18[ssl]"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.0-disable-network-tests.patch
+)
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch b/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch
new file mode 100644
index 000000000000..9806b5608db3
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.9.0-disable-network-tests.patch
@@ -0,0 +1,18 @@
+--- a/lib/mix/test/mix/tasks/release_test.exs
++++ b/lib/mix/test/mix/tasks/release_test.exs
+@@ -265,6 +265,7 @@ defmodule Mix.Tasks.ReleaseTest do
+     end)
+   end
+ 
++  @tag :skip
+   test "executes rpc instructions" do
+     in_fixture("release_test", fn ->
+       config = [releases: [permanent1: [include_erts: false]]]
+@@ -329,6 +330,7 @@ defmodule Mix.Tasks.ReleaseTest do
+     end)
+   end
+ 
++  @tag :skip
+   @tag :unix
+   test "runs in daemon mode" do
+     in_fixture("release_test", fn ->
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 54b4c0d16055..8f78c87ea0a7 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,6 +1,8 @@
 AUX 18.2.1-wx3.0.patch 3849 BLAKE2B 02912cf61094d8217eab7181a4cc35aead224df7872c412db0b40b072778cfb900bf18219baf52e29f609b72305d3a11ea1079b2e873cf56a0a3bd42e3303d2f SHA512 33d8b67542266ae224ffb2bc86fbf36fff6737252810cfb445662ecc418fb30b0b00cbddd2f706ca836f1a8809c505e61edfe221d29dbe91c78c371bff6cec15
 AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec48aa5d73ea3a0e801a8dddd371fd8894d49aa9d5573def56b3a864e463734d72fcf5356d39753dbda1ba SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473
+AUX epmd.confd 92 BLAKE2B aca8c6f5b97075522c9563be3399f2a25a5df0c0703dd8f71c4f694006b8db7b25db48c37f30fa1860fb7436ba5db84c7b98b0c592269e497643a16de4bec8ed SHA512 3785664b6c8b05d57d20d24c5067b7c0d64ef8c74c492efb2667f4e7e6b291b5f0938173f89bca848582de8c485282d589f36a1490301e5243969f1131f97e84
 AUX epmd.init 536 BLAKE2B d9e841384eacab70a5b35a4b4881e0c073276299edfcfeaa52896c485bc52479b7cdeae565ec6713264697aa0e2c0f3c8ee2b0bdcb5a1328225a685f12f62bcf SHA512 1735ef6783e9a15fb3763ecb12913a97033bc23a1f26ef61c2df237851c65481979a725ddecb34d1628cc01d94d0c6568986be7da0db82366d3ea394282a59e3
+AUX epmd.init-r1 462 BLAKE2B 963a7c645bf51ceb122f217e61903a97b4a535ec823b0e5a352e4bb7234dfe9e54f45cb25e71584fd0183b4b41d12db532dc98c0e022a81bf1dc26d0bb5849d7 SHA512 3b07626b0f20f6d2d23893a050458cd288e9ff63a5fd61323be9ca93388240e589def401c8b149c821f74657089188f094b87b7eeef0f6199fd3162505f2cb59
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
 AUX erlang-21.3-lto.patch 5277 BLAKE2B 32bfdda0c1deb8bd7d2403ad6810b6f8cd8bf6ec3bfd54d02ab4637d800ef0fe77b4da883877ba3c08a9c24596c7af09069aab5449fc22627d811ccc6257f18c SHA512 fb3460e4d881e8c9bc256840d62f8ba988456abc581c01e2b8c43d1302549cdb59b179f613f65139bd89b6e1fb8395e74472ba0a000ff0dcf8af84c4593dac03
@@ -40,5 +42,6 @@ EBUILD erlang-21.2.6.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419b
 EBUILD erlang-21.2.7.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
 EBUILD erlang-21.3-r1.ebuild 4511 BLAKE2B 2c6845a8bb9ed75313108397a7231188904f27c92fb711da841c04a57bc0559724b6f9b0c761149f8801efb1d778f55e4f3bcf5576a05edd7367b788372b65e8 SHA512 f6ef4c7613150745520302652d4a322e7a333e480c9b41838b0b83545ba6b8d89691208fe18482ec5636de3d7c0e9a91af490ee52bebe14e475f032a4de88c0b
 EBUILD erlang-21.3.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
+EBUILD erlang-22.0.2-r1.ebuild 4140 BLAKE2B b490b4dd9d3f9bcd1104a2e87f826d6e1063bb301bdde4523b906e07f52b0e694fdc6e50d53cb09c3569555b2db8ffd49dd4f8695303de37c2dda9860e3c5e24 SHA512 6220b41788af18e7069f5e06a378857e1829e93f213f95d0f379c2d44523fff18d9383cb5ffdeb226999f980c481bc4b83d56473a1f06de1f58a0fa42f6e7420
 EBUILD erlang-22.0.2.ebuild 4097 BLAKE2B 62317e5f3a47b4c4bdfff3e0c1a736c1f55bd79bba19e8d90ac952c8f3c5596336add108793d535dbc492d24e7189d0677bd42a982c4cbaf06ec5e50f39451bf SHA512 ae5d0a24c628a4de58de10f4b7781d6d98326fb929f426b88ab8249fb8c7b05ec6616aaf26e99223df091cd4a6de4061b68a04c51626359fa391bfc808bf4c4b
 MISC metadata.xml 767 BLAKE2B 7b4e24e035cc581418aa0509baad9913b3abb195414f2e91136510a5910b69a186853b352557f1e49280aae7871cc2e033b6e2ea6f22b3b73c88d78853937309 SHA512 c816f414d07fac9433a22bdfb083db600200f45cc0fcc0eb06389056df4ccdfa31767ff0a25b8f7caf1b17dffc303ff3f766a642cfd263c0c723623c31c5a716
diff --git a/dev-lang/erlang/erlang-22.0.2-r1.ebuild b/dev-lang/erlang/erlang-22.0.2-r1.ebuild
new file mode 100644
index 000000000000..2c99593513a2
--- /dev/null
+++ b/dev-lang/erlang/erlang-22.0.2-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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="
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	tk? ( dev-lang/tk:0 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/18.2.1-wx3.0.patch"
+	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r1 epmd
+	newconfd "${FILESDIR}"/epmd.confd epmd
+	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/epmd.confd b/dev-lang/erlang/files/epmd.confd
new file mode 100644
index 000000000000..aa4dc3eb5aeb
--- /dev/null
+++ b/dev-lang/erlang/files/epmd.confd
@@ -0,0 +1,2 @@
+#arguments for run erlang
+command_args="--daemon -relaxed_command_check -address 127.0.0.1"
diff --git a/dev-lang/erlang/files/epmd.init-r1 b/dev-lang/erlang/files/epmd.init-r1
new file mode 100644
index 000000000000..bdd441b997a8
--- /dev/null
+++ b/dev-lang/erlang/files/epmd.init-r1
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the Erlang Public License 1.1
+
+pidfile="/var/run/epmd.pid"
+
+depend() {
+	need loopback
+	before sshd
+}
+
+start() {
+	ebegin "Starting Erlang Port Mapper Daemon"
+	start-stop-daemon --start --quiet \
+		--pidfile "${pidfile}" \
+		--exec /usr/bin/epmd -- $command_args
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Erlang Port Mapper Daemon"
+	/usr/bin/epmd -kill >/dev/null
+	eend $?
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 72b12c75f166..c94fe262545e 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -12,6 +12,6 @@ DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe59
 DIST go1.11.10.src.tar.gz 21113259 BLAKE2B 2dc704ea092fb4f4bb6c379ecb5104eb9dc5657750fb046810f210f38191d494c926e7a3661f67ea09c3d4090676485ba346daaa6dfe9eebbf3d69acbacea3b8 SHA512 8fab3b96d1c47b8f75b135da9d1a104c485098f6f42041b69336216a57cfd49c0785c8cfa7b016020ded5f0aadd279d7a76feeca33038321a4930139aee28cc8
 DIST go1.12.5.src.tar.gz 21971348 BLAKE2B 7de8db4a6c4cd9e1883fbf28357fe99ad9f43f3e015b2063347b1961df128760b720c0dd5549997c7080e6cf0036406430419d4bf033323f26017d3629ad6067 SHA512 ce64105ff71615f9d235cc7c8656b6409fc40cc90d15a28d355fadd9072d2eab842af379dd8bba0f1181715753143e4a07491e0f9e5f8df806327d7c95a34fae
 EBUILD go-1.11.10.ebuild 6448 BLAKE2B c7196c5172a0aaaaa707b4557caf4bc093241d76b14ffb22980f130c47dfb9abc041afb6bb6a22660d0699464eff630a4c9974aac7756d7e6514f2b22e7cadcb SHA512 aa8993afc41fa784ad67e2e8bab4a3edc5c178eecc66fd2b14285b739235c9eac0b44abee85de004c835df9807be35799fcfc9cde1a92d32bccc75c2e73f8085
-EBUILD go-1.12.5.ebuild 6448 BLAKE2B c7196c5172a0aaaaa707b4557caf4bc093241d76b14ffb22980f130c47dfb9abc041afb6bb6a22660d0699464eff630a4c9974aac7756d7e6514f2b22e7cadcb SHA512 aa8993afc41fa784ad67e2e8bab4a3edc5c178eecc66fd2b14285b739235c9eac0b44abee85de004c835df9807be35799fcfc9cde1a92d32bccc75c2e73f8085
-EBUILD go-9999.ebuild 6089 BLAKE2B 38d7288bbc5cfdf11a6648a0386e600a67564424c782d736fbe4880a13ffd5bfb5eed075a5f6355d0dfb338d4429745b5250af56fab64c9ad9f25dde0f4a87e4 SHA512 8b31e38038d3315f3aea7d0d364f661de247f434dc80abb1feebe3e3418b03c47fbf565384417a4316239991cdb2059c4fe542e4d4c43eb4dd251f53e4e81e6f
+EBUILD go-1.12.5.ebuild 6459 BLAKE2B 11cc998ff708a26c833e7ac2ff72c7fd2aabf0e3a3bfaa7558820d4726e29e22e5d0ad0b3100bd8e982b54074fc1230a43d288cf873810024a3fa1b3b77450e5 SHA512 deff55ebb12c4a915b439a1d598e02b8fd03a1d1ee873f9e6f47c6ff22cef82c3624aa68eac89968a3f01f7b91794d501675a59871fe9dd022fb2ee8cd29cd26
+EBUILD go-9999.ebuild 6100 BLAKE2B d914cb9513a17d71a7c10aebc4140f955fd6a8e0b0af645173e81f93379d39b3da233078029f5c322d02c1d59983de2e63ef7dae6f65ba6f2dec899d130b6c08 SHA512 820e2e88641a2218a3599ca23ef2d8767777638d9d08fcce36168d09679b72041b8b5fd4caa177b388e3445041da3e68f1785d2cfc2b4cc969c8d41c9864c680
 MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf
diff --git a/dev-lang/go/go-1.12.5.ebuild b/dev-lang/go/go-1.12.5.ebuild
index b48fe53d64d1..daee1d59a92e 100644
--- a/dev-lang/go/go-1.12.5.ebuild
+++ b/dev-lang/go/go-1.12.5.ebuild
@@ -37,7 +37,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index deea6d5a588f..8c8928317700 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -37,7 +37,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/mmix/Manifest b/dev-lang/mmix/Manifest
index b8d0bfe0d3f9..3053e85980e8 100644
--- a/dev-lang/mmix/Manifest
+++ b/dev-lang/mmix/Manifest
@@ -1,7 +1,6 @@
 AUX mmix-20110420-makefile.patch 1636 BLAKE2B f4acfc952dea9671ec5507f4d86a1462131dae835318362b17f341e9575fe1dccda5cd44d257127a27232a197e05f79de5d7a8200d7a2b943161fa38de83937f SHA512 e5cd4944847c00ad7c6b3a87fa6f9a242f7f0b13c31f82e80c49b3b9ec07d7c0106669dce2868705dca073774826c5acc6f8ea1464c1a5c739145f1c2b28eb10
 AUX mmix-20131017-format-security.patch 2256 BLAKE2B 2481c33c024d84af03b289ec9f22c9b98cb27537c32ea9ef020943aa424efac5267d81326241b2d764eb292f373ed51cc30c3ddbdb55f8fa444154cf6cc5fe0d SHA512 e77cdf3d196356cc0cb09f322cc979e4c603592c8f9421764d6830df27fe627958badbd6726021f97bc42a0d9551e4d3b39ca7b1d677b44a543ffcc04028eaea
-DIST mmix-20131017.tgz 308016 BLAKE2B 195c4945c61584842af08af891dc2e26672194aef66ff71ba6dfa18bab4e7349de013aa1c3ae195d9d6a69ee4ebc61403acf558a06af86393d5b053920ebad55 SHA512 e816b1ee9205b9f4a2e25ff183c48736ea66e63721a49f0b574850c5872ae85a6e847d802a01b5aa120ac969638d5d05e9b3135512d9362a4d672564f1228922
 DIST mmix-20160804.tgz 308410 BLAKE2B 8bbde51921fe23f016e35bd51346e6445d530815e5e87bff44cf17e081c6b8e55dd6bd24f1ce1621851d2eac309fa44d71aa33d93d3ddfce5213c6643181d38c SHA512 35c518227a4ee40d0aa3be02eda2ab8b2a27696fa789f5007a978419d07b3deebb7f391895e63e3556aeb38dc1ded3bddf2b860125ebf8f7848375e90dc7af75
-EBUILD mmix-20131017.ebuild 919 BLAKE2B cf768d35c5cc4ef369d330bbe79a6651d4ed70b283a866cd3a9750b2a2b9e2f62fcaf6d6352c0db6d34131d5262a8799c8baae103620ca30dccd2956d5328017 SHA512 a963ff9532745b5b974d594fe0790e210f532d20ae0e15edcedc98c815c610a48f05187412658ed12971d947f4902f77c64769ab4414119c255f2d16c8860f81
+EBUILD mmix-20160804-r1.ebuild 983 BLAKE2B ca15f7f49483f7317134f0f73988d7f0d76a64ada9ff48e0816b98bb54b0cb4878dc548287f3d826955c5e9073d4f28defb3d4c6086888bb45d60e21f215795f SHA512 f343cb4a877fdfbf4db9b881035e038433c53e8f87805ff6fc8b8113cfc83808f8d3d6961393b5eb91ddc373af28e5f33eecd7e036d8303ff91163d60b83366a
 EBUILD mmix-20160804.ebuild 897 BLAKE2B 73ed5c7dd58a01f3add173362531ceb2b580dc143ab38dff075803d0b57b9fc4f16492eef64bcf2a0a5f0e41d948c2b9daf69b2a154178c4854360bc9c4a572b SHA512 a7a1e09dcc81b30e124816c33c61d2686ff958bc85f6a15010c2964e6ef3261a54a5bf7656dd1afbd8b5e409fda609fb4ec45cabba3543bf99df284cefd303d4
 MISC metadata.xml 359 BLAKE2B 8e1746961e93d5df12f25907921a6186e3ae082de593f976cc4a253a0fbe9f33e78b6538b4a33e958f73bab2d20179eca1b54301240d83d16471c4acee95426c SHA512 70c8cf6e10f42baf6d223ef0f622465a8f196b2935276c793d5961e6304478c0f03231ade7c3e776e9bffb70bf53c550aa23c8a65ddfac1562c71314d85fb622
diff --git a/dev-lang/mmix/mmix-20131017.ebuild b/dev-lang/mmix/mmix-20160804-r1.ebuild
index 7e736d6cecff..3d8f806d1bb8 100644
--- a/dev-lang/mmix/mmix-20131017.ebuild
+++ b/dev-lang/mmix/mmix-20160804-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
 HOMEPAGE="https://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu"
@@ -11,19 +11,20 @@ SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz"
 
 DEPEND="virtual/tex-base
 	doc? ( dev-texlive/texlive-plaingeneric )"
-RDEPEND=""
+# media-sound/mmix and dev-lang/mmix both install 'mmix' binary, bug #426874
+RDEPEND="!!media-sound/mmix"
 
 SLOT="0"
 LICENSE="${PN}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 S="${WORKDIR}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20110420-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20131017-format-security.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-20110420-makefile.patch
+	"${FILESDIR}"/${PN}-20131017-format-security.patch
+)
 
 src_compile() {
 	export VARTEXFONTS=${T}/fonts
@@ -36,7 +37,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	dobin ${PN} ${PN}al m${PN} mmotype abstime
 	dodoc README ${PN}.1
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index d7d46d771c58..05ee4f12d7ae 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -20,12 +20,12 @@ DIST spidermonkey-slot38-patches-01.tar.xz 7472 BLAKE2B 7585aa6f5a84d6ae21e41137
 DIST spidermonkey-slot45-patches-01.tar.xz 5092 BLAKE2B 0188a179fc741ab84a93aae1e77f8b765868ca716b8879661bfa678aef918998c9488db3b866a13c79ae28edb43ac0ebb10345b0471b717c4174c61cba9646bc SHA512 d52f038a7b4f7b410b5a1f94a55962adafc5906e7d85f605f3fe45ad49417c2b9d58d853a81b5d2395a2842c9780992d5a2c1a0e67aa77fb09f21aff9aeb0f7a
 EBUILD spidermonkey-1.7.0-r3.ebuild 1544 BLAKE2B 6de699a424a3db9dc3a30ad690d8991fef0387b1a87479b46301bba6cef602a67829b4ef4d36a0d58bad6b7e7b4a71d8fb3ae7312b8a2abae09b2874d56f4378 SHA512 abd9fbd84c61025a5eb1f9777179a3e49daa0ff9ad404ddd442e9a8ec0fb18cf279a7b0361616a340ebcf7ccc73883db09d1b3ed31d0adbf34124584cd7fac26
 EBUILD spidermonkey-1.8.5-r6.ebuild 4443 BLAKE2B 7fb0ece3fa8d690a012464feb74db7d900b225b47f9e5099940c9f85cad13d35e23b905462a90111a96b33389bc04fdc935b5297e3b971b171a0b13c93cdc4f2 SHA512 9e8a034549e8bcf75ffc2bc33a18b5aac3ecd85bdb7e5d69546f204f50fb7e2c7f6d675dea4c9347141549bcd562720376fbe0b96406c9ca7ec4f7d8b202f4c5
-EBUILD spidermonkey-1.8.5-r7.ebuild 3806 BLAKE2B 51ae4317a89c8addae96247d8f96ef8425101bcbbd546c144caae6d348be6d4b7b14adb7e2547a8651da4c763704a5c5079f6a716a6ddf8e6c44dfd2deb3fbab SHA512 24fe542517a36cf80499f481582742367cbd8ae6d0892db4698da128ad46e3594dc2411a337713fc44b40b8e80a57d87c43cd7db6e21b4ef6ad5a207252832b6
+EBUILD spidermonkey-1.8.5-r7.ebuild 3805 BLAKE2B 8e54cc32eaeaf52e20a5779c85a6660d647cd84204e3586a1446d0dfd196f2090ddcddddc0a89c1dd5971b87321ee59786d2e20fa3049074849c7da0e761aa9c SHA512 47bfb1d78871b7de1032c0af03e807177e7db0919e0d1e8e88d57b40472d9578276e474290a7ae932477ef114a8472c663d7fa4903c87108020379246d98c212
 EBUILD spidermonkey-1.8.5-r8.ebuild 3843 BLAKE2B 1341cdb05d788b2cb55483340182fb933a476f6cbd2fdf6c3b18e9e3ab3569c286fd1f4b030dd539555ed8303e5c85caa530496d4676a7746ce07010fd690a24 SHA512 261f63aca868ac6fa45dfbe566a31e9cae46a245ef844e015fb8fbe045f45f1adad32aef9c6f6a4253d960fc35ec88a194c9b106a0df094dc4b5b14876606995
 EBUILD spidermonkey-17.0.0-r5.ebuild 3563 BLAKE2B 4b5294071559ee1e8487dfa5df388e17fb357ec8898f6e4390c1d3540a89647df04245e4c33706e52080236f9fcec7422a2cd0463f1f78feca1afc42f1d29e40 SHA512 6546f0c8bc2e7b1baecd6d616550977d83079c71ee973ab811a9cede0612d95b892a5f4d02a4a4733b5e90fff9795cdf50531e41f278fa210c988467931433bb
 EBUILD spidermonkey-24.2.0-r4.ebuild 3989 BLAKE2B a859c05afcfe262398de5f0b4d0c148eaf2d94f57e9f029814982efcc740acbfc8349e756f75b3ce83a746571e27a31d88c78126b1b1e0cc9154e4b86f53dc8e SHA512 ca080e9993b2c10aed9abd0d54bd0722e8f4a53ed755f60389e9bf6b0d3347115ca7cc347b708592619ef69f6f1f38e5c9778c949f7224e579e7da09cd269067
 EBUILD spidermonkey-38.3.0.ebuild 3869 BLAKE2B 261c49b9ab0c2f16fc782638b820e7ea34e9f09009a9ea9912baa1645a7a75fca5909d15482f53a55f17b72a10ad7fe27072976e4202b7381d57ede955ff0abf SHA512 c001b60b127eccbeb8e2f44f5995ad28496232a2eb663672876457476253341f2219e168784315f540c486558b97e9f0b5e49d914c39e1823a5b22ad14194ca8
 EBUILD spidermonkey-45.0.2.ebuild 3980 BLAKE2B 8f5b8aaba2c9ffc9adf16ff14216375434ddb3511add9817022e2913b41b415fdb3a2899ab341dc3e389460dbdf6d00cfb86270e8fd7a8de78eda6bbfc73b6ee SHA512 f99a6f6385e9cd39b8f6acb63b4c5f6e05250eb475e7906c6b06251c2a3de593d2617cbed3ef9f5c13b6009bcac6cb9b989ec362e0bfc6e351adcbec033d2806
 EBUILD spidermonkey-52.9.1_pre1.ebuild 4240 BLAKE2B ec3b753116391474fa502fe3dc099de67359560a241065b3561bc3a077c81603232d5c64529d2859b01410d6034851fcb34bcf1948c7ea192764e57c357ee247 SHA512 2b316ed24ac70a488f6c645646f8bcae883fa65c391fa0568fee1f82053974cbd5dbd1fdddf0b016ccace4393e5d51bb796ae1daa4b9703a01472681f9e9bb06
-EBUILD spidermonkey-60.5.2_p0-r2.ebuild 3809 BLAKE2B 5a705cc0996403853307b7e985324443e45e71380fc7689fb65d95efca3940fda30efab6553132d47036ea77989379c8af4113746ca29d5cf9cff2a20c4461d7 SHA512 d9eee1d45178e63f130acd30c818dd0f129e3b5f332aee9b9c93a31358b19f10f4cccbdad21e26c58da56b00352433ed2ac2ae69f7f9753bf275648ecf48338c
+EBUILD spidermonkey-60.5.2_p0-r2.ebuild 3808 BLAKE2B 3c0b02bd9c5c0843bfbc2b9cf729345f14dd82d2716463412ae643e063756241505e8bc50ceaf93bf5839a91062184763b32345dc655b55128fa0981d76143bd SHA512 aa1d4d6eeae335a0b6075207260c4a3f63d887e5704b2b4e37988a4899a7b125369314bf4f5e079dea4efe3afa8744f0b991d050fa4e4578765d913780929d14
 MISC metadata.xml 906 BLAKE2B 8557bb4bfdce358f543be3ff571177d61beb5713ba6fa4c24c8e91522ca30f8c5b1bf42abd0324164cc6febd04d07c1ae3a311d6d68d62992be6368c20650ca9 SHA512 a411a781913fe81801799d4d801645fd8029ee4fb727431589cb948f97464edd828b8d86969b2207880432db8e8e627fad829fd95394fa121bb0ae97ae8249b0
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
index 67892262112c..8c71d901d9d9 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
 
 LICENSE="NPL-1.1"
 SLOT="0/mozjs185"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="debug minimal static-libs test"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
index b22a71225678..3bc29e90ad3e 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
 
 LICENSE="NPL-1.1"
 SLOT="60"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="debug +jit minimal +system-icu test"
 
 RESTRICT="ia64? ( test )"
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 45d93fc5c24d..69027ca20465 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,7 +1,7 @@
-DIST swig-2.0.12.tar.gz 5312394 BLAKE2B 1866f293f4156fd6373e8c30811bea9a54d75adde70408f2adeebdf103a6519eff9c9b9d06984b6c390f2c5447fd38e9280cf52ee3dbedda9c693f7e6b1ed914 SHA512 7969cd8ce309ca46316fa4851b5cdd72122cb075cde8c17d74ee97969cd9555eff0d995f60bf17ff4090c83f66f6c66df2c61d9c06e2e30a2b36a4b8204c5890
 DIST swig-2.0.9.tar.gz 5307341 BLAKE2B b6367bfd1e66f6622205164d61659e10fc893c6165573c3ef5cbceb479f1f26249bb4f8e8d825e8a1f66356ceb697eac9ad15ba7cb91b969a177b954c9a82801 SHA512 9967eb2e1733c11ceb813bfa18c8c4187ba527d45de9b2ad962f287afba9cb0e1432b921670c5fe07ed31decc2e2785a16f42f69148a4e8a1959a9b66ce2e91f
 DIST swig-3.0.12.tar.gz 8149820 BLAKE2B 05ce913dedbbde26592619e0edc65050cb31a517f309c1188252cb8c276147cb28ebf4d8534c31b75c4ed8be5d42223b432a7318bf8eb5b2d4d528e5ff9a781b SHA512 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb
-EBUILD swig-2.0.12.ebuild 855 BLAKE2B 4e7217071e091ade918147d72b6649f60e24583fc59a84fcba118904fe0b9a406bdff92f83bb0e1280fe7b38f5d3f69b4657c339260abf3c2a89c6ef0c0fe7b9 SHA512 c11a8d13d3959a3b045b7acb0f214419bda6076cd220929ae59b7a3f875d5baf9e20237b58bd285ffdc567c21b4b72250629bc15d80c9d3d4a61e17591155262
+DIST swig-4.0.0.tar.gz 8052518 BLAKE2B a34eb17d795ba5b34ea7362f8f07d6a6e82fd4394a0159fcf608ffb27580f37fc722c4907f1fd6fa3322663662f8e11fecbcb2bc7b90405834ef35d6218d65c7 SHA512 c897b87fb8b21caf8d1bee2c39cb9675a3b0ee047110e808c310a2787f8b89585738726e9f517c64e9d2f1b8311136365c569528f399b444b1081f69689b7165
 EBUILD swig-2.0.9.ebuild 832 BLAKE2B 4a1d6d9e1f5877f912c0dbeeee0a6aad9349637cb9be9a8085aead2b197165a72d0a249fd328b8fb1d183dc2317826b68db52fc374d68e351d2675cbf9590ecc SHA512 1b15b0e0dbe983176c0c22a80adf37f682a68019df344c896ba3e62d91062a5a8c0c61ba7f03d324c9aa162bc668266cfce907e46c58525b38900a3a7905eec6
 EBUILD swig-3.0.12.ebuild 874 BLAKE2B adeb33d4c48747d63cbb3cb7276ada3704503f12de57e770348b058059b7eff9e66cab69c6291450b1b4d32c76ce0c31ca515d21967b0f841ceb8f214d794b8b SHA512 ca9794b8e1bb0a7ba148d084f432a7674374c895414866724dd2bce987df807f8a5ba577eb88a2bc578c2a409db3529c6eb7552cb27066b35378ddc19d522c68
+EBUILD swig-4.0.0.ebuild 884 BLAKE2B 76af24175c5f68a91bf3a68f820cb3778cb873ca1de232f32d6b4eec6b45441378326cf5620e49694356243f8ac52593144dc3ca784418e3812916ebc121eb2d SHA512 c1f42572ff9133638de7cc6768a8654095490b4705cda4a1b43513c298e1e3706f4eb349cee61a1cee9a9f45eadd1280136a3729d1f7d30daf61b350c1adf481
 MISC metadata.xml 1076 BLAKE2B 5cf4602a8a3a6c27f8b5dbbc254b1ca40d6d7a9f843292181ddab8a2f7882e4248bcc8405c1e768acb1f42dde26d9d105fddd61e14d4154a80ecde1e4190e132 SHA512 ca1468d9c5e22b88727c0f807a3d8cf427793c72f713c96de0f0bbc6ca0144db5280f8cb76eedaf7680fcea851d2c276009e16afaf1b43dd5b14d9832ba0ae78
diff --git a/dev-lang/swig/swig-2.0.12.ebuild b/dev-lang/swig/swig-4.0.0.ebuild
index 7fb32a4640b0..c8890ea11170 100644
--- a/dev-lang/swig/swig-2.0.12.ebuild
+++ b/dev-lang/swig/swig-4.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Simplified Wrapper and Interface Generator"
 HOMEPAGE="http://www.swig.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
@@ -28,7 +28,8 @@ src_configure() {
 src_install() {
 	default
 
-	if use doc ; then
-		dohtml -r Doc/{Devel,Manual}
+	if use doc; then
+		docinto html
+		dodoc -r Doc/{Devel,Manual}
 	fi
 }
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 708cca58f774..41301e5909e5 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,5 +1,6 @@
+AUX yap-6.3.3-fix-gcc9.patch 1112 BLAKE2B 7b416b83d33c71f787557692fa0a5f0e955299e979adc13f8717ac5ac84af4798db7011ee461aaa78dcdc428b08897b181d45869f8d08b110240c62bc09ff3c4 SHA512 60e6c1745bda4691d61b1fcc61b96d8f0bc806e2788da152888d0659dd1eb0113bdd584d16d084ad398fcff9a613a856b5283b906a935008b1d9a3c092f03d6d
 DIST yap-6.3.3-gentoo-patchset-11.tar.gz 6021 BLAKE2B d83682de9a6f095482db66f4fd5bb562739121b8502464d92fb784c634bfbfc020ae3ec55641aaeb8c0d52ce5534f7888bdd7d3d556f68c749b2f0ee35860764 SHA512 d9645a6f5c2b633fb5b61f8b6219ac69ae28e4f53f149fcdbb161cb7a8226aecab64f831a19e73876eb5056bb9efc3501fe792b6dca418a2a56b058ec658a2db
 DIST yap-6.3.3.tar.gz 7879301 BLAKE2B 1b12a3113dd57634df64680726fd49575979b84126a7a9e1f4d1429be90e1b95599166151ffe62c9ef990ac3c32f57a1efae081b864fc22225c93d21807f412b SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80
-EBUILD yap-6.3.3-r1.ebuild 2857 BLAKE2B 5412e16a8b26b285aa7698138219650ad8a3ab4ba7d2f384d4e9204930ca2e9b273722a5122df8570f7c24f9cdd595f28945ebb87b952fad23e6463b613bfdff SHA512 408ff3711cf15b5a25a7e9115c884cc13c6b79053345fc1b769fde00a26e0ee1877ef9368b35100af354a17b863073efe54c793b4e36ca49d4341e251867a7f8
+EBUILD yap-6.3.3-r1.ebuild 2900 BLAKE2B 8cec748656cbe10c153776e09214b97065ee4b95bdf32273a36970a3d00af248c79d14226266d582a46ec5743da84dc7eafd32643ad5c701646483be54d4b2dc SHA512 6194bbd1aeb83e7484390d860959f2d7ac38dc57703f14e7ad41184ba1d462adf7039b90e9c84e66987836be4af5f93398f2ffa3fcf598d91fc0e3e1d193f818
 EBUILD yap-6.3.3.ebuild 2869 BLAKE2B 755423834f09ec5d57b0e568a3fbc8c3639eacf8ac3db2d3048a73685af7c7cc3b8caf0628d31436e9045e6828c21de18f984662ee94eec1ee4bc586579e885b SHA512 68d0234ff375d36bd8b90c2b3375285684146f1b61b16c1a2ae7ba4a0e957f197cb357634be75395dd11f8ef43f6526e0300e0ed53da800faccc1688f32bbd23
 MISC metadata.xml 314 BLAKE2B af1c9bedbf26431e7a624c520a4c93ca9eff16f2539741b01ccf5da16c710c82d3820e3ad647a36a4629dc7b316a18c1b1306314200843e1d4d6b95c8c829442 SHA512 c5bd279aec3b80e6c08dfaa85cf091cbfcbf9380f1e5a8a0fcd6f27297368b92906340ae9dfd5176f37d36e4fb61ca772448c0248121d8e302c181bf670e57bc
diff --git a/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch b/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch
new file mode 100644
index 000000000000..f16d29142215
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.3.3-fix-gcc9.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/686048
+
+./SolverTypes.h:122:20: error: friend declaration of ‘Clause* Clause_new(const V&, bool)’ specifies default arguments and isn’t a definition [-fpermissive]
+  122 |     friend Clause* Clause_new(const V& ps, bool learnt = false);
+      |                    ^~~~~~~~~~
+
+--- a/packages/swi-minisat2/C/SolverTypes.h
++++ b/packages/swi-minisat2/C/SolverTypes.h
+@@ -97,6 +97,9 @@
+ //=================================================================================================
+ // Clause -- a simple class for representing a clause:
+ 
++class Clause;
++template<class V>
++Clause* Clause_new(const V& ps, bool learnt = false);
+ 
+ class Clause {
+     uint32_t size_etc;
+@@ -119,7 +122,7 @@
+ 
+     // -- use this function instead:
+     template<class V>
+-    friend Clause* Clause_new(const V& ps, bool learnt = false);
++    friend Clause* Clause_new(const V& ps, bool learnt);
+ 
+     int          size        ()      const   { return size_etc >> 3; }
+     void         shrink      (int i)         { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }
diff --git a/dev-lang/yap/yap-6.3.3-r1.ebuild b/dev-lang/yap/yap-6.3.3-r1.ebuild
index fd653ef29268..3864fe27707b 100644
--- a/dev-lang/yap/yap-6.3.3-r1.ebuild
+++ b/dev-lang/yap/yap-6.3.3-r1.ebuild
@@ -29,7 +29,10 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	doc? ( app-text/texi2html )"
 
-PATCHES=( "${WORKDIR}"/${PV} )
+PATCHES=(
+	"${WORKDIR}"/${PV}
+	"${FILESDIR}"/${PN}-6.3.3-fix-gcc9.patch
+)
 
 src_prepare() {
 	default