gentoo resync : 19.07.2019

39 files changed, 815 insertions, 333 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e7a4bc3cf01e..48c354d8f777 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 4e1b73fc81e3..73fd7c719d0d 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,12 +1,15 @@
 AUX elixir-1.9.0-disable-network-tests.patch 494 BLAKE2B 384ec581931a59912a1f494489310a35031ada9962d847855bc9624fa4b96090f5aede7e21076622dea1e7f5bb3a86968479e203738488de6d79659c6165443a SHA512 1a2d46d81adbc76acc726947dc2c4ed7450a4291071d1cd8c9f351ca41675179bb6d4a3a3215d93556485888c433e73bc64cb074d572e72f1b983d77b64da7ae
+AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
 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
+DIST elixir-1.9.1.tar.gz 2248780 BLAKE2B eaed79628dc7d9b9594e08ec7eedce6045297dc01220d5789e63b4b257fdc6fddd5aa4a61cfedb315692604ffda96060e18646097860dffada78dd05f2a722c4 SHA512 4cfc672d3a2d02e044ffa305ae2986658a431a264b7e06b0fde1773d8d062bde27ea06f0d31433107ef8bfdf6e931c75c6a39de81bc54b275e06edbe0cc87bda
 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
+EBUILD elixir-1.9.1.ebuild 759 BLAKE2B 7cb212774fd78177b047645ed8d39cea69710565ef1c6bc3aec2e8b3a30405fc39a869d2865a6cc54bdb3e285ced1b98df86fb27b17e6df9ae3a189d4d2d3951 SHA512 6b134a8e901fa6822423dcf1ced4867072088af892048d6d50fbe0d7a625ec398ab229f13c2b2add56aaeb0b4a28f6ff67bf799bdf2e32861f2eb8413d26fac7
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.9.1.ebuild b/dev-lang/elixir/elixir-1.9.1.ebuild
new file mode 100644
index 000000000000..9771a0da6d92
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.9.1.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.1-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.1-disable-network-tests.patch b/dev-lang/elixir/files/elixir-1.9.1-disable-network-tests.patch
new file mode 100644
index 000000000000..0f7e2965d689
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.9.1-disable-network-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/lib/mix/test/mix/tasks/release_test.exs b/lib/mix/test/mix/tasks/release_test.exs
+index f200c3e..9b2c75c 100644
+--- a/lib/mix/test/mix/tasks/release_test.exs
++++ b/lib/mix/test/mix/tasks/release_test.exs
+@@ -268,6 +268,7 @@ defmodule Mix.Tasks.ReleaseTest do
+     end)
+   end
+ 
++  @tag :skip
+   @tag :epmd
+   test "executes rpc instructions" do
+     in_fixture("release_test", fn ->
+@@ -333,6 +334,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 8f78c87ea0a7..777f6a5b9105 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,8 +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.init 534 BLAKE2B 34230f6c6edaed48123369df02f5fb71deb90491ebbb6d17984220dfd4615e029fa14aeb15c01ced15f98ec42aee256896a9b9680a4cce5d93e815c2a674efc3 SHA512 d11ef840a0edddd111da6a3c378756663f7337cb79713c475ccfec7e8a828fb4ef9f19f85d836ed0761cd9341d1242d687cf38ed5bbe267b4db5618c03ae6141
+AUX epmd.init-r1 457 BLAKE2B 1aa451203bf629a1d4f752ab87a91c0a27ade1a74f8edbd69b9dfe7d667bf68e4d41fc369f4aa1b67e7773ee96882cc0c95721a53b43122abf25b69600009527 SHA512 e0e507feae94bd3b6897c46c67c5a74a28771c3c9c367662d297faef52a1336c202c532a0c04f84464bd1829076bd8272244cd018e0badaa4f81872de00d89d7
 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
diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init
index 4b58bd74682c..92318d051bff 100644
--- a/dev-lang/erlang/files/epmd.init
+++ b/dev-lang/erlang/files/epmd.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2010-2018 Gentoo Authors
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the Apache License, Version 2.0
 
 ZT_ADDRESS=""
@@ -7,7 +7,7 @@ pidfile="/var/run/epmd.pid"
 command_args="-daemon -relaxed_command_check -address 127.0.0.1"
 
 depend() {
-	need loopback
+	need net.lo
 	before sshd
 }
 
diff --git a/dev-lang/erlang/files/epmd.init-r1 b/dev-lang/erlang/files/epmd.init-r1
index bdd441b997a8..eb387a729580 100644
--- a/dev-lang/erlang/files/epmd.init-r1
+++ b/dev-lang/erlang/files/epmd.init-r1
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the Erlang Public License 1.1
 
 pidfile="/var/run/epmd.pid"
 
 depend() {
-	need loopback
+	need net.lo
 	before sshd
 }
 
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 7c45e977937a..f313cbb5475a 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -81,6 +81,8 @@ DIST ghc-bin-8.4.3-i686-pc-linux-gnu.tbz2 117028296 BLAKE2B 0c99a2f6fe4af4a1342d
 DIST ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 117537996 BLAKE2B 2be0102fcc0f1fef5aae194620a43c1c90538215d4eec2550419634ed9c5bbfb17391d57519c20ab53987a36b42488ac43ff968690a4f65b96c52c3485589d10 SHA512 5f26810ec1f0a483f03ef01f56130eba0287b49b912efba03158336ce521000b611192cf021b72c1a0d902532cc4c9470ca1b3233ccba7c7e7c2ac490c6099fa
 DIST ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 121639881 BLAKE2B 51d223b654ff23bbdd594801f4ec92b016a58b952ba98007abb56c1c4b184a672e51eb9847b42160febcc4ada0f28f18325cc27f8a025dd9fcf656e3bab73918 SHA512 6b58b080c5fb18ea7b76632b4b48726af61b52d8829f57a2ddd55e6bc109c1fe1a133d2a0ca974a168ffee0013a6dfdc4922577bad01c50a42dad8b9db70e061
 DIST ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 121695747 BLAKE2B 39c745f5f9946bbae622e09bbdabdde4d62eec472fe14e693f37cba6b93ff66e4e56f66df8f0f073686339d252dce71f79f4c2aaef620c3dffbc26a67b1119c3 SHA512 c60bac50e7879bda1d6dcc7c1f12fdac915b18c3ebbfcfad575b2b01fcb57a487496ce7935f7ee4ae934162209ab66370fbcc8a4f021628e5f9a2aa7ef95e119
+DIST ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 121938050 BLAKE2B 17b6d15af21390e28a025505da76d39a2f8656f74c88a81fc75e7c8e799e54171c0d964d8a977c01576603a781c139b5363ea79eeaa2252622913d2a08a79f0e SHA512 9eb33b4670ee15f53c988885a119f3ef7be896ddcb318019628cdd04e21ec0c61876e08466d9d10d6cb1e16d89cd318e0ba42f0f0ae512f48590fe87483739cd
+DIST ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 121728723 BLAKE2B 6620b2a116b5696dd2d776350a43251c093e117338a4407ae8c41ae27763a4614d7e761b2684b90aa9317dafe7cb67481a6bc141c812d335d5231724ae3db2a7 SHA512 69681eab137f6713339f8912d0d92f6af865630053bcd7a32cb8a31e01628e969951db976533196794fe39e0e57f0fcd8778d9fc9fed4f4231e965b9a603dd8e
 DIST hoopl-3.10.2.0.tar.gz 241940 BLAKE2B 0ed7bf80486767c81415f99da8780a525401c388dea0b3f380bbecceae9cc7f66d8b5d0d7b31f8cb41796309b7a93adb113485efd14882f8af321989ce900a9b SHA512 083baa8a5eb53247aff8d5b9b2144e0f63adb9400934297bbd80bfcec607dd90a34def4301045a60472ef10b0fb90ab84692fc08f786e7f806c28afdab1ef66a
 DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
 EBUILD ghc-7.10.3.ebuild 21670 BLAKE2B ad406c6fe4ac067b365b059fea1621799a322489ed783d7d76b877c64d84625fc4cb41d2e0c5f9d5c67ebc7dc780aca5a095c76f7260694355bfba128d2a7241 SHA512 82d5dcc2c7e6cde053687d1d0c541584d00c56bbc03495728ae46af7d805a37f1c0caac9b60a9989462b60dcd4faa6bc8fd2b89c4def4b9b2619dd2701ffc21f
@@ -92,5 +94,5 @@ EBUILD ghc-8.4.1.ebuild 24601 BLAKE2B 09e125fb16efc35e009e063c499f984915a3bb358b
 EBUILD ghc-8.4.2.ebuild 24826 BLAKE2B 53724f5db186ede625576b4b25159e27f6a29f9427538039e10edae2abc1cf6c9a1052a1f2a1108bcdf66b345bf792c8f780e03a52fa39232a75776d632c27c0 SHA512 435a51876f8a79c6f24f68775f49ce25d7657af00693729169be0ce17d1ac424f7f026cfdf423d7f8d9254cd11a0ff1fbc279d84f26e180506bbb65cba946ec5
 EBUILD ghc-8.4.3.ebuild 24771 BLAKE2B 8d442d26f3f7fcd08ed3c9fa12b9e132439c5765f07ff067fc42942670cb345d712fcdd8f09f695f018ab56f43b7e9b53f6168ccd58d69661ea53b7cb278bf17 SHA512 6c9eb37b06c25905637d3c15392c110849e139b8142d44408724d6c3bcce625371ef0dde6e18677ccd51c5b9bde415872d56eba30003c297d533d8820fa0e88c
 EBUILD ghc-8.6.4.ebuild 25240 BLAKE2B a627ed3f9621e71f2a7cf3017bc2af55b25c804fe89bd23b31aded536b2c703d25a824e895dbf1ed92dd095a69f09a8ef2a1d543ee4eb622092123a0e71f4e52 SHA512 c9f0035f5819b36bcb6798430fc7a61ab421709c37351700ec4ea1b5fc96415b61bb19d16c909362f0b71ce778a46662376c4b72c5248ce307a6cdabcb02a40a
-EBUILD ghc-8.6.5.ebuild 25207 BLAKE2B 13c240e862dccb405fbb8aeed04cb5d049a0751733205cceb3a533657a752d9903aceee5fbd13a5128658e86e62857c7d656d7cd895428aaccf03a8df853cfe9 SHA512 6ad7617199c2615a7815dc8b693d173887cbebed5874eeaeb07fc3179e2e94132a3875ec86430ab78b3c57272e653a6b51dd6f83e2f694e5729fcd4bac5d8fa8
+EBUILD ghc-8.6.5.ebuild 25268 BLAKE2B f4155d2fc9ea6e8fc2217605a6b3c4aafd45b2bc3312b988feec319318c976039e5a1fdb797f98767f57f0cda71a2fe9d3b3ec298266ccae54aa9fb530efad2b SHA512 249dbe3229db1891563a892f75b24dcab58b1062c4de29332230ae8fdf14c5e6dc31b91c80b83632063590a7b7db306341c32fc041f19698efaf13459eedd7f9
 MISC metadata.xml 562 BLAKE2B 98c9bbd3aff50f05f27fe1682524254728413e53820650c91dc0eab26beecb2b682032d4b2d9c99a339059a2d8c4d007711d0dfbd3e47e5306fa4b5304f6b01d SHA512 dff79157435350067f74ae396556346d087e8146e61afe2b9739217b5d0dce6a589dd87705c7626d0c1c16da29613d9f465d357c283fb6c6df2332fec2b269be
diff --git a/dev-lang/ghc/ghc-8.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild
index 04327fdfc430..379ebf395c3a 100644
--- a/dev-lang/ghc/ghc-8.6.5.ebuild
+++ b/dev-lang/ghc/ghc-8.6.5.ebuild
@@ -27,12 +27,12 @@ BIN_PV=${PV}
 #arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
 #arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
-#arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
 #arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
 #arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
 #arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
 #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
-#arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
 
 # various ports:
 #arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
@@ -43,12 +43,12 @@ yet_binary() {
 		#alpha) return 0 ;;
 		#arm64) return 0 ;;
 		#arm) return 0 ;;
-		#amd64) return 0 ;;
+		amd64) return 0 ;;
 		#ia64) return 0 ;;
 		#ppc) return 0 ;;
 		#ppc64) return 0 ;;
 		#sparc) return 0 ;;
-		#x86) return 0 ;;
+		x86) return 0 ;;
 		*) return 1 ;;
 	esac
 }
@@ -71,7 +71,8 @@ BUMP_LIBRARIES=(
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS=""
+# to be rekeyworded when most of revdeps are updated
+#KEYWORDS="~amd64 ~x86"
 IUSE="doc ghcbootstrap ghcmakebinary +gmp profile test"
 IUSE+=" binary"
 
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 32ea545a2f6d..67d6ff044daa 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,11 +1,10 @@
 AUX lazarus-0.9.26-fpcsrc.patch 407 BLAKE2B c3b006fd7bb58fb7037aae3d8d35ac146ab971fc6063652e3185b320e4cb05ccedb6c26c7d64b2f2998a901608ee251762b723f62bd9c239a51ab6a6d6f2b39d SHA512 823d9ba2041f97c39d8ea5f49cb02f68d8c98da95d0a479cc65a638365e2adafd1c5645fa6846720af18198834958f37b0cc0d92f38023ccdaf40ec8dc848f64
 DIST lazarus-1.0.12-0.tar.gz 47687878 BLAKE2B 7a230f8ad433fefd514d8fca128e1ad127ea2a232c2061080d4146b5276ef82bd442be6a522a5eb4a9221338e8d13cf9d3cc954f712dfbc521d8fd74b07389f7 SHA512 2a106c4bff2135ace815f789057f25fea1902edc972503e883547d7cc6d50b585ae54676cba734cce616064864ce535b3a4fcd7892763d15aafdf262dbe24293
-DIST lazarus-1.6.4-0.tar.gz 57180961 BLAKE2B 930beda6ad04999e749fe4b76a64ab00b0138c18b0f3aea0cbac089ecb3f419aa4165d06757d6ee2d3c6e43401f2be5e154947d07f892a6bc5f4bb8831bad62d SHA512 d7d498483ef9e1eebd0d8ca2325d1984cb1297837ebe2f9547e67f26fc049c2168e2feeac739b8403c08a8251040e9161c962d25951545384ffbdbb076fda2aa
 DIST lazarus-1.8.4-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
 DIST lazarus-1.8.4.tar.gz 63130653 BLAKE2B f9b2ba9971f1a9a9c3b8d2004bd3516c12db5384bb6243ef275c2fc0d458634fba0c1c23e7ecd5c160c1204d6cc2b4ebc340ce8bb5cfdd9c531f8c36ae59d1e2 SHA512 82cdc3c32dddf8e67c0bed9292a9a924227bab50f22ca479f5e98ecccbf60dd66c7f886ecb8e2979d9d8fccc3d25462ee8c55fcab085aa4194b4704660e0b95d
+DIST lazarus-2.0.2-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
+DIST lazarus-2.0.2.tar.gz 67092332 BLAKE2B 12fdca5b0d7c8bcad4f1c6a70c2ebb1d0974b0884cf89135be069744f01527fcd5b2a4b4c898cb500519ec3518025da453087954722cab43a60c1cdb164371d4 SHA512 0d2bf26afa3128104181fbe57b1adeaba3bb589b0a3b72598507825a3f08201d4480c6cff510a6f866dca4d49417fac3a2f68ca7e58fabe4f4e3bad97323c071
 EBUILD lazarus-1.0.12.ebuild 2353 BLAKE2B 92b70e8ac8a040c9128547c343fdd0f751b5cb72c6cd59c87724151bec4c8b593ea1a04587784f368d8d16e71f13ea13d7ce2256bbd4a9a6018c6869a04a0524 SHA512 93e90953cd2d4390bb1317c3e15094f8fb11f9e000f37f46a58362a71995c6b37643056c254a05baba3294cd6067b18d2016219ae0dba6bcea4be809dc6090ac
-EBUILD lazarus-1.6.4.ebuild 2342 BLAKE2B f02a3c7c3a7e28fa754f560003761fb44257a0f49694c45902f134ce5f5322ece0d94633e495ab2547ee064abd4973f8378e61368c316fb0b451b5737f28dc4f SHA512 348abd222125bf2449cd434312209aaf758ca7f0dbd65a66b985e7afc7851ec71494631c0f2f86e39557a26e949c95afe99327cf0b48a363d6eeee26fbf4a294
-EBUILD lazarus-1.8.4-r1.ebuild 3052 BLAKE2B 9c7a24d205aaa02aacb3e4b1897517be59451a5153fb789a5b1efbb490053944373248a1eba6de49e4601dd3c94a8b49fc51c312f0670d6de6ce8257eee68dda SHA512 92d017993044ade9135e0a9d8fc8cd60415763df404be1dcaa1788d1ebc500a34f3d2dcee604e91aa863c99f3168cf71160c972f7fbcac00b0cb2bf4d24785ad
 EBUILD lazarus-1.8.4-r2.ebuild 3535 BLAKE2B 6c154cbd78bf8167d47e6ed6e43de43b951cf0b388a84b7318268a14a6e99de786a300c51062448184a51ed214da68df620e1d5b41ed5006290d6e75eae1fc6d SHA512 af502f83fc9e3d03bc5888913923208a4b9f35ae52a9270f9b627044620a337f4fc0ba7c6c9ea3e5b93234d2bc8a5856ac3447b5c109052eb3eeba0c40372930
-EBUILD lazarus-1.8.4.ebuild 2285 BLAKE2B a04e012ce18d7c8d793043b82bff199c3c558d44e52a64d81037658eb9f19c26d8a15c50f5f0aad54e7285d11b8e5700403b1ab88687ad2c5e85177c1437778d SHA512 642ef819cdc11082b2530b7c06d60be77abdb22008e16b0a45313e4981d3a6b22bd3d7065c951826bd98ce285726ab52178e625d9392e7b273433dfa55499983
+EBUILD lazarus-2.0.2.ebuild 3532 BLAKE2B 58c6638d6b56ae1cbe073ca05d39e480da7526818a1d1623abbc560a41e793d4d348a1009852ee87889be11d098359c31464310d5a6ab5ae039b33c31fd0bc8a SHA512 6ef47f780e9fe5aa4b49c02c9a1e3048ee5488c14ddb4bcbdc9873d1be1bd53258d414402d9ba0466a0c975f3013ff70e166e05e857f1f1ec46eb35e9a945009
 MISC metadata.xml 516 BLAKE2B b4023336c3271703bc3912f9ab02eed6b57178d1f468194bdac5ac9b01027c5f7c847e776e9b1048a9ce29a4939055e3c00e289868a740c76bb2b7c0e6ff9085 SHA512 991dd36587eaa2412af0fccac7664c72a1d9153d12b313ae151943d7c66ac095b3d2cbe61fe4d84c4566e196ff11e1c16c6ffe2ab6e00fa40fc2fdfe23cee524
diff --git a/dev-lang/lazarus/lazarus-1.6.4.ebuild b/dev-lang/lazarus/lazarus-1.6.4.ebuild
deleted file mode 100644
index efe6c7dbbbf6..000000000000
--- a/dev-lang/lazarus/lazarus-1.6.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-FPCVER="3.0.0"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}-0.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-RESTRICT="strip" #269221
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-		#sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
-	fi
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}
diff --git a/dev-lang/lazarus/lazarus-1.8.4.ebuild b/dev-lang/lazarus/lazarus-1.8.4.ebuild
deleted file mode 100644
index 5a5cd58c19aa..000000000000
--- a/dev-lang/lazarus/lazarus-1.8.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-FPCVER="3.0.4"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}
diff --git a/dev-lang/lazarus/lazarus-1.8.4-r1.ebuild b/dev-lang/lazarus/lazarus-2.0.2.ebuild
index 4564a9467aa6..8724ffdb8bac 100644
--- a/dev-lang/lazarus/lazarus-1.8.4-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-2.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop
 
@@ -41,6 +41,11 @@ src_prepare() {
 		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
 			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
 	fi
+	sed -i \
+		-e "s;SecondaryConfigPath:='/etc/lazarus';SecondaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');g" \
+		-e "s;PrimaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');PrimaryConfigPath:='/etc/lazarus';g" \
+		ide/include/unix/lazbaseconf.inc \
+		|| die
 }
 
 src_compile() {
@@ -49,14 +54,17 @@ src_compile() {
 		-j1
 	if use python; then
 		addpredict ide/exttools.pas
-		./lazbuild -B --lazarusdir="." --pcp="with-packages" --build-ide= \
+		./lazbuild -B --lazarusdir="." --pcp="../lazarus-package-config" --build-ide= \
 			--add-package ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/python4lazarus_package.lpk \
 			|| die
-		sed -i -e "s:${WORKDIR}/Python-for-Lazarus-${PYTHON_HASH}:/usr/share/lazarus/with-packages:g" \
-			with-packages/packagefiles.xml \
-			with-packages/idemake.cfg \
+		sed -i -e "s:${WORKDIR}/Python-for-Lazarus-${PYTHON_HASH}:/etc/lazarus:g" \
+			../lazarus-package-config/packagefiles.xml \
+			../lazarus-package-config/idemake.cfg \
 			../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/lib/x86_64-linux/python4lazarus_package.compiled \
 			|| die
+		sed -i -e "s:${WORKDIR}/lazarus-package-config:/etc/lazarus:g" \
+			../lazarus-package-config/idemake.cfg \
+			|| die
 	fi
 }
 
@@ -86,8 +94,12 @@ src_install() {
 	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
 
 	if use python; then
+		diropts -m0755
+		dodir /etc/lazarus
+		cp -rf ../lazarus-package-config/* \
+			"${ED%/}"/etc/lazarus || die
 		cp -rf ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus \
-			"${ED%/}"/usr/share/lazarus/with-packages || die
+			"${ED%/}"/etc/lazarus || die
 	fi
 
 	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 681426296638..8f72e70db56e 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,9 +1,6 @@
-AUX nim-0.19.0-paths.patch 934 BLAKE2B 08237a430441660a2d2380b243185c49301c80c9f5043319a7fc95419d9e8e84a4dd756bebef8692a396b80cef186fc9f9105e60a6877dca2171abee49d26d81 SHA512 c41fa08bd364af89557deca7e1f1a5d39c7e6b9e35b30b9f399465426c94953880ef4e7ac59acc1fdec70551ed5afbeb5de6b2fbd4d489d7b3538387bfa058ea
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-DIST nim-0.19.4.tar.xz 4284092 BLAKE2B 7fcc4d4c13cd5ab0b9ac7b98b3ffff99ffcb77d0a23bb731b92813b5d96f5ce88303cb0196ad425f5944744f30aa1d257dc90714f6d11c1a26726ad4512206b7 SHA512 0cf87368b51bc305935b350b63c535ed268c066258ef731b73c12afaa9a3c20760876e3c4bec46448051fe8bacb6c4f1ef84f2ec3789f601a4786408bf3da06c
-DIST nim-0.19.6.tar.xz 4166952 BLAKE2B 6be2cf16bc7807fe78e3d30d9533ab3c1eff1c2042c6af1aca0d7e8330597f2aaa363085f8da2448075be6cb1feb07186c28a32fb58f120af8f4db009dcd4561 SHA512 9728825e349570ec187c031725162b70fdb1a43229732d33fcfa61dde84fb6392c7265a456ce925fd7d1d782d7f9881398173bf69c0d1ecdbefbbb6bd57f6041
 DIST nim-0.20.0.tar.xz 4997088 BLAKE2B fd03837c1674052145cbed631be4d4028a31fdd46d8b730734781b65d5bbcd9cb118ef7ac14c1bc16f7e056365b5bddf32160bf84566ac4815cb12e330f8e712 SHA512 e41fc9f9337535d07ebdd14ae8195bf9c666a0a242516f24d50241e69d50e89fcb9ac1a0b1fbeee0bc75b0218aeb18698ff2ac87447005dad52dc18da80bb02d
-EBUILD nim-0.19.4.ebuild 1701 BLAKE2B 722d99d2d6c83eb62a362ce0020bdfcb50f1b185f5e8deaa09e1a12a7570d8496869d40c2c4bba09099deab8fcae41e69ccce0dcb9133692d0cbdfe974b32047 SHA512 8b54a7ef70bfd9143c5fbaaa9e3f5a77e3e19c6d926b90473e3732345b73f0a3dccc2a1c46a90ed3f1e684624b1e6e6061f3309c2ad464a81d561ff60064fdec
-EBUILD nim-0.19.6.ebuild 1701 BLAKE2B 722d99d2d6c83eb62a362ce0020bdfcb50f1b185f5e8deaa09e1a12a7570d8496869d40c2c4bba09099deab8fcae41e69ccce0dcb9133692d0cbdfe974b32047 SHA512 8b54a7ef70bfd9143c5fbaaa9e3f5a77e3e19c6d926b90473e3732345b73f0a3dccc2a1c46a90ed3f1e684624b1e6e6061f3309c2ad464a81d561ff60064fdec
+DIST nim-0.20.2.tar.xz 5032768 BLAKE2B 583e0b5cede279a0c0a60d4209f9be6237ff5ac070c0e82a075a242d08086e59c88c2ab29cbf3d2c6d7a455709b64086afd11e4928fcc9e81979d5296ef38b64 SHA512 231d95950ca5a7abe86175f93085ea27fae493e4f8dde3c9e086993431f9517781ceffeb4f9e761eb524523df3703d0a315fe53e32bc6daea6a684bf90589282
 EBUILD nim-0.20.0.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208
+EBUILD nim-0.20.2.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208
 MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49
diff --git a/dev-lang/nim/files/nim-0.19.0-paths.patch b/dev-lang/nim/files/nim-0.19.0-paths.patch
deleted file mode 100644
index 71ccb140d546..000000000000
--- a/dev-lang/nim/files/nim-0.19.0-paths.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Default to <prefix>/usr/bin install.
-
-https://bugs.gentoo.org/635032
---- a/tools/niminst/install.tmpl
-+++ b/tools/niminst/install.tmpl
-@@ -28,13 +28,13 @@ if [ $# -eq 1 ] ; then
-       echo "sh deinstall.sh DIR"
-       exit 1
-       ;;
--    "/usr/bin")
--      bindir=/usr/bin
--      configdir=/etc/?proj
--      libdir=/usr/lib/?proj
--      docdir=/usr/share/?proj/doc
--      datadir=/usr/share/?proj/data
--      nimbleDir="/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
-+    *)
-+      bindir=$1/usr/bin
-+      configdir=$1/etc/?proj
-+      libdir=$1/usr/lib/?proj
-+      docdir=$1/usr/share/?proj/doc
-+      datadir=$1/usr/share/?proj/data
-+      nimbleDir=$1"/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
-       ;;
-     "/usr/local/bin")
-       bindir=/usr/local/bin
-@@ -68,6 +68,9 @@ if [ $# -eq 1 ] ; then
-       ;;
-   esac
- 
-+  mkdir -p $bindir
-+  mkdir -p $datadir
-+
-   mkdir -p $libdir
-   mkdir -p $docdir
-   mkdir -p $configdir
diff --git a/dev-lang/nim/nim-0.19.4.ebuild b/dev-lang/nim/nim-0.19.4.ebuild
deleted file mode 100644
index 2dc958a2a86b..000000000000
--- a/dev-lang/nim/nim-0.19.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 multiprocessing
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${DEPEND}
-	test? ( net-libs/nodejs )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19.0-paths.patch
-)
-
-_run() {
-	echo "$@"
-	"$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	export XDG_CACHE_HOME=${T}/cache #667182
-
-	_run ./build.sh
-
-	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
-	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
-	# build nimble and friends
-	# --stable to avoid pulling HEAD nimble
-	PATH="./bin:$PATH" _run ./koch --stable tools
-
-	if use doc; then
-		PATH="./bin:$PATH" _run ./koch doc
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" _run ./koch test
-}
-
-src_install() {
-	PATH="./bin:$PATH" _run ./koch install "${ED%/}"
-	rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
-
-	exeinto /usr/bin
-
-	local bin_exe
-	for bin_exe in bin/*; do
-		# './koch install' installs only 'nim' binary
-		# but not the rest
-		[[ ${bin_exe} == bin/nim ]] && continue
-		doexe "${bin_exe}"
-	done
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/html/*.html
-	fi
-
-	newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/nim/nim-0.19.6.ebuild b/dev-lang/nim/nim-0.20.2.ebuild
index 2dc958a2a86b..bb41a8721feb 100644
--- a/dev-lang/nim/nim-0.19.6.ebuild
+++ b/dev-lang/nim/nim-0.20.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit bash-completion-r1 multiprocessing
+inherit bash-completion-r1 multiprocessing toolchain-funcs
 
 DESCRIPTION="compiled, garbage-collected systems programming language"
 HOMEPAGE="https://nim-lang.org/"
@@ -25,7 +25,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.19.0-paths.patch
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
 )
 
 _run() {
@@ -40,6 +40,7 @@ nim_use_enable() {
 
 src_compile() {
 	export XDG_CACHE_HOME=${T}/cache #667182
+	tc-export CC LD
 
 	_run ./build.sh
 
diff --git a/dev-lang/opendylan-bin/Manifest b/dev-lang/opendylan-bin/Manifest
index d3887809e250..0a6fb8659690 100644
--- a/dev-lang/opendylan-bin/Manifest
+++ b/dev-lang/opendylan-bin/Manifest
@@ -10,10 +10,10 @@ DIST opendylan-2014.1-x86-linux.tar.bz2 42086000 BLAKE2B 7c56962867348f8ec4de74b
 DIST opendylan-2014.1-x86_64-linux.tar.bz2 49625384 BLAKE2B a2fdf67efe41c0f91e071b83bb03c214bb596cba1e051a4014677c822f9d34a4d3efea21c3e8cb230b065c75e8ae040e157f5d1ecc48a0531fb152852ed6948d SHA512 4d88ab8c6916e82465d846b32a86da0ec654d40a2a1310a7b05897d9bfa325c839713f46f62081b968793b3713a61cb74158c405cb724fa5fdf4c97596e1c6bf
 DIST opendylan-2019.1-x86-linux.tar.bz2 48674460 BLAKE2B 24bb8a47c36fb55972a72c49acca74808dd9091eca9cf6dd2c0a2f3e650dc4f52d323b38f1bb064830b90859b130425a9369fd5791b6f1dd8e3b2123103331c1 SHA512 74338f8f5eb7ad886624ce206fc30689e087aa3620b724af0ef34be006f937c9228ea4cdf86b0b96b496f6506d07e90ae7d3429b01c7c9e1a80bd1118edfc437
 DIST opendylan-2019.1-x86_64-linux.tar.bz2 66704263 BLAKE2B 062c8ebec898594cbb8e446b30a5b1b37541c5a4e193f0f7afe7c73b90ac5c35a58dd4caa407f22708a0d2fd39ecf5ebd50a0eaf519b842997a524b15f7ee7f5 SHA512 172ad77c3e6f4e2248c9c27e28a7d9769578ab65c42af0228eaec41d9f950a284c44673191b48f527dcb2232a4dfa2dfec118a51b79e2e4742c1a7d157e07842
-EBUILD opendylan-bin-2011.1.ebuild 926 BLAKE2B 3f8b473d6f557962469672475240fc5d9d982f3f83cd4429e358e562842de638ea5dd08e1372c1cd4c2148f2435cf3bc8850bd9298307148a56a9a8dff7be965 SHA512 8ce68c1fd3638783c4478cd17abb4efa1e984a9d0679a9e69fd974ad7cb6de908481004064b57cff656176e6e2412c3173df21687c305e920c393d3f8bb4f5cb
-EBUILD opendylan-bin-2012.1.ebuild 926 BLAKE2B 301a0c9f81279725c83fc2456fba7159f3a7849da760c2e58556d2055bcf96029977df6b3ac9806d14747b5f504e98154c441574b7115bc8d6d7789702e85c17 SHA512 017254e4a8366fdb5e6a659759849cd62978f4c9dcdee59864210f86d96a972a7a14d7a8d650a9745a7d802c7d6417d25cb354f153240505fbec6639567123d4
-EBUILD opendylan-bin-2013.1.ebuild 926 BLAKE2B 28e5b976005508b925b5e20bb5ce82909b43840a3d37a60d6c28d1df98f5a75df8ec9fdb0273df9bf1932a3da1342a17dded7bbd36b3acc0e194d27a382f4663 SHA512 7da5b4e5b7710e80ef7f3fd3c2c350598a24f8b4942d60390781ccd2311ed8a04e329463737ef69efe9ae55d67aa33e5fe9fda5b53b8d7e399f27b1a5450089f
-EBUILD opendylan-bin-2013.2.ebuild 926 BLAKE2B ac665a2988d4e63ce7825cfcf744648130ecd7ffb450d481e8ff1d1bd6c0a667b8be5f591012a3b37499a779bcc5650617c6456dc8eec99f3558d03d9a7ad883 SHA512 ed47276b2d01199d27b407390a11d0815e601ee54f8d4bebdad7d2702c239acff6eb62f63712293e6c5de6e82fda92d4a179dc4fa11f498cb884890cc6ade75c
-EBUILD opendylan-bin-2014.1.ebuild 925 BLAKE2B 1b65b8a33d4e1ea79d40ad53aa01c53e201d6b4e4dc79f33091cdecca668e67a5c8b522e3335b0b35b910d3fadbe3cc372f818604e83419987283c16f4698fae SHA512 ace8f94560d7f9b8a788411b0436052473a6232b7eec1a19c8dab8eb66868d3fb67027239d5113a58353548e84ab84505cbc17e23853df82c820383a8fd5e771
-EBUILD opendylan-bin-2019.1.ebuild 942 BLAKE2B bdd893af446e60fa302d39e98ce8baf36550f49672e158077d9fd4cafd1413cd2c48165dfdaef6c96a61d0968649405fa759cdd7bf35fe7fc5bd3e594b758a9b SHA512 c8a57f824403a8236058f3c285106063020f95c78a9f8a1c64b4b564a299cd014c234b7a5a7605a3c2d9e1fafd485ad6bf74e957817efbab1c698d5b73c31f45
+EBUILD opendylan-bin-2011.1.ebuild 923 BLAKE2B cf5bb054863e6b7be1929ce426eda2b68dc5f2ee167075c8f25a0a3b50711bcd9c314f5528bcc93db3e948f9c4d8bb908b1d3357032a1ea9e99271ea57b2527a SHA512 ef393f9fa0ea4ae7bee05dadca1315c577c9abd7f2ff72d3ddf9de51d3ca1c89883330539a2aa143e83be22a8178db891536d47b4d6b19a4ecc8552d246c1edc
+EBUILD opendylan-bin-2012.1.ebuild 923 BLAKE2B 767041264e40a077b4c49be94da284837775305d638ad34cf4c837a6e1f5ecbc94c7d0efe2d0ae8279a6b0ab3af4c43bc48718b01c4805f4d2954e104c767ef9 SHA512 e8179745eea213675f816df256463661dde069ae57c11980357b540ce84770e9fc2e4101d4955b3fb7cbec62dce754d467000dbcaad6a3d818518b4a4b900a81
+EBUILD opendylan-bin-2013.1.ebuild 923 BLAKE2B 885136b342ac640e173b375ca84e7f59908714c418bae5f0312011ca00518dbd07ab98ff336bea2375b213c5edbc61de5a0df3483f26a2d9a78d54edcb312a57 SHA512 d35c9362abea48d4b44f7b5d630cbd43bf2ab584cf09221b5a282962794b62a3c215aa36267247d03b7e7ce2eb1b6ecb97c6af09acf05162637332828741a3a0
+EBUILD opendylan-bin-2013.2.ebuild 923 BLAKE2B eee0d59111a98d7d2c51748c230297bd1d406165a9eefe90e6141284b5229267266430b4a20882e01c8fcc183fdb88df9eec2a0ae2e2a2e1e55a15812239bcb6 SHA512 944b22fa0cd09adedf85def45dcdbb90499f047ae33fbbaa6fe6992f55f39157e5a0b2c39eba6deccd82fe06216a8d4df99270ff455c598dfcd60f5f737c242d
+EBUILD opendylan-bin-2014.1.ebuild 922 BLAKE2B 801323b005be4f5ce50e86d9c83a51c6a201cf17128523a70861913061becdf53e12cb7e36c80dd77269f332c4e899e2efe8e5083ae91ff087595154bf20d2eb SHA512 8ce55c0176921a96c7aec46b9fb4d52842e180d56fd1b876fbbb8d17b3c07952d2001ad3f35882c3717d32206d49289732f41d11a9d2b32ad91e145919ce13de
+EBUILD opendylan-bin-2019.1.ebuild 942 BLAKE2B 8e77d046d7f3be9baaf811d23a63be03b9c5af0c9682c32464887f5f1811962d39d62a646ccbfd7302b360a6d59216b0ebc4c1c7125e3bd2d3785bd2386216ea SHA512 292072e1c243fe5563e15ff324a4ed271981cbca511d85c6673161bdcac115c41e4f3f69cd1201c130c7e13eedbac5b0d936e7a6bf2b471ae59d1beab6bd65f7
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild
index 4c4230783fa7..34cbd5bb0e9c 100644
--- a/dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild
+++ b/dev-lang/opendylan-bin/opendylan-bin-2011.1.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=4
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-l
 	x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )"
 LICENSE="Opendylan"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild
index 6a3871016bdc..b614e1799771 100644
--- a/dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild
+++ b/dev-lang/opendylan-bin/opendylan-bin-2012.1.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=4
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-l
 	x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )"
 LICENSE="Opendylan"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild
index 2b6ea1a6a53f..8bd7c2014816 100644
--- a/dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild
+++ b/dev-lang/opendylan-bin/opendylan-bin-2013.1.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=4
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-l
 	x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )"
 LICENSE="Opendylan"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild
index 958ffac2c622..1863fb7604d3 100644
--- a/dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild
+++ b/dev-lang/opendylan-bin/opendylan-bin-2013.2.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=4
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-l
 	x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )"
 LICENSE="Opendylan"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild
index 98c52ea1d176..4ddfd8439d60 100644
--- a/dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild
+++ b/dev-lang/opendylan-bin/opendylan-bin-2014.1.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=5
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-l
 	x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )"
 LICENSE="Opendylan"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild
index 178291c8b680..b2aad75799da 100644
--- a/dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild
+++ b/dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-l
 	x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )"
 LICENSE="Opendylan"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/dev-lang/pcc/Manifest b/dev-lang/pcc/Manifest
index 349756e9acaf..5df7feb7c01f 100644
--- a/dev-lang/pcc/Manifest
+++ b/dev-lang/pcc/Manifest
@@ -1,5 +1,5 @@
 AUX pcc-1.1.0-multiarch.patch 377 BLAKE2B 5b5e86099aef3e173c194b535cbde726a41bb663e2754a848a920b2c967c5dab4b9041a7a879b7649fbb6eb8019eda46b7cfbd63bb8fa29067a9d2f7aa4b2466 SHA512 117f4a574f7d86a5d39b88927d56843c900aee539b07639072965f8c0b30120b5900dab3c7fa8d421c9dd6ea539fa0f5b55fd34be506652185f034d071f34195
 DIST pcc-1.1.0.tgz 848427 BLAKE2B f94dd3eb3f96145e3fd2d5d89ca5a3a12c55614924c1bd2ccc219b03b4804bb34904b7041efb6237e06982b3282578d996510ffc9adc916e212f6f7d1bcb5a35 SHA512 5bd2b59fbb323016d215023ce77793ae66766e8e8192b44bf0707ee444658022e1645669c13eea8c81bc55c161eea3b0271d6b3098b8a7d51ce67eb86c7527b4
-EBUILD pcc-1.1.0-r1.ebuild 852 BLAKE2B 6a661740e1a7653fda98ba1ba6c4529d2321e25a0ebf0fe048b61d9ce2b6dd145f88fc0dc9e86f4dfe58bf01cb3668b511fdaec77894960dce5640a38ebf36f1 SHA512 ee0ede178a5aee0f0fc7678ebc9e06e372cb6c04e5bf5e1393bb58a2202959533ba3b146111c960ea9143dc72bdffc896c831f9cd1058187e7c7b41417b22e51
-EBUILD pcc-9999.ebuild 949 BLAKE2B 22acd95f4d370d0bc166aeb3adffec19b3a22bb5bf410fa0e52c55e1cbef9f47c0687ac2e2968d5fc6f8c3f15136cf7fb30454f92ac7d3e9cc56d23c1aa23431 SHA512 165eb427eb7705862c0b2178866f6615859cf4b1ad72c5bac9605eb1e6d84d38a316a65a073e1496363242dbc4bc61a42b1cccc520fbbae241f088e33f1a8ed4
+EBUILD pcc-1.1.0-r1.ebuild 849 BLAKE2B 117798a2d4bdfbce92ba0cc5dab2e0e9e63948e4f4f73afa44097a5117439b69408c1b66f61ee4aeacdc1c98a2298c9bc8841ee778c6d754ba25c1bc69a84ee5 SHA512 1677ea15c78c46bd7391bdc6bf4ad4f4086d891d868e8e7f1b86f1d9fd10206aa788122b3b818a700215925b3474fb91457fa397a128e398a50b536ec8f4fb2c
+EBUILD pcc-9999.ebuild 946 BLAKE2B f501622c674e7114dc52e6133fa19b315da7bb2a02f2fd012781f5ac9547862a062e91abd31cd534b38cad743994ca24ddb96cd5f9a655a84fdaccb160055cea SHA512 7c089c81c77d9763749232cebdd1c7b14a498764f388d0956e1a15c4cbab47b10445452021064067a841ea3660949cdfbed0611cc269c6a3ef11231e852b1f09
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-lang/pcc/pcc-1.1.0-r1.ebuild b/dev-lang/pcc/pcc-1.1.0-r1.ebuild
index afadb70bb38a..d474c4a5c491 100644
--- a/dev-lang/pcc/pcc-1.1.0-r1.ebuild
+++ b/dev-lang/pcc/pcc-1.1.0-r1.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
@@ -12,7 +12,7 @@ SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
 IUSE=""
 DEPEND=">=dev-libs/pcc-libs-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/dev-lang/pcc/pcc-9999.ebuild b/dev-lang/pcc/pcc-9999.ebuild
index 75783d00b0af..8a7794bf3887 100644
--- a/dev-lang/pcc/pcc-9999.ebuild
+++ b/dev-lang/pcc/pcc-9999.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
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
-	KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
 fi
 
 LICENSE="BSD"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 6677a0fd0a46..1c2b0958d36c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -29,8 +29,8 @@ EBUILD php-7.1.30.ebuild 21986 BLAKE2B fe9f7b9fe8ed8d8f9b10ad226693e36a95aab0da6
 EBUILD php-7.2.16.ebuild 22516 BLAKE2B 8a3fb93cb898be7ac86793c8066461b45b5f35972469ca0729ae0c14e5855d06b268c64475015e3ac4c2018cb6a7860acdb9acbda5488656b2625df5fe4868c9 SHA512 dba861469d79acb5769eda7ef1e5f689f6b199a6267e6e769e2e660fa0540a3de73918c1e74793082e66fa8eb8d0cbbf9ef7b99e881751252c236e08090ea2ec
 EBUILD php-7.2.18.ebuild 22526 BLAKE2B e31a0ae6df4fc5b632b06d76e83709fb0c098b6f98a384911ebe7ca2c1873106670221d6506f73a5a163beeb5c43dac7685efa1ba4e3c8746034a7ba779b4483 SHA512 7808dc20a216b8418986464b8bd571c093d1b02fda1dd4d48a4580f6c4632990dc8a0c5542f2786608b0951068ad20fce842b40132c239853a17d41b6970eee8
 EBUILD php-7.2.19.ebuild 22517 BLAKE2B 8fb0affca6b4a38ddc72048a9848538338a712e7dbae27afbe4c8d916310ac0a81c1d586c28d7a86ddb5de555b2d97c588a0073a0892ba0e27db7aef1076dddf SHA512 27fa0dc1c1a0b8f4420eb899848d4fff208834fb1925d48dc2b2ba74d4fecbe8481f1db5818de81f4369e7a64186f6bee312a82127757688fda6831f22f3740e
-EBUILD php-7.2.20.ebuild 22526 BLAKE2B e31a0ae6df4fc5b632b06d76e83709fb0c098b6f98a384911ebe7ca2c1873106670221d6506f73a5a163beeb5c43dac7685efa1ba4e3c8746034a7ba779b4483 SHA512 7808dc20a216b8418986464b8bd571c093d1b02fda1dd4d48a4580f6c4632990dc8a0c5542f2786608b0951068ad20fce842b40132c239853a17d41b6970eee8
+EBUILD php-7.2.20.ebuild 22524 BLAKE2B 1cb26ada057816945c150659f6ec904d135efc1e0844abf96ec9af6525bf0731bbff82622a1161b9a96a600ad81b55c14cb238556b89181a14d1b99569c6e3bc SHA512 519400110fcc3ecae2d33c0a6659342929c1e74649577c96955e23f458c23c0e39cfc03086707614db9523105672d366c5a557df1563cdf0c55bc486789ee970
 EBUILD php-7.3.5.ebuild 22537 BLAKE2B 4c042d9e887e578814f716b965ea37f834f5cfe3cc464fcea62b6d0b966e776a2b8b567485ae32b9a7c56705231e9ef2de69b0d93eee4cab5ea874df0921310e SHA512 22ffc7d082a370f3d84271bbb005a03d6faa4c82ab941d3644c57cf80c1b66e960f0a27030ddb26d7c5d52145705e79873e0eda2217311b73fb6fa2e65f00bda
 EBUILD php-7.3.6.ebuild 22529 BLAKE2B 097b018a68618a6c72e08d9b53a99af585604df5543c3381081ba0bb6675d78587f2975e15a577800febd6f1ea9ed63f0d44897a50cfc4b4ec4c552dd69aaddb SHA512 56443e712a0de33957a9035fbd1bd9c878820f0ed289a246a8796576309ba062c89bfd9698c03adc0f2d7c155b511e9d8e93c0091d79f9f43dd05fa3d1c7c3f2
-EBUILD php-7.3.7-r1.ebuild 22538 BLAKE2B 1fa1a354c598ada995c907fd6aef0e12e806e66fd72275c22729252c1f83b7cbe85869ce60de60034e42fd0c8492a98353c924919743e246e50d93168e2f5ace SHA512 b69f9613f6901fc45a2659d3f972560709ebd9d13ccd75ecc95e130d4e913b7a67c4f0fbb9e93f56cf65fb3103d053b0ede1a6917a791506697fe1d36a477a2a
+EBUILD php-7.3.7-r1.ebuild 22536 BLAKE2B ab3ced4578128e42b23120478985053d20b408564be3b6f93223e5417217b513431560215d32605e98738e3570c74d96c3ff77459cb7ebe220ee02c55c4c6bbd SHA512 b39a6d79e4e426b936c8ebe0e9afa6bc48f21d1e21711ca3d573eaad66c3b548c86436d8c7cf5d9834b5af820767187c668a5f6cb2c877e936189f6beed9d257
 MISC metadata.xml 3268 BLAKE2B fcd85522c4dbea03403eee66cd3be945f4f998d5eb483ac9c47bd2be2f5f2f4be8586ecc58d50ced7798fdd63ef2136e56d559fa06e870d242239127a97b7b76 SHA512 c44c7fdf1592ba4c0b2cf6f29a97a4a214d2193cb164dcc90454e4a762860a5f3fa67908217543fe72811d403c2ef3b15d2f80f2657f09c1e078d31ef35c12f4
diff --git a/dev-lang/php/php-7.2.20.ebuild b/dev-lang/php/php-7.2.20.ebuild
index 2d85e9d999ef..db8296af0cc3 100644
--- a/dev-lang/php/php-7.2.20.ebuild
+++ b/dev-lang/php/php-7.2.20.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.3.7-r1.ebuild b/dev-lang/php/php-7.3.7-r1.ebuild
index 1e66c720846d..6b62e30a4d72 100644
--- a/dev-lang/php/php-7.3.7-r1.ebuild
+++ b/dev-lang/php/php-7.3.7-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e1f5f09fd032..0db4db547bcb 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -18,8 +18,10 @@ DIST Python-3.5.5.tar.xz 15351440 BLAKE2B 217cb7f51e04d57983ce053ff4276d056e17c8
 DIST Python-3.5.7.tar.xz 15324736 BLAKE2B 0f1dd80584385b7f859652c85dc6b51bf71cd9f1d53fcf1716c54e8ffc3d2a36ef9969956e4429ac1ba878dad1e9acbb5f82ddb6a9923886bf3c84b3327dfecb SHA512 83f57451e1d7082bf19e4e49a0902e9257e381836d9a04154a6b276135fa49e5c96b6869eed9ec4475e06b76556c1ae89f5cca111b762eb8b2dee6f65373e0f4
 DIST Python-3.6.5.tar.xz 17049912 BLAKE2B f393e9563a18a46c457afcd2e174d9eacda20fe2b0ae5461e11c582fa4d27b85c01bbe7b602f45511b6b44f635c6330205b12fb3e8325ffd07e87b78a8258889 SHA512 6b26fcd296b9bd8e67861eff10d14db7507711ddba947288d16d6def53135c39326b7f969c04bb2b2993f924d9e7ad3f5c5282a3915760bc0885cf0a8ea5eb51
 DIST Python-3.6.8.tar.xz 17212420 BLAKE2B e104b49a35492b622080ab81a446c0cdd1223e8ddf95c4e1b262762a027664b59f3e4deeda4ba7177115d780e48b6764a053acef640a645327df428d2e4820cd SHA512 b17867e451ebe662f50df83ed112d3656c089e7d750651ea640052b01b713b58e66aac9e082f71fd16f5b5510bc9b797f5ccd30f5399581e9aa406197f02938a
+DIST Python-3.6.9.tar.xz 17212164 BLAKE2B ef33dbc1ea3bbeaf92092de867279d759e3a204ca4e8bf0e5c6a1adbb17a9220d8829245fa9f067ec6497a5789a4f60b8db8c727bb2bd8126df470921d552a53 SHA512 05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819
 DIST Python-3.7.2.tar.xz 17042320 BLAKE2B 79b06b7d38590b7ad00850a4323156bfee07c4cf8531cbc09d262c6eb38721e32b8b0591fc21017e56948dd81763e9061f118f204eda5b9cc0b84e7132b42979 SHA512 6cd2d6d8455558783b99d55985cd7b22d67b98f41a09b4fdd96f680a630a4e035220d2b903f8c59ed513aa5ffe6730fa947ddb55bb72ce36f0e945ef8af5d971
 DIST Python-3.7.3.tar.xz 17108364 BLAKE2B ac86ea442519a02f0afcb0d0ec70cb288ae28df63fc9f575ee4d8e03e6e31aff9ad2ff18ff5787d922727bd1c6f1a488f94541cd9787ac932d041c93847dea34 SHA512 6d9b7c0f1764e0f655a39430a3af6f7b5e3c9b7166c042e780677a54b17ad4ca6d0d9cba262c82b1b70bba8f7c28883dad4cc0d7cc194fc7d2c1b5f4f08a763a
+DIST Python-3.7.4.tar.xz 17131432 BLAKE2B e175f750f1fa610a19a40f382ae5e652de12c775cba41bf575868c0621a8e5c4060a15a5567c207b251de5304f8321191f5bc56388c253d42cf17c5654a88ebb SHA512 71f64668c259f3ed07bd4aa239dbba6cc1b6b0a84d50bbff160664845d7986f757e4d65fca327e62a2d12ba593742ca83a22f7cb6093aff8715ec916c2ba9416
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
 DIST python-gentoo-patches-2.7.16.tar.xz 13904 BLAKE2B 218b46f8656f4a792dcd47eabca6d59a1558276b77676544991ee75914cd76dda84c36f43e72e477b850dd4cb52374d289f20dccd244a3b52ae5debaf3363432 SHA512 83f90545231c663a34c6925352a357a2b15997ac0362578a1893304c5070b5251922585ae8bc1bafb68d306bcddd4cdba4b6406648d473bd3e980eef65fe3ecd
 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec
@@ -27,12 +29,15 @@ DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51
 DIST python-gentoo-patches-3.6.8.tar.xz 11224 BLAKE2B 5fe38282bcf28df18e0bd37756c880ae191ea738dc92f1cf83f682cfdc52525b9c44287dc99191a73d75c90672ab501b56adf49515b35ff1fdee88c8dc07b175 SHA512 89e700663db25d6d78eee1d4bfdab686c5341a794062f3a63df3485ac0b58deb4b4885d24701f3ae138d06ca783be92e310e1100c6d633910c33732f3cb0d7df
 DIST python-gentoo-patches-3.7.2.tar.xz 9776 BLAKE2B fe451c3fb44a1ace4489d1bc68db9848b4227422fe9135659594248d057a8916e2abfe8e2677ef6efc9c962dbefe3ca7cd05cbd62b325d53eef6b05928f82017 SHA512 55e932624333b78b55e8981aaa7e7bfbddb635a61f594353a77a6bd5c2b57de31a4ee9ae04e072c4e2eb0fddd1c2702b4bd6133cf0a2c94ab35808df86550156
 DIST python-gentoo-patches-3.7.3-0.tar.xz 9800 BLAKE2B b3e1df06cc2c404f08d2da7ea7d44c3612c5b4f908c58d469084b4e78ee4c3024e57879b3f83027d980c9f5e065804e3e144ba734b1da357d3d073c22c14b02e SHA512 deeaf5fbd1d557d4c40c770c1bd772b835bf5ced1842b964fd8ad1aa652b706782301e8a860d6fd1909d90246a8f48a9aaf384d047fca594f96d6771c2901338
+DIST python-gentoo-patches-3.7.4-1.tar.xz 10100 BLAKE2B 63e8fada89b64b59ba083745626a1e8a07bec0cf93b7b6ab405c33a0f2932cbe497a331c52895a07f10434b230c438f27c9582efecdd57f3bad15d9aa604d157 SHA512 11b0e811a9890a1235c85426061b35f9964eba64cac0536f4c9e0498b1cc66eb005f14aed34eead735b43e91c2b5babced60e3310f5329231a1706871b95b547
 EBUILD python-2.7.15.ebuild 10811 BLAKE2B f828de10018c8a29ffec4fc405e5ad92f5d88c5230a4de428755a25494c65ff81e72e85e12a6de152381d4ffc54bdac04b1a699648331660a311b47b25e3c266 SHA512 d76caa98de7a649fab7d630bb14e2bfd38d74822ff42d863dd6d5307b0788d73490c6c83cabd14e126f477a17483bef2af7de5dda921b22e49f7e85ec35bcd18
 EBUILD python-2.7.16.ebuild 10849 BLAKE2B 65a344223483c25c6f64853317cdc80f67b76de799dd74e33215f59f4901d9bd9dd062f96e7ffdd89710c8047a2d38580797ee28da79ce6338cd785bab29ed60 SHA512 8e43b0f7b8adf80b03bb9999f47cdbf88944dca30b0fcaa44210b2610ae88c7647bb51665f33a77783698f9e7d4ec2b0c351841f0a1c4b40a1bb5114f640611a
 EBUILD python-3.5.5.ebuild 10835 BLAKE2B 3963285067d084dac6a95b3a362b47f097c25e3d2bc8699e47c66b2322aaa4cd4a59bf61774a075356f770ea4328f076650e10b5cf1789e9d312c974928e39f4 SHA512 8286b1a0494984743fdb7d0b7ea6c8a0a8a91f8774f67b2cbd10988a53cc3de3f1d0f5ba135e4b7fc59aa6edaf097363e56f69fd6d01f7d1973aa36797fcdc20
 EBUILD python-3.5.7.ebuild 10999 BLAKE2B 435e939cbb4257522a80028dca5b13ff27a81042cbae0462ab85bc77ca1427d0d9e897a0634c5a10e9dd0ac742cbfb8af902b024c71b442403c0860f834c82a2 SHA512 2b14a19861dbf0a290b2b2d29d69527cb77a2da232d8ff74759469e8604314d6f386b455e23a33bda23ef4433a051730649f63a9987c9a1bb3ee50c3329c9c14
 EBUILD python-3.6.5.ebuild 10176 BLAKE2B 48fdaf04c44c503fc2600e39c2d9fdfc4eace705b6c1f97513717f2b002252753859790a941169df97f9438519365e59a0b5af7a3b3cbabe31e09833b2f3a336 SHA512 a531d9e3e60c9a58c54ae853dcd5bc31f376af241c840f88d21f8553d519d1fac6af5f811c1af2c541b3a1ac4d8ece77e1e5589dc4863727ceb84389f2b3a283
 EBUILD python-3.6.8.ebuild 10223 BLAKE2B c852ac8548968095cc502fec391f678c83a5d9db13f4f4fed05c228280f595a6b38f5dffcd11af8afd1e015f9970f6248e06344a72fdcbf8c033ec89156ad0f4 SHA512 e15ae9026f9297c3a1883479b3ba693dd8d8e759c3a28f71a515fabc7fef821ecf230bde877faf681ff828c4e744aea8c52a699d117430eb46d7c4adfe97727f
+EBUILD python-3.6.9.ebuild 10223 BLAKE2B c852ac8548968095cc502fec391f678c83a5d9db13f4f4fed05c228280f595a6b38f5dffcd11af8afd1e015f9970f6248e06344a72fdcbf8c033ec89156ad0f4 SHA512 e15ae9026f9297c3a1883479b3ba693dd8d8e759c3a28f71a515fabc7fef821ecf230bde877faf681ff828c4e744aea8c52a699d117430eb46d7c4adfe97727f
 EBUILD python-3.7.2.ebuild 9649 BLAKE2B dfaef08d883c377b5a33ed9f92b88317a84c35a8f6993e82b36ee9cb20a18c2cf9c2f52ff8bf93b086ebde357e84c23486a94818b9df127874abbacebd092fc6 SHA512 a77560d7ef777f9f1f9ba5b69cb1cfb6b66361ed31cdc3ef90bed852e81461890ed5f8e8e051f1baf7c003739691f39644768df78a8b393f6a89102604301161
 EBUILD python-3.7.3.ebuild 9794 BLAKE2B 5b06d592e08b11fb5bfb6b893b2c887d6957ac076e557a26c1ac06c6173338fd7733454bfd26ab3b51b5bea8561b1a6fa9284b3d65718c2697ce3c999ae02861 SHA512 09b4ac494a84d3c22292c70a1e979d2203859e68e42cca4aac33dc91aff449f9daefe11dbf5e75f6e0a934a3a8cb9a7634bea63890294d5f7a11b2b95e40c5dc
+EBUILD python-3.7.4-r1.ebuild 9797 BLAKE2B 33db638b8a13a743b10489d3c95df1a3daf79bc1661058002060518a35e819d886c9ebca820a043b0e6b55000b323b48af040a6882c227e8b0b9c0e8246c8373 SHA512 e6ef585dae4976c44a4631a3bafdb87b786fe1436c047ee5c29cb532b3c9687a845414fcc226069da6377dd615b274c16aa380cb1201a46349f0a18367e3a4d5
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.6.9.ebuild b/dev-lang/python/python-3.6.9.ebuild
new file mode 100644
index 000000000000..f91b8039ecd7
--- /dev/null
+++ b/dev-lang/python/python-3.6.9.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.6.8"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.6/3.6m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0= )
+	readline? ( >=sys-libs/readline-4.1:0= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+S="${WORKDIR}/${MY_P}"
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		configure.ac \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED}usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" \
+		"${D}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${D}${PYTHON_SCRIPTDIR}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-3.7.4-r1.ebuild b/dev-lang/python/python-3.7.4-r1.ebuild
new file mode 100644
index 000000000000..35e893d37e6d
--- /dev/null
+++ b/dev-lang/python/python-3.7.4-r1.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.7.4-1"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.7/3.7m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	sys-apps/util-linux:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0= )
+	readline? ( >=sys-libs/readline-4.1:0= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+S="${WORKDIR}/${MY_P}"
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED%/}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED%/}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED%/}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED%/}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED%/}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/srf/Manifest b/dev-lang/srf/Manifest
index ff7fb220d557..85d6a0771dcc 100644
--- a/dev-lang/srf/Manifest
+++ b/dev-lang/srf/Manifest
@@ -1,3 +1,3 @@
 DIST srf-1.0.tar.gz 222493 BLAKE2B 09fb3e767e04ac735245e973d225616b0e527aa2ded49c9350c592284e2ecd840b439af61d27e67dfa3c932a320de787c371354503ed40a8af2a686dcf87b127 SHA512 420f691a937fa30220cd436faaf75299991452fd5f026dcc7aaa767e276eb245cb8eb88d875911826b66abad62fa10326b694301b4372b91e4ac20bf32c78388
-EBUILD srf-1.0-r2.ebuild 622 BLAKE2B 8778389f468e7539b6a86a6d5068fc57be5da7b42c57a0e236dc4d06a776a2c0902b76fe12177a9baae196c45dd089eeb3b591353ed4635cdcf376cbf92487f8 SHA512 55c1d574ea60d0bcb7a6b79d9e734c11b2ae0b3f62405266db98af196a43e82da2b77906736fe646ddc90466cab42df0385570e9b76fb53bb5c1ce782fa93261
+EBUILD srf-1.0-r2.ebuild 619 BLAKE2B 5b9686bd00291312258301cfca01c3e6bab1aee803ab310130ba60cc5fb4a790120aa224d2c0a6a862f435b3b30211ea5e5f2209c94cf3a75a7919a5d1cfe6e5 SHA512 0c2148ac955694212ef7e43033c34e4e29e74c55f2df9f525b816bf08ee216445ef58e44af580ad9b65745cd772e93f8c927b3035f2c50c90808f336cb724916
 MISC metadata.xml 418 BLAKE2B 53a8d8a67492aa4c363751eae8327f45c17cd77e5ce1cc9dadc8e017397e4f569150a07e6e20ecc4c411b7fbb3fed8b4690bf6367067360e03d7a74aa2079df3 SHA512 16fea93364e4fbc9deadade67c2d2a69c45f53607315659b0c682497f8d01ce0f85a808e592cb3d67f521b5fa12f9b73b427d030923da4a735eb83baa80473b2
diff --git a/dev-lang/srf/srf-1.0-r2.ebuild b/dev-lang/srf/srf-1.0-r2.ebuild
index fb64673fba2f..c5871b6fe37d 100644
--- a/dev-lang/srf/srf-1.0-r2.ebuild
+++ b/dev-lang/srf/srf-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.stratigery.com/srf.html/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~x86-linux ~ppc-macos ~amd64"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 13a250ba8325..72966eb016bf 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -6,8 +6,8 @@ DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a26
 DIST vala-0.40.15.tar.xz 3406020 BLAKE2B aaa2967a140fae94b4609f4b54f2e37c71fe79453cb3ea30568ee018d2227d1c45061440ad632bcfc53650fbe4dba2f062d8095f95936623a49efb5e97f2c2bb SHA512 abb918b00afab7a85586f9bd26b78be87e19b725752cbb77dd428da2e6241b1f3d4aaa70e3e6daf6f373562d02f1ff8016e6c9107e2bf088d9b84334adecdda2
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 EBUILD vala-0.36.18.ebuild 798 BLAKE2B 6def4d1f13ee1fd84f2405da15b6cab064ec882b2ba4fd497636966414308dddefda9357d0559b052277476becf2856ca923f62007f0a319ea90cc3a0fcf572d SHA512 2bbd7d899f35cfbe72ee2c9304ff2d68e87babb06fa6f8c2ea94edbe95cb3b039e33e565d5af6cda978cf6e8517cc5cd51f763dcf6f9963c5c5ae30ae434555e
-EBUILD vala-0.36.19.ebuild 800 BLAKE2B 5c38c03d8dfbd8f2fa1314e2c931c6359500d607a96792f18df91d392e868d96be48562fb956db86f3268f26cd4ce38fe935bca987a970aa485836851c240b7f SHA512 5d426a52d038d6fffcc483a5f6543e668d4494e2421c41ca8c4208a65ba86017bdff2e3150b4ae8fa301823295b9e8eb68d6b390c4920ab40e3e1fe5f55c39c2
+EBUILD vala-0.36.19.ebuild 799 BLAKE2B 6dad69eb7e269525d33eba9e093a41a521b4de2eb6b7f4b933a2eb4e377de2c3dd6dedc0f17c03c4c0d77c85913b3d61d4d92f6b225a237a17c0b1bccc6a5100 SHA512 4a492eb53d12c62d04c5f4b574e71c88a81c28291682ac16a0f4ad02263193860fdf0f965a8c81e9aadca79e62872e833d3db8d5f97833b3a40971d2d1739c6f
 EBUILD vala-0.40.14.ebuild 1185 BLAKE2B 1cb8b3efdd6f010c5524aabced06132f9f90920d3345e216df0dcb555ab2d4c10afa196271b2623d71d5b4dc57ce2705677275c1da7c0099925e82d5cb1eac26 SHA512 5e271726a2e71902440df5c03897f9c1960d83bb6eff5d2f4a1213d791190a2f34a81fdefb165427c9ca3a92aacdc801c5bb4be5b98fca27ed0b9adafc4d5158
-EBUILD vala-0.40.15.ebuild 1187 BLAKE2B dd97f47ed3a1b62fd518319f6147abc5200115588bb8a3447b1023ae8389296b40ce8bae9a6e79b875d87b372f4fc2b987e5ef08a603c04f5d1b4867101ef9cb SHA512 bf998a6e5c48c3fe7a0e0db43bb2832c66bf6541bd477650033e7c36cb5768a0890136a45c4d42d9e1fcaafd8d86fc5172e0c3adbc002e3148ac62525fb18291
-EBUILD vala-0.42.7.ebuild 1186 BLAKE2B 1ed106a8fe1b4dd8de9bdccf8f08595eeff0096cc0e120f9dcfa125a27bcfb9d21e1073791588d77129223455e05538047c0a1a4fc0c1fa3f18c901ebf29f548 SHA512 f7b56c3f4139409b8f71119c733133347e0d0b9d9be4ebfb95135e48b0ce7d3b7f3abb17e740cd3e7867f4420c557816bc24f83fa341ef11bb581262f0cb6a73
+EBUILD vala-0.40.15.ebuild 1186 BLAKE2B be9ce6de6adbaa89caaec477d2cc774af7f55533d217d74845e780b628e0d17cd124da1a7f8312b8b4f30f74eaedd4d556647f13934c953e0831bce0413b6c87 SHA512 915aabe3dac3f293517e3166c7aff81591b3aadca06034ad3ac2aa53ae3b8f6d6262fd6acbfde54f2cacaa9ab9fd5454ad611c009f909e3cce8184d256245689
+EBUILD vala-0.42.7.ebuild 1185 BLAKE2B bbf7accf72f7d5370762acdbcc44efe46e56a05b4a08a5cd7ada34ecb81ce6ef30a1a96880ad0a8ca38b264f06a10e464aa11b4c2e15119a4c84485cb358c42f SHA512 1d32eaa0fa1883351b774cf31863624d595f2b840383b14d88790de48ccea776a498bb9bef7dddace1878f9a1fa2b59ef0e9c4e23a881a1238165a62d3b2781e
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.36.19.ebuild b/dev-lang/vala/vala-0.36.19.ebuild
index 95b21865464b..82b143c5fee2 100644
--- a/dev-lang/vala/vala-0.36.19.ebuild
+++ b/dev-lang/vala/vala-0.36.19.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.15.ebuild b/dev-lang/vala/vala-0.40.15.ebuild
index d5e3663f9a45..1cc6efd60625 100644
--- a/dev-lang/vala/vala-0.40.15.ebuild
+++ b/dev-lang/vala/vala-0.40.15.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-lang/vala/vala-0.42.7.ebuild b/dev-lang/vala/vala-0.42.7.ebuild
index c353bd515c36..dd2ef732ef88 100644
--- a/dev-lang/vala/vala-0.42.7.ebuild
+++ b/dev-lang/vala/vala-0.42.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.42"
-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="