gentoo resync : 02.05.2018

45 files changed, 237 insertions, 65 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c9a325686a0c..41475951db8c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/bff/Manifest b/dev-lang/bff/Manifest
index 69e3eb72855b..efac0e2826c8 100644
--- a/dev-lang/bff/Manifest
+++ b/dev-lang/bff/Manifest
@@ -1,6 +1,6 @@
 DIST bff-1.0.3.1.tar.gz 2617 BLAKE2B 30a23882fe0d7740bfe0a3e2d75e91130feb4b3da69aa1d85846ba854b7c73c60defad41d5acf13274810fcdc62e39d1eb116b3d68000037136f578339289f83 SHA512 0bf9e20ffff204f3092b7f02197002880a0be0f4851f4c5f29bcb0974b90e5d518588c334b4f9224ed3320191269c7b4bfe42bd0339ef5ba86bee8bf1cf2a66d
 DIST bff-1.0.5.tar.gz 4833 BLAKE2B 9e3b44da9cd001552119e25764b171c86027755583f79a13b1d1035ecbab134df0aa31234c1479370599dd56a76a7f1c67eff61d2c1189430bab6a9a22f629d8 SHA512 78e481f6f371421ce6f046041fe6d48be2e11000ddda82f60244c0100665469c4aff4f151d297bb533140d723f68d5a3844e0c29a256b022ac93cafbd2abe9fd
 DIST mandelbrot.b 11669 BLAKE2B 7f128f7a30faa7d445353da5305424b7a6fa8f8048c955680411bbfda136796721111bd0824e72f679ec83d22c3865866c57b5b272440b5318b090facdb35706 SHA512 3a1950f8be61fd33e563fe17dbc1297deae3ec2d276a6895e4bbb7d55c5bcf33ec7e9024d9776ad5c9c29b25c55bd08dea71403a60f9478fb3b80c22303d0862
-EBUILD bff-1.0.3.1.ebuild 905 BLAKE2B fd4899726df5982a0eeff7d831607723cab50a234fcc3434143e167325fc53e626f5b3f905d1349b4241aed891b929965644ff2b71dbaa274fe4d30a87f9274c SHA512 c4bdf46d22a9cb2fd36b90da74a5b5d79f5ed11f226bdb209de7641f6732626d46ad00906f49277b7b29eac9805593096e0c9e5289b30ace894731064f4b4862
-EBUILD bff-1.0.5.ebuild 788 BLAKE2B b05a8b551e206c1ed919cf649455d558c4756117e9c0b3cc37fc79f72d1c86a5cd5f4b899c7f374311473fb8619e33fa26ab9a26d961a6326bd41f84e0d10f8b SHA512 5fd1dbfb2e5152e323e88f2c988da7ff4156286357cb8531904d247ba6237fd9e6946868f01b8b09069e92ac1042a0888e118d0d59853166c7b6da94e6a804ea
+EBUILD bff-1.0.3.1.ebuild 913 BLAKE2B 1a82b4373367a5416ca7df2128eb86d4445767b3957611784f42382a8731ab9a0add7a2fbb0b244b8bd7b58ae5b0a1a0af7bb4ba5b473b9113761eda0a6f1f2b SHA512 92864209727eec57a8f0fd02ad1a1452828478a959ca6fe3fc573673fb819b2673cdc97955c976bcbf3c3339ac92a1bedbadaf250ed0bb7ecefb169a77dae9e8
+EBUILD bff-1.0.5.ebuild 787 BLAKE2B 2d84f955ece0fc955c20a7d2b7446eea1a957430a8365eb824d5f449d1ab4f825b445ed4f99ef6fc830017f5ff0a188f8ad43510e3e69eb04f67a41e7e8c84c1 SHA512 2c933ebe635d62e9c3c26b995c7e6eea3fec972b5d46bfd31a6d1cc67a8217d909d8cb62103a3ea65f74517ac8baf0819fe8bc917a1167ed91513560790a067c
 MISC metadata.xml 358 BLAKE2B 475e8fa2af079096f259abc30d2f886eb2b568182394c5fa3a1c081754be7d151a3d10564315d6006232d6f2e7e68103337377db045c13a4fca1e05723d5ff0d SHA512 dc6a26609f65e38ec703c857c686e555170ad4021a994c3a39af131a9f3a38d6207a70558aae46dc5927dda8a9f735795d879a1ac4088ffeac5d09a068627f9c
diff --git a/dev-lang/bff/bff-1.0.3.1.ebuild b/dev-lang/bff/bff-1.0.3.1.ebuild
index e95106f26f97..5d4066efeb1b 100644
--- a/dev-lang/bff/bff-1.0.3.1.ebuild
+++ b/dev-lang/bff/bff-1.0.3.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs
 
 DESCRIPTION="a brainfuck interpreter"
diff --git a/dev-lang/bff/bff-1.0.5.ebuild b/dev-lang/bff/bff-1.0.5.ebuild
index 41dcb15553ef..65068df17583 100644
--- a/dev-lang/bff/bff-1.0.5.ebuild
+++ b/dev-lang/bff/bff-1.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/apankrat/bff"
 SRC_URI="https://github.com/apankrat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ~m68k ~ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm ~hppa ia64 ~m68k ~ppc ppc64 s390 ~sh x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-lang/cfortran/Manifest b/dev-lang/cfortran/Manifest
index ef03be25422a..3a8919a8ec8c 100644
--- a/dev-lang/cfortran/Manifest
+++ b/dev-lang/cfortran/Manifest
@@ -1,5 +1,5 @@
 DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
 DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c
-EBUILD cfortran-4.4-r2.ebuild 1068 BLAKE2B be5d255fcf86eb786c87ff67a61121f61cec8dcba67da86ca877195344b682f35562c852fa0b4bef36c87c2dc96502d0a47fcee0155918d36127008d35cfdb43 SHA512 9c21bd9bac59682cefbe4c25acf7c6bc3c4cbb1f080068e0316275ae580309b3907cc1728f5a6cd51e46e00c12711a259778f1a90395077620a46bef65b5e543
+EBUILD cfortran-4.4-r2.ebuild 1076 BLAKE2B 2e471fb1727f8b2c195aa585ac809aece062bb3cdf56f1681a92e196dfaae84b012919813ffab0097598269fa34bd272652877b3b7516e910431522b27a00dab SHA512 97987fd1cdf657e142f43817251604a66ef563ac4e47c18fc1cc816a3c2a0b7ae681f122b581fa7231261ee5f07509f09c09ff95cec712618aa41c53ade7b0f1
 EBUILD cfortran-4.4-r3.ebuild 1147 BLAKE2B 17379e7c0be8d143bc5154560a32f25597c46fdaa91d41315779729b02336386a0f2cae4de0a2bcaf04a59e9e61159e56f57d331921a85961eb3ec2897164740 SHA512 c4b31b1ceb392f8d4e45710684969f6560480b509a616c87822d7d5a6e4e8f0b332f68c31bb5368234e588915458c7d55032931944b27cc81f5e4cb6f05b849d
 MISC metadata.xml 588 BLAKE2B 9e2c3b0818a3bbc250153d807eb81d08f24d5568fc34eb83aef2a9344c59ca998fe488d27e8d23bc1381e21580015df60519698369394c17361111e470a9313b SHA512 4cc9d7ec3c44afc7e8ca2b43c04ea67c88fa1be09f9c594d83d1d011823566efd4e6b889fc4e95b019885be4223de32d94e0126acf70fe5e7cabf753a9923d40
diff --git a/dev-lang/cfortran/cfortran-4.4-r2.ebuild b/dev-lang/cfortran/cfortran-4.4-r2.ebuild
index c8173a9785e7..f63f8906b035 100644
--- a/dev-lang/cfortran/cfortran-4.4-r2.ebuild
+++ b/dev-lang/cfortran/cfortran-4.4-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DEB_PR="14"
diff --git a/dev-lang/f2c/Manifest b/dev-lang/f2c/Manifest
index dc0666cba20b..30d225adba43 100644
--- a/dev-lang/f2c/Manifest
+++ b/dev-lang/f2c/Manifest
@@ -1,6 +1,6 @@
 DIST f2c-20060507.tar.bz2 186677 BLAKE2B 972b55dc95372fc479d6fabd91b495bf4d7e055755c2f9fc5197045207bf8b494948b89c441ae9930c7a247e91707b379f2747e1d9299d04f0b27086bdd1248e SHA512 d0c9019b65a8ad2fd769ada596646a1cd9b682dcc8afa2cd99081376d967fbe959186a38d74570ab4bcce7622c58c8c10042948fa56e0a7080b12111c2b99b1e
 DIST f2c_20100827-1.debian.tar.gz 15659 BLAKE2B 4773a939e51074df34b48540ed67d0bd3dce85b64d6118c480217b569bbe11a9907a7a8bf2d68f0ec5fae51c65ec29a9dafdac1a009a90b5c6d02306496a72d5 SHA512 784d3f1a74311a933b54103d36dd18eb879bef1816ea82e8d93ef5a0eb7582d4ddde3a2b764d15b78194bab4cdf940480089e8b920002134af66cdf095708535
 DIST f2c_20100827.orig.tar.gz 417930 BLAKE2B 4ccd59762947de9d316520f213d33e095a559dfe914c06d58f4db21a031b6dca332d75473dbaa6a6167ef3f0459c68235fdddac3ed4dcea34e9597a8ab0ae982 SHA512 2c28d8c06e53b569816e7982725133d46e9b145a84ec51771f4cca2409098f894648ebe5b8089a1ddd8468be62394b0edb5985e50baeea8129e4f507236d6c0d
-EBUILD f2c-20060507.ebuild 735 BLAKE2B d96a49e8e83cc49bc2619d5ed8f2cf83c35e302e12e54f887b989b983db379518577b7c4b3fcb16dbb1fa17a03c8f831bc2cd05693303785630d512e3a6396dc SHA512 4e453d835cfc79eff055678c4f266648737f4c42649b4f59dbce691598198f730eeca30be066f6e4ad8ef9c73af865143362224a806ac7118f2653d4cde3906c
+EBUILD f2c-20060507.ebuild 743 BLAKE2B 57179198c83f6a6961cf56fef1c6222bb61a8faa5c1ba2a74ad39268914b28c30fac158c79d15451ebe10436d97afe5317c88df2af370823161e7319fd747db8 SHA512 02164e7c3e8f9b451c4970b16e0b2604638be62ab72fee20d2930b48760461422cc938a3e3ed38adc91631828cc0d1c497ccc3c6b9fd57cfbdad48021e1d65f4
 EBUILD f2c-20100827.ebuild 1171 BLAKE2B a6019cd127034be532733d94d8f4f02b51ac7cf2b28451ce118430cc68bbf4cd2604b8159984bd458f1bc0dcc283ec7290dc8bcb986163eeb50f600208217845 SHA512 332f261f4284a191ec7a1b83e000c0c7660767d8c4ccdd264603ede7c210dfc2fe4dbb14e115cdb0e41b6212812c8bc5e76c2f32ab01aef18a7b0da61320062f
 MISC metadata.xml 726 BLAKE2B c706f880ddcb69efcc16a8424098f60d920447b0d46e2becfa4202cf8365fd6b8cb7cdd4007995def055826d7240a19ec780c3fc8a147e222bc8dbd4e407a3e9 SHA512 37fef3d63140a9aecff3dd5b99594cf1425b37bc433fd12109e105be79698654fa244cbfb5d95587f297791d6c118461d10885945893fd02cae8bba4a3089e03
diff --git a/dev-lang/f2c/f2c-20060507.ebuild b/dev-lang/f2c/f2c-20060507.ebuild
index 59603fcccffb..32862f0a7377 100644
--- a/dev-lang/f2c/f2c-20060507.ebuild
+++ b/dev-lang/f2c/f2c-20060507.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Fortran to C converter"
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 772e476e1724..166b8f6b509c 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -10,6 +10,6 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415
-EBUILD go-1.10.1.ebuild 5647 BLAKE2B 77f2ad0812c75f531b8e05c6295c4708fb359c544b350a4c2e6351a426f080e4be1c8a066028367857e97eca831c4f3bdcafebf98984027f30fb21c73d069cdc SHA512 0eb63b3b9feaa6c83502943f2408d44999ad228c61ceadb178d6db675ddd09464eb115977b88d1c73db7191492059ac646025fa27774e2b893ae9fe3a7da6f64
+EBUILD go-1.10.1.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48
 EBUILD go-9999.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.10.1.ebuild b/dev-lang/go/go-1.10.1.ebuild
index efd269fb46ca..d383981a727b 100644
--- a/dev-lang/go/go-1.10.1.ebuild
+++ b/dev-lang/go/go-1.10.1.ebuild
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~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/gwydion-dylan-bin/Manifest b/dev-lang/gwydion-dylan-bin/Manifest
index 763ad2445bb0..e827603ab663 100644
--- a/dev-lang/gwydion-dylan-bin/Manifest
+++ b/dev-lang/gwydion-dylan-bin/Manifest
@@ -1,4 +1,4 @@
 AUX 20gwydion-dylan-bin 195 BLAKE2B 83192dc8c2af47d3079d313155a6e4a88b4d91b5cb41ace7e4f78b700bfbb1f954a34d893d594b29fbb6135bedc036dc4c34068048eae825f131152588d968ad SHA512 28c3921fab8d8aec4de4ba902609c4500fb8f60a7b9ac6791ad7f139a2ad4fe991680cdeaa485fc7b7a5791cfa516559ef3d53d21fe9085c72cdf4421557e9af
 DIST gwydion-dylan-bin-2.4.0-x86.tbz2 5846864 BLAKE2B 51ed9364636fa1700fe2fa26e5075b02cb376ced9fc568fcb3f2e2635de301b6cd7207d09715dafdabfd1cca72c9e47eac3c292b9c235825b78bc2335fdcd6f2 SHA512 878c68f922fd02a2f5d6a64d94706d878502c143a02e34dc325e68f3881fcbea2a71a81f000ee0d40d494f6e7cf3f4aeef5208ea2efb62b24e6b7afdf7d87070
-EBUILD gwydion-dylan-bin-2.4.0-r1.ebuild 542 BLAKE2B 467c4232e7431f416b2ddcd3e913bb0caf48f0aeeff97693b73a3f6e5bbc47003ccec80921c63c161305339d579be3f2b9d962781a3dd58b6681beb130621247 SHA512 689ff7b3ef1496c5a20c9e0cbb966d0cb67d550f98bc59ea355cd152a75410f81547d8a41092af853c7d0a69e99e1e817d4dfd4e51382e73952a4b461bc7bbdd
+EBUILD gwydion-dylan-bin-2.4.0-r1.ebuild 550 BLAKE2B 9f7fc407c59a3f1d1d88b4d0f26034029f552f5e65ebaecfa864cc957d49f9bba803c32568c7afec8b7f9e8bad85e22d12685d3fed0ac991d0fe619edf593bc1 SHA512 cec1119bcc18664ec0e8719d2cd953ced4ed17096d5189f90d17bacad46dd75f85cdbb8aa7fe72443756c2fc1d45bdbf59b4462d215b29e8109479947e27ca6d
 MISC metadata.xml 746 BLAKE2B 49684c907257e83a8d256ff661675351716f55888e529abc056dd3feaff0f6e557666991af10a87e1da2a2d2cb0e760269c20799d1ea08fed0d57ec6596dc2af SHA512 8c778a1e2b36af09213a4af64de7a301ac043f4e6e3c51825619ff52acf46f0f585f01db4280383e1366d35031bb9c90b0db12b7338fa1ef6843f3b2bca05fa1
diff --git a/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0-r1.ebuild b/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0-r1.ebuild
index 86e053fdc2ea..af7bc78d4cb2 100644
--- a/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0-r1.ebuild
+++ b/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="The Dylan Programming Language Compiler"
 HOMEPAGE="http://www.gwydiondylan.org/"
 SRC_URI="x86? ( mirror://gentoo/${P}-x86.tbz2 )"
diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index b3b6dd1b1c36..2bd5b6f2806a 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -4,6 +4,6 @@ AUX helium-wrapper-1.6 549 BLAKE2B d7a863f904114a830e27e6367ab18573e047f0681ff81
 DIST helium-1.6-ghc.patch.bz2 34579 BLAKE2B a2454589721e32a45e2adca41a4ba3bd0c17ecc9f1616aa276e590e56491f9b2e5b89bf0ed33624931edf4a72f24201245cd0873c8ea2448a3996ee6d1d8fd94 SHA512 ac86750a98d3c87cb00e8777ad0e5a838df9d87ebdd8540d1c5a297a8488c810acbecf4d665ef7754da0f99729785f48fb77d24fc09f3c963fe972e06dc952c8
 DIST helium-1.6-src.tar.gz 960254 BLAKE2B db7a23b6d18f3b19c024857a043aaee31837b81bd67c3133a566a21ab8615f3bc019322f3ca08437e3acdbb092a60d41a9162ff95026052caaf2da1bd777ae47 SHA512 f102c5a4f669cb0b7fecdf3efdf9dacf0cddb97e9bf5cbdebd0801169802dbfefbe3de08d3f36c1c66a3839a3b080e241840f5135eea40860a91157815026a95
 DIST helium-1.8.1.tar.gz 774509 BLAKE2B 05e28d1140cd48925a2c4d06c5c152e06879389d666d54b0c5d7592453489f8e2bbaa8e7c20dbd9d72fe57a3f9651bffa05d156a32e0208e41ef0e78599353fa SHA512 4523d7323251354ea9f4fd0f6f5a112659119bef2fc0c790bb139cdcdf25e7f740ae4c7d584d0c93aabc3baaace8be49931808c59ad9133b81a64ae115e0f9b9
-EBUILD helium-1.6.ebuild 3755 BLAKE2B cb9c8e5603b243c3fb2952dd7fbfd0c81b01ec01957a9bbf0586e943bc7bad48d972deba8124229e82897ebf4e27ac7e76cbfc6a43eb60b32fd5874fb2a280b0 SHA512 f0614871f5de3cc82157b068f2cfff1c088c2ba07e76761fa4362e8ec340d08987994badbc68bff59d6413dd7670ca11782a4734d8bae6b0a139a68c0cc8b3bf
+EBUILD helium-1.6.ebuild 3763 BLAKE2B b3481f5122af00161b56d3199e24af6d36fd8beb1c26286aca5d320f2650aa5e17e9e335fbe7d54beee568e27e86551b173ea5c904a21ef1909d0091cf86b85c SHA512 07aa2cf067c2521d22c9f6d964699f160e202c71ad83d3dba0b1288a8e4d9796bed1ae27788134a0258ab27304adb4c9eca216797deb47752bcd503a7bc3e559
 EBUILD helium-1.8.1.ebuild 858 BLAKE2B 5bad1df0c0dee503be0f0a892006ae9165e45ecad2ac2669138e85dff47668197420c9314a0fda25767dc02eafb4ae42f9c3eb64440d2a89475ceb83d2ca3a73 SHA512 68990388e9f231d1cc5d8b26af8f89acd59b47883a414eac31d2a6f8b22d98422a05cdcc5e9c333001e0fbd04748668096287ef8e0077b0427f7229896184aea
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-lang/helium/helium-1.6.ebuild b/dev-lang/helium/helium-1.6.ebuild
index c50a91e79bda..a68f9c8a68d1 100644
--- a/dev-lang/helium/helium-1.6.ebuild
+++ b/dev-lang/helium/helium-1.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit autotools eutils
 
 DESCRIPTION="Helium (for learning Haskell)"
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index e124d8db8f5b..ddffa95c3c3d 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -5,7 +5,7 @@ AUX tests-943.patch 3643 BLAKE2B 87c537663eb9399e9f424f224169fbe58add51fe277cb13
 DIST icon-v950src.tgz 3115766 BLAKE2B e3dcd0abe76a3d7fe387d1273d8bebadf854dc5cc120b520968d5a5e4970eb63c5142c14ddedbcfcac4e99f372bdc6be8c65f038eb8f38f746ea65a1f7764ba8 SHA512 32f01ca65863525d92846b505ea61f6fbad5a11991d0476c5e79647459dee12746b4448f8d32f2766c198b6713587e48eb0f7f2a942ce42a929f080a85039fa3
 DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c5115d60554183f1118b5705fc1754b8188dcc3b5b739318374d568b6eafc1e3c4266de5416709e7ce6056925b SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad
 DIST icon.v943src.tgz 3218627 BLAKE2B 50ac22659a74adaf8462b75272592465d7bd78d23ebe7f67b362181c777517646806cea6a6c5d8a8fdb904098a5f07d6d630f01c2bf58c258a11401c0263c7da SHA512 9f89c7f1aaea1caea586aeb1ef74346a0f258c26ae74581a9ce7b59c2b590eb79316bdb9530b70d9af59ad06e6c444eec92016d0e5b015f4d467bde0baac2695
-EBUILD icon-9.4.3-r5.ebuild 2782 BLAKE2B c958b43936fe16821ce3dee6659c31297e874dce7d052defe14bccf347963fa6a219a50ce250aa915962cfcb1d08561abd2885af8d82a87de27b7353bf43f6ca SHA512 f88697cdf5848121514f9646356ecc045ad8b111676997592488b6396c0c0cc433509b5177584fa275b8a33a3a0e5cbe553cdf0b6ab7d9965cdeb210b93e65d0
+EBUILD icon-9.4.3-r5.ebuild 2790 BLAKE2B 313f4ef488cb89b96863dfd7475693a5a6b8f1f91c59ffb4c208c3cfa8cbaf1210edb17755b239a787cd0edf398e691563990266baeecf885228561d3b0ccb06 SHA512 61e8030ad78fb1ec90c027c5e858348271bfdaf1c56ab85b1e56b683cd3ee20737d332ba439379571b467342e51107f7828a991c708146f75019a946d61e737f
 EBUILD icon-9.5.0-r1.ebuild 2641 BLAKE2B 6701969c4c8cf6ee45aa016a10e2885b5698c9e29722c3f6120f5ffa9c5a8b6b925d86d2e0d6d923319fba4f6ae07749b75ffedd9efa728d20f088837d9bc67d SHA512 2b3033947d33ebb2af7e2f946d5e40906513584fddd1f1a60f821513cd16b588bcb40e5cc06f52707428601c80be5276c58a99d7c5f481231790c0a3a73ee1fd
 EBUILD icon-9.5.0.ebuild 2568 BLAKE2B 28c0750d3554bbf5d286292857a98397f2e2c281e939eac824456d3f420fd1639f13b32c3c127bb807413037b34d104ac598bfe3264ceca225eb3d970c28f244 SHA512 cbc24b452baf9266886d6697b46c2243f9b40114fc45251e4841ec69e754c90d6b2b6b8e8e7f8e1479b3f95aaf9847b8ce86840cb9075591aa75355d2c34df6a
 EBUILD icon-9.5.1-r1.ebuild 2524 BLAKE2B e03327a67febfdbadbac7b000bdcceb6d403646371da3354333d0543bb4f849b34ff5647efd248a04bc96d0095fb06860c77b61a312fd3d63e135be086857a16 SHA512 16cdd6438449ca52ae095f144545dbdd0677dad6d2460544c49d4f71e60c099d4f7f358ff288e3b0f026b1b81d9a4d7b84f284ed16a827110a7b6dc9fc92fc4d
diff --git a/dev-lang/icon/icon-9.4.3-r5.ebuild b/dev-lang/icon/icon-9.4.3-r5.ebuild
index 505439eaf287..6397d8f311e5 100644
--- a/dev-lang/icon/icon-9.4.3-r5.ebuild
+++ b/dev-lang/icon/icon-9.4.3-r5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 MY_PV=${PV//./}
diff --git a/dev-lang/interprolog/Manifest b/dev-lang/interprolog/Manifest
index a83402dd3568..a4f76dff5b7a 100644
--- a/dev-lang/interprolog/Manifest
+++ b/dev-lang/interprolog/Manifest
@@ -1,5 +1,5 @@
 AUX build.xml 1461 BLAKE2B 97f817f1c8a5594c5b9a0f449046c1c91d6789d27592f421fb0d92d0d21cb30f009d90c99b037900e109d791159ad49d78cd3f5bb99464d35cae0508128c648c SHA512 0e469d954d69db940fdf1893257f20d15d1009148d3979755edd448bc1cda9425df5169f6ddba3e37b8eaccd25f3fbb7bfeb3c58a572111be2474e1850a32cb6
 AUX interprolog-2.1.2-java1.4.patch 1341 BLAKE2B b1c02e38f990d8f693a274cb258b18151e5b5d93a8670ae40d2d0b29b25c8ee86c749463b880166d759509331c9bd58d57286f9c62b36ba53673291129d27a09 SHA512 cfd4a637e4d86172547448801c92decfa3f10fa7d02e007c42d8415901d742ecbdf1fca1e4034c7069885a06824f1577bc64f2454a2c31877af68e74ad3aa0d2
 DIST interprolog212.zip 1066931 BLAKE2B ea2666ff756c30db35262137938c32ee98d8a145ce59ea3b8694328771b8925395f7643ecabf9e0c010515176fdbbedcd333a81003a09c0ae1d9c1a94215e095 SHA512 e3d8b216f7e76d5d95ad9d27a96720075575fd717c89ddf9403376a72e18d56fd68afa2b1e6e70da55b99cd84043a16695ff37a59ec3366115cd4c36ed1ff50c
-EBUILD interprolog-2.1.2.ebuild 1172 BLAKE2B 8baa106ff7b9ff4e0642766b31a651c01a59284cd6523613de5538563dbaa4957be3c2ef5047dac93e659fe3f6f269287ca154c63802164ba059e568a3735a95 SHA512 65a4ca3fcf3f910ea1435690d28105aa1140f86b4d74674922b71176e29ece7d898bd9b0f540fbe05a7be7f76eb573ce75da4c4065b4bf96d2234a4b381adef8
+EBUILD interprolog-2.1.2.ebuild 1180 BLAKE2B 88d35e894e03f6acf61a09a6d65007a162acfdfd98255d5aaa539e57026f5d55701c4f2c407da170b7abb575d1d65fff5a4df48cb89c5f28c735ef2368ed810f SHA512 f23b17be7103d48eba043ebfcc0e646a6ff7efff7c79a8783dbfec3e0a5a7726726d9b6cf75aa7456e75e88f4d5abb442062c0941bc22ab38d679f374084555a
 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index 999c9d4094ae..7f9f9e0938fe 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils java-pkg-2 java-ant-2 versionator
 
 MY_PV="$(delete_all_version_separators)"
diff --git a/dev-lang/open-cobol/Manifest b/dev-lang/open-cobol/Manifest
index c5deb8127679..ab6dd84ea710 100644
--- a/dev-lang/open-cobol/Manifest
+++ b/dev-lang/open-cobol/Manifest
@@ -1,3 +1,3 @@
 DIST open-cobol-1.1.tar.gz 1007791 BLAKE2B 9154590626d885a75043c2426c1fafb146e0f7213d05f353f6d01c0e6b8cd8073e12f454a19ae1d3c712606f1c15958f241a7c54f76c995d0ce396d1eba1a0b0 SHA512 eb06cec456425ba5f4a091ae4ac0bfd14f38549bc147c606a022804f602102df6dbf0d399614f0eda49d50dee17eef55087748853a8cc8bdd1248f94fd09110c
-EBUILD open-cobol-1.1.ebuild 756 BLAKE2B c9d1e888fc0e6e65ceaa8218ab7b8376980d763c253b40eaee610986a850fb7dd6844c7f20af7267d3d4471d4c816487a55c7d4970d6af814989c3658c84664b SHA512 92f1d9c7153c6ed237e67a3cc82358e2e2db703ad50d7e6b87c7fabf0432d9b06212acce06a5b5cf8db8922ccba796d44e77ab4932cec9eba6be7a9ab64d9aab
+EBUILD open-cobol-1.1.ebuild 764 BLAKE2B 2e6bb281b63af5a52831fcf5c965c217d7f1a610db0b00dd2ab97b88fd698ad0a4c33b1429c4a6e110f9be8489e6d66b24203961a4f47bf2032221fabc544297 SHA512 d22aea765623903269f263d0cec017cfbe4ada3fb5be42b93deeef0666f9a0cc233913ff533ee699c565488fd36d09f637834af523e0df41bdb4681098c110db
 MISC metadata.xml 327 BLAKE2B ed14fa0be405952fbfef1cdf2b18aa7ca5f627c41fd10d98ce29218d77de5e3475ccc410a49b1443d8145c013ffcdcbd6bdd0b33e8f9416c6bbccd12217a0baa SHA512 955b474d83164c7c8f0259d0b644b2c2805112bd57415f6618f0c96bc87551c5bd1adb9c3de9d571e7f1cb1090c7c96b4197f82fc55ce61a28d273b67bccc518
diff --git a/dev-lang/open-cobol/open-cobol-1.1.ebuild b/dev-lang/open-cobol/open-cobol-1.1.ebuild
index d3cf41c69b00..a34d440d937b 100644
--- a/dev-lang/open-cobol/open-cobol-1.1.ebuild
+++ b/dev-lang/open-cobol/open-cobol-1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="an open-source COBOL compiler"
diff --git a/dev-lang/pasm/Manifest b/dev-lang/pasm/Manifest
index b644afeff0d7..7a88de4bde38 100644
--- a/dev-lang/pasm/Manifest
+++ b/dev-lang/pasm/Manifest
@@ -1,4 +1,4 @@
 AUX pasm-1.7-ppc.patch 901 BLAKE2B cde7b91e1015720e801914f50935aab09e800f28a504a9474815a73d2ee7694137bfc6048753669c9d37e0d5f73d14c980dbd88629c9bae5eadec9f45697a4b0 SHA512 685af1b74e3c3136aab30292ce6dd8fa412a1f214da23426e7ecb7fef728faf50f9dda58cadda97004b386f1244d47cde094dd09ad97c0e68de8484667c73457
 DIST pasm.tar.gz 82136 BLAKE2B d9aa8ab23eb184ca00b416d172b86c4c4aad0e12eea3ff92979c4570ebcf04306b8030f81524952f62f2221d25384db13d208dd22fb98105b7edd55587537a54 SHA512 313e4ad694704ad59619c46353c53ef9bd5529b6c9faee5cc6124dd0175f7b5a87268d2c26045f0639a0002311828b227915f30e697f8adedcd4256774674283
-EBUILD pasm-1.7.ebuild 654 BLAKE2B f1e5e0f8a9c544d9beb1c38327f9e9228d409e98ce6124e0ca9322ec59ae669b1fb662aaa05e150ba0063f6b73d6137a32e36ae90b4f8da9005802573f2b4705 SHA512 f9c3ea8966ca341959aae88695dfdcd687227b636d0d6e40aaa0a36578e057145afc9ac4ce8f6381f4f735909967d24c871f75d269442f0f21521b6624b9fa97
+EBUILD pasm-1.7.ebuild 662 BLAKE2B 16a1ac2ac04af5c4a76fabfb877f8a123f1bef9c846a495890d13eb354672d1d5d315b6d5f590f5a0310c51a2aa96702399435ad11c40347b9937a87c9214773 SHA512 90f6fb8a1fd82026fa08abf68fcb59b78dbc84e76da6620bf20c81609eab8ea583dcb08b4bc9c32dab25e6fb194fcdb91371e7567cf8c5e0b32e5c68b1855978
 MISC metadata.xml 614 BLAKE2B 8c3f30f95127d33b4582c962631e6b3e1522a75d3285466c0dcd4efc9282566e49c09ed44042370b17d613766f5a0d431a0b0b135a05f64aecec351a628480c8 SHA512 fd8449a228746b428cddb71477efdc421fba98b60ef72e1459c790a2df9f5898163a7e4fee2e9950d176f6dbe65525d41fb676e66a004d0427886dec878095e0
diff --git a/dev-lang/pasm/pasm-1.7.ebuild b/dev-lang/pasm/pasm-1.7.ebuild
index f5ccf5f9f865..e4e41e367302 100644
--- a/dev-lang/pasm/pasm-1.7.ebuild
+++ b/dev-lang/pasm/pasm-1.7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="A portable assembler for processors of the PowerPC family"
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index fb33dcc9077e..992ef1992505 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,6 +1,6 @@
 DIST python-exec-2.4.4.tar.bz2 86945 BLAKE2B 3ee2be57711c45e5821ba4cc54e76e4341056221a34277ced8ab5ebffc4d6af63fbe515f73bd84a1a7a82047a008b72fd2935e61b09b0b852624329b3be22e37 SHA512 26b76960430dc3b2b79aab5e8a72498144d4e78bed5291fe9361afe081f0e8d70049a74ec29384cb0fc199f76c23499324d2eddcaea521ef33d88e61b1b674f9
 DIST python-exec-2.4.5.tar.bz2 87137 BLAKE2B 2434bee0bcc64a78a83254d6b6f733ef0748d8209ff70654fc57ac50563d4f32be64705a3c56eefef4e173a238b272d00bef4929982a729a097b82a3a2b0b5b1 SHA512 8c1a520c565afa775cad0e8b88248b688814664e588f683fc2b2c039ee0494b168ebd3cd1042b8b7fe2583f287cf55b22ea0585bfb43efe2f8450d809cde0b21
 EBUILD python-exec-2.4.4.ebuild 4284 BLAKE2B 3bdf94faed29610cf221c63d18c39cf5318eed8cdd7bc70aba28b5116cfc9628e22a5fc90ae48b8a166367270965bfe0b9fe2f6c6ded504fb6775b838ef5c29f SHA512 9f7072a4f9b504ebc6cbabf3c18ad06df8c01ae1e8d09139661d339b4f35bc0b3616407a2cdc5266a1c85ccf8abb83c8a8d44ccb0c5c28ad0865df4e15afbfcf
-EBUILD python-exec-2.4.5.ebuild 4444 BLAKE2B df9c7f3614472c733d51cd12d8a37c0b5fe268edb25b4d48ce5da65644f1cb716e1e1432822392c77e70b38ee05d114a445e46793615fbc28fdf50a6e23ceb2f SHA512 9f5defb30abcf9e43a8d281d8863ecf7ad1f5210414142cf471db8aae4707219c70eb2c6413f6e16c1a0bc2ccea7fcf1f922870fe4a5988b2b0f7be8ec47a3a5
+EBUILD python-exec-2.4.5.ebuild 4443 BLAKE2B efcc545a46738ceb03dfd048d6ab70ac79e18d323c9df32ff61d49c183bf1df80eaa18af1a658397a24a267931684d1cfc4e60c005ee8da58421a30d52bf26a8 SHA512 9f1e31df119cea502e730174233c78e54a7362947f36b6f65302e00d7d8c1ea2504e0196933766daf18ee4fbb7b4621cd82075ce8fe46619f62c8c870ca9b77d
 EBUILD python-exec-9999.ebuild 4606 BLAKE2B 33a7427ce4f9ae368211b9cd8fce04d004377dfae2e4683591bc4aa3d05c2d78f419e985aaede52412d280819110ce8a5312f316e18fd2e818f65fa9b754d184 SHA512 c68c4cc31b5f4f634ef6adb6e97c487f71600fd5c8e2d6d60a01f025351b9c231835a57221aea6b287f0e8e00669b7af958a0cd4e435459827e204cd312b6acd
 MISC metadata.xml 589 BLAKE2B 7f9fa9750915db8b546b52a560a7fd8d9a63c4f310e423ebdc0508fe9b14363001b30f3c3db26f6d05eec8a44176d62a9335153dff2d55a41a31d3b428cc9ca6 SHA512 2ac0223af0a2cf95d2b18ef415eadb325af0094e4ec361a414b0d68b203dc1c937d3d680af96bdad1e8a48cb5786683bdbbd451f47a0f3a777c075e1690ccf7a
diff --git a/dev-lang/python-exec/python-exec-2.4.5.ebuild b/dev-lang/python-exec/python-exec-2.4.5.ebuild
index 40a2ea325c6d..e39dc14b22b5 100644
--- a/dev-lang/python-exec/python-exec-2.4.5.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # eselect-python because of /usr/bin/python* collisions and new config
diff --git a/dev-lang/snobol/Manifest b/dev-lang/snobol/Manifest
index e80939169b27..5dfca8ba60f7 100644
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@@ -2,8 +2,8 @@ DIST snobol-0.99.4.tar.gz 388020 BLAKE2B 18c649923ca907b657e638a3c45e390044a462c
 DIST snobol4-0.99.44.tar.gz 528205 BLAKE2B 09e967db4348d84d1227b02832ddcaf0e5ef3dd2230d4635d680f85fa8fdb9b6f8c9897a883612baac934909523bc880034e1d85001e79eb099c8538b0377839 SHA512 46ffd03e4f392c7e7cb2a532b0ab6536750c57c78284bb02fa15a0a3a0166adb60779e068c3baf542d81cb01b7cd881d952ad4ecb9cf50a9c109e3b68e292720
 DIST snobol4-1.1.tar.gz 677333 BLAKE2B a6ccecaa66657438b2c05dfca9f7db95270b4d1a3502ad06c8d217d50d54ac33b0195eb8b2e045ac0b6c49c19a5bf3ee46e4a35b45555d67fc669317c7a5db2b SHA512 ae8482bc64f3d9020dc4d7e390296114e7498ef2764ebb69b6c4960d0c1b01daf4d77dff1aa583231a7f50d4c54f7f72cedc3e4744b03f4b2370fa6de837a3cc
 DIST snobol4-1.4.1.tar.gz 736837 BLAKE2B bb86d2cd3788ad66b7246d86ebd9f289189f5bd059238d2df3fb621aa4a1e910a8ad029f482077eb78916a84c3a28d868e8ac6eef83b48d7f09a8964c57a855d SHA512 5413af10018141e93f05c9ea637711bb3981f2b67557691d05dde8911178d90900f0fdef6c1d2416ebdda6afeeabd21b9e371b6711b2d093df629cc865fc61f9
-EBUILD snobol-0.99.4.ebuild 1103 BLAKE2B ee426f8c141c70090d924c8a4d10403c7d543acf589fcf3264ae77b7007f7d8352c543a1251200ddb097110962151d689c62ed2172b0b48c985ed4112ce59514 SHA512 62766693ddf26b30b7991cc12f1ff9efc03e1a82a8c5f95a15bb03d7f9d9ac4ccfc4b03802078e781ac5e34a8db4d3d016f5e2a5e770c3b81f2185fedd90ee02
-EBUILD snobol-0.99.44.ebuild 1314 BLAKE2B 46eb8ab6c490d0a4ca8efec7ea5bffc62dbf3af80bb9d83859dfd4e1f7f6be6814774feb66d9398fcbfaeb7e1a1715c8dddb7ea7ebf7a0251317f05a0d147dc7 SHA512 af0778bd0e3dbd180f1ada5dc177527bef615dd91af7f8a4dbc0a82353b559c1fa7653418b6db598f11d348e5d58fa43c45004ed4c032d88fc36177d55b94e12
+EBUILD snobol-0.99.4.ebuild 1111 BLAKE2B 1ef7d360e7f2eb2c98ece67f5781eedd2465ec130b74c98dbe4994a6c711c7bc934e8c4ed06204a9124fec22726aee3023934e2a9e3f5c666aa465e07e1b8cc3 SHA512 f682185fb9a90e6e62a4bcacb69f9dbd4a5dbf2f44c27a1d71b7fd8d82813c52e4e24aedff626f7265d5b7b5c050e344aaea35c6a111255f65ef1eb568616820
+EBUILD snobol-0.99.44.ebuild 1322 BLAKE2B e133957c74db7fb4d1dfd05fdae8fa54da658e25a0b1a7d91a4d735c8532d01a6cf88da802062270cb1e41044ab9986e7a8c342bb283bb701b32b2d04c63bae3 SHA512 1d1ab0ebbcabda8a983cb15d4f0e757074c09b7f8c5f64629eee37bde6085f2cc6601cddf64f38bf6e618ec663ecd37cd5546b93b1653559afeb5fa682bfca9f
 EBUILD snobol-1.1.ebuild 1418 BLAKE2B 23431276ddfcb476dafca64bfe424f1be1d5571467e022bc1a7071e6178e60479f083d6377070e4c0b4bde181615d435d71c2ad843b34926879476b3fb947e8a SHA512 f0ca27dd442231cb15fa95ea8d43ac0937afa8715defd4f6506de072b9a3a0ae74ffa3af8ddac7beebb6612775479a90f80fc045824a273e8b011ec57df8ca54
 EBUILD snobol-1.4.1.ebuild 1286 BLAKE2B 7476a992fb502c100f60ee90b1842223dc789e98ae8b2b30ba02f84b94e79b9f61325ec1f90ca5dc3aaca669e153a02f154029ea6d66a8a6952f39025ef4dd25 SHA512 f7da5f8ada4660b6d746cae936d959d26a0170d01a7791ffc68b3522ebd410eaa22aec5d20fee457726ffc4b11bba391d25ffb447558c0f5dbaa11708f632bac
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-lang/snobol/snobol-0.99.4.ebuild b/dev-lang/snobol/snobol-0.99.4.ebuild
index aa7a39c5fae3..33400a069211 100644
--- a/dev-lang/snobol/snobol-0.99.4.ebuild
+++ b/dev-lang/snobol/snobol-0.99.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
 HOMEPAGE="http://www.snobol4.org/csnobol4/"
 SRC_URI="mirror://snobol4/${P}.tar.gz"
diff --git a/dev-lang/snobol/snobol-0.99.44.ebuild b/dev-lang/snobol/snobol-0.99.44.ebuild
index 5866890a27f8..62344ab43a16 100644
--- a/dev-lang/snobol/snobol-0.99.44.ebuild
+++ b/dev-lang/snobol/snobol-0.99.44.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
 HOMEPAGE="http://www.snobol4.org/csnobol4/"
 #SRC_URI="mirror://snobol4/${P}.tar.gz"
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 50fd7d9062a7..896150388e7f 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -8,11 +8,13 @@ DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9a
 DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
 DIST swipl-7.7.10.tar.gz 16800970 BLAKE2B c9d8904734bb5a6d20adad8203cec6682e9bd97a343d887d1c03dfb735f32e5794ab0631a76e69fe5f0c7d2e76cd21be06471c7df6e4bc585882b7de1308ec70 SHA512 55e0b129424c2ba0f7a8151b85eaf3de6ce7e16ed01626fae245eb0ee754dcfa7bfbd3a30d00da7e2df72b8d2899e5354900e27b47ffe0401bc26a0b594f9d30
 DIST swipl-7.7.11.tar.gz 16935711 BLAKE2B 5ccac7b91ef35d132451b101a53b9977067e28d4239ecf25185e4140d728a711a8fd9dfe73bf51c47a2935c51637c0ad61780997e0b9fa13e6298d815c46071a SHA512 28bffdc7d7c431aa59a996faddac941024d3923c22793b890938475f041e2d40d9218b10779e5ad01c91093234dfd21ea3339756950dd8401adeb5783c3e3aa3
-EBUILD swi-prolog-6.6.6.ebuild 2799 BLAKE2B 47c0d56dae0ce19be9efd09122ef8e6e3655abd3459cd25a9a0cf4734fbb132b8725c79775942da8cb2c5eb40bc35f4c0b5a39064a5e41387d4480379fd71435 SHA512 1d30fcb84653a0cdf7cf4f5a78898d5fb29f939095d19a21324a9587ee6ca98543ae16d564ff8880cdf99c6d5a091c2f0e5dc79074ceadc5a7cd3fe340609d22
-EBUILD swi-prolog-7.2.3-r1.ebuild 3170 BLAKE2B ca7604653a23dbc9158e96e54684482fd1c82e6bea8f9753e73c91d46df95a105d70114c0aae8c86e8b9ef45debf97116755b4fc48ecdae95680045ae60035ba SHA512 fe35661ef51094ddf0aff61659f33de5be0252216b94f45e658215146dd53379881f7077c20ace1ef67b70ad9d7128ccd26e122392a1100ab8db195c9324867a
-EBUILD swi-prolog-7.4.2.ebuild 3395 BLAKE2B 0ab38dbbfbea20db81e516a60163dae56a391bee23cd6a91df98241d684880ae398247a2fb7b42b33680690c74d438d3204e56f42a81935e461a6017bf013a75 SHA512 25ff3ede7c3524a670f9f6cb7e617813826c8ef691141b42f7f07857573a69401f4555e48c98eaff98f4c30bca1938fda4b1f9e9e119ae83d8a71f517a4d0ba2
-EBUILD swi-prolog-7.6.3.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
-EBUILD swi-prolog-7.6.4.ebuild 3392 BLAKE2B 1754139d8ff2862994d2908e2ce845c3c197b74c14522e971ad91b3199ed84f42daf83280287ac51eb03bb53408f1cabfc955bfeb5146918ae51ea4efadca070 SHA512 038d4077bf8733bb57fe8cda0dac04a194f6aac809b30adc21d0b2010750faba4e1db368aff83a766cad6b76853e772b426b9bd76a71ef846964777e90a90c10
-EBUILD swi-prolog-7.7.10.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
-EBUILD swi-prolog-7.7.11.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
+DIST swipl-7.7.12.tar.gz 16935097 BLAKE2B 774bbb34325ed03eb55c71f7f98063ea44012a7069aabe9d77f16252f9f2a1c398a86c16eb47604f271110f63d249f77fdbeeed307ff22f427a61f7beb871df6 SHA512 4c1e6b13f37c16977f6ff384cba119d0fecfe48a20b7cd37b26154587d2abf46ac1619e96f5fdfa85549b72e9077bf73fd2f74b84d9d3f4c37184f0669b0e432
+EBUILD swi-prolog-6.6.6.ebuild 2802 BLAKE2B d84dbba5c1ed23020e067ffd9a0c616dcf0c07a7b1df12d5838b4692813527f328a735463d5f142ce7d7fa8583b62c8a3a5bffbd01a381f85dce1b3e35d8f821 SHA512 f750a9baf473a2e0913613b5e3feabd8fac1b7afb6cab926868154d9089cc57dc9815dcfbd001d929085df585b256903c7df7fbf602c5e0b021fa340973038bd
+EBUILD swi-prolog-7.2.3-r1.ebuild 3173 BLAKE2B 9624fab340ad2ef4ffeb7d91a9ddc4404cbe3e38c1d561d5adc6501041a306519388e9ced37f1c146e923eb2f649643ef2d2d50da2c8e82a31c960d4d4b48d74 SHA512 1b76ecfac0eb5c03d61e25575fea8ea1a58ee511291274dc865c033cac7a796a632057063332e7621be01df7ee550e6f5957386c70a07081a46d9a87ce34b062
+EBUILD swi-prolog-7.4.2.ebuild 3398 BLAKE2B 368ef93ceb17042a28699f9aa469e6b5c39aa29154b810e43fd050ab3bc1079f83680cfac8f4108c7c297a51e9bdd28357a0b6241c08faef3ea5f81ab1605558 SHA512 76d094f62e442ac86d32eaf467179fdcf4d4edf6034f711104e91f8a01b7e343208ef0b6e492ed18c8c0605b96a48f1adef8f3903f861c716e882cb9695b0dd2
+EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
+EBUILD swi-prolog-7.6.4.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
+EBUILD swi-prolog-7.7.10.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
+EBUILD swi-prolog-7.7.11.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
+EBUILD swi-prolog-7.7.12.ebuild 3394 BLAKE2B 1a5f886851042f79ce37b70b4f6d6816a00b470dceb1b4200a519d978ffb631d2766a7c2fffc8597e21ece506f57a7799d5be0c03bce1d87d9adcfac2db88cf3 SHA512 64fb0b657b264cad04e45d704f1c0f0fac346ab81c7e9084b21c40a6cbaff1db1545eb1ba29955f24059df62c38acd66df82f55c5eec3ef33b6f2c0bdab76b5c
 MISC metadata.xml 367 BLAKE2B 07c7ff161f07b547325566650cd882c90dbe98ac5afc0015d68bc0338cebd678ac82c3a45edd3e4f7e613d5d493324899dc8e3b4ca448f447744f439e60458fd SHA512 bacbb17fc3518d3bf845d097d17dba772a745fd7343ab6e8c751a417a540c8c003f29b86c66374bee538d7a5d96ab95e67b1c619d47f80d0e332482daabee74a
diff --git a/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild b/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
index 0969747fad20..e1429546e28b 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/pl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
index 5ff022070d03..6c67f53b8051 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
index 848c0aa426ce..9b30d3fd846b 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild
index ac17db45d196..f745720052e3 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
index c714e15e3b0a..f745720052e3 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
index b3c8e67bc2e8..420bd6d9fb12 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.10.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
index b3c8e67bc2e8..420bd6d9fb12 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.11.ebuild
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/ncurses:=
 		x11-libs/libSM )"
 
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
+	X? ( x11-base/xorg-proto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
 S="${WORKDIR}/swipl-${PV}"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild
new file mode 100644
index 000000000000..420bd6d9fb12
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.12.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with pcre) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-lang/tinycobol/Manifest b/dev-lang/tinycobol/Manifest
index 1508dc663e12..aa4cb7baa46e 100644
--- a/dev-lang/tinycobol/Manifest
+++ b/dev-lang/tinycobol/Manifest
@@ -1,4 +1,4 @@
 AUX tinycobol-0.65.9.patch 4367 BLAKE2B b2a958317a68e4927c838488dafa0c4ecc8b8848d8ff7cc23809ab3cc2c1cf5094e49cd5b9268f3148c8adaed808c152bee324bafe7de68d6e58655b342c2a4c SHA512 b2f990abdab590ed1acf41ed0a6ab2816c9217bb0d707cbb9628f3fb44be0cb3f11bc910739ab83051aab23357a83e44fe012c730a1a788665f6355005a9755c
 DIST tinycobol-0.65.9.tar.bz2 872989 BLAKE2B 29fdcd6cc5390169dbb421b43fb64a08cd618196806ae04759ad40cdb66dc07ff7cc3ac86ac3de11971f1850ef70c74bcc188f1494347e60f4b9757cd0dce290 SHA512 4c6ae224ac68017994c78d80f6b452c90076f320a97b9d7b29b83d403f30211f7487f001bf769ca87693a9b9950c11434ba805e4abd85b50ebe75051f74a5394
-EBUILD tinycobol-0.65.9.ebuild 988 BLAKE2B 77a2c1a97e8a4597a2ef6bd2ed4e5b16dc2dc7e000f26a77ab9454aa31a24a7eaf414bf442fa1d894ee1341b3d9f5b07f4e8662c4db64d1ae1da86598b1f25a6 SHA512 e865aa9212ea700cbe765acc32b2621db7e66b04ddf02f4d85e61fa307039ab9a56b554347abdba52764d9c8b410cdd51288c06cdb87047b857ea4df74f413a1
+EBUILD tinycobol-0.65.9.ebuild 996 BLAKE2B e03bab367634092cab83758fb3e18e39c9c37738fa9a2cbd2de91cbad91e9dcf00f2d91a04cdd07a6b06503d64c0ec76702f1859b4427f88ee9538767c637045 SHA512 c68b20dd5dc1dfe32478c61670ed05fcb8271f1afa1853a75e9bc9be21b4608825335e99b2e59c1df995e682f2461572ef97365beac1c9f48a378c84187f8674
 MISC metadata.xml 247 BLAKE2B a5c4e16111aae168c06471594df9b2901bb70e48f1475657825b40cbb2445b72230c6f4b004e9bd0e5b061bc6e546ea9270451498098dd2bf1ee4291781809b4 SHA512 2649cac2764f9196000ccca028398ee0db1f992d8e2b35a3368a84a5e01f9b9fc95d5a2c8f05d57784e873a3b53b457a7520673353e8999d0d8892315c6385c1
diff --git a/dev-lang/tinycobol/tinycobol-0.65.9.ebuild b/dev-lang/tinycobol/tinycobol-0.65.9.ebuild
index 4dfaef5a718e..ca1c6f665de5 100644
--- a/dev-lang/tinycobol/tinycobol-0.65.9.ebuild
+++ b/dev-lang/tinycobol/tinycobol-0.65.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="COBOL for linux"
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index d8448b2cfb03..95ff1cdaff71 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -7,10 +7,10 @@ DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a7
 DIST tk8.6.5-src.tar.gz 4417393 BLAKE2B bff37ac292928095063ebd3131ab8bf9e9d0b075c115c9e9a1f0fe75c2843cae6153b15fc9b964cd16a1251feca13258034d14dadd5fa8967bff6d5fee813f8f SHA512 9acf2ef993a566a7cdd1efe21dc896b09125c65d86df53ab5a78542b21d3f031e9f9d72b81738705636c268b5ce72934c483eb087d5c0114f913c9075db9a3b1
 DIST tk8.6.6-src.tar.gz 4273737 BLAKE2B 65b139fffe628439137a02a72af19be0f7c44956d18852f1ce8892349d0fa370281e475fbbe7451da524ab4e74a8c258ee5ee70b8a146bf1ec71e3bf420314a3 SHA512 223c72ab5a6f6040928c56843598b878efafab44ed4152a38e68aa2800f2c181adc50a8bf23279b7d446493eec43854920e8b649b6a34ecdf31ecc07ccc74044
 DIST tk8.6.7-src.tar.gz 4282972 BLAKE2B b07102365539ee98e2972a5d3bee2bdee89cb4d3873b05c764810b89f0152b71bd0d14d007434a003cd784868afadf6a2a50deffc0c4596b4551a0be7625fd13 SHA512 adf35991b20878d18a6940cb3d24d821586828537edf6d20f9223f2989d317adbcbb5360f3226014d96fe44e7ec06cfdf434309438c90a09878345b7106c7dd9
-EBUILD tk-8.5.17-r100.ebuild 2159 BLAKE2B 05360ddf94ebe3493defa08b052942228044fea1005699c441ee60892291cceb87fc50bbbf481fc7d0def0f4a0bb82ec87dad8173247bab133599d2ece681e12 SHA512 a1d379530b776345d992d465c6fb18cf91bf791e5f3d91f1dffd2c230f9ba1eba3874b04713c539c88e61584c4339ecbf37a7274a7c76294bc8396bba340563a
-EBUILD tk-8.5.17.ebuild 3503 BLAKE2B b302110756e1b5df315e83d2527cb47c955de553606869a842a7b726954351ddaa793e81bf32f438e7c848f8002ff8e3e0373446577ed59cd6dc20217051cc74 SHA512 0a7ffa7243af2c8174625dc1fbc4b727f5383d6e72353e0a9b7098f33bd21e7c4592e551a23227471d2ff497a979d6e4236cceb45c5b883bcdfc2fa3eed87512
-EBUILD tk-8.6.5-r1.ebuild 4124 BLAKE2B fcc124e2d9b58239559e720a5ed36a6d4c20423c07118a084f13f3fa9f13203901e3db3ef4e39fb012c2b6e110f51444847f11bfcab1b7982db91ffea0551d0c SHA512 a5984c8534e38cfc9c1a00186f926c8b814ff7bec50ea067671796099bcebba71b54eaa55ebcfdd5f8649aca9a8755727225bc6dc312dd6df45e8410c9cb52af
-EBUILD tk-8.6.5.ebuild 4025 BLAKE2B 2649e1f0a9af56791d047f17d5b328e8bd0994194ff594e8c7df3387d0a138bbf63e7b0cf4badc9d7e0507d86e4cb46f9388073d6a3b53743e385289c37c6c89 SHA512 a22886ba707ab890aedd75593db3630f81c66b77083dd2d1bc7815d5a0d56891525464c6af56345e8b976d14ebefd6716a7a98eacfb130cab3a34657c1406461
-EBUILD tk-8.6.6.ebuild 4122 BLAKE2B f7b30a833d4d3d58fea0a666068a7009d0dde429b73a3dc8b5ca95463d1f1b6f272f42c5a7c1e95ddb1c3aea8e3aee94035db77369b6423dd76dc5282d46ba21 SHA512 467771543877c3d4abf029014d3b4c30d3f9415f195bdbfe06a57247bb560f35701f80888c8fe850f3bbf373e7892f746922d301abdf91c0215027bae66de78b
-EBUILD tk-8.6.7.ebuild 4131 BLAKE2B 36ed6ba660ee3880f84bfee33d2ecd58adaebb26d9a0b892dd86747fd81aaea425b716224fd613e9a9fb2375e921204848e33c7a17b3ccbc0d75bd28d6ae1fda SHA512 97bed391380a7c0a2ffc56d2c042b37f7b025a0636f57c942c9f4ac27fa7bab2a2f7335e8b8f920f3f46fde40f265fb3ebd94dc844a7c81b5fd240ed0cf43ac5
+EBUILD tk-8.5.17-r100.ebuild 2162 BLAKE2B e4e280058b3059213d10a20fcabcd54a17e74bf78bd6e18ac5acf3a51a3fd870743ea40dc793b6a0ce5ebbfefe9744f26c900542ed511f4ba2d37c404069bc63 SHA512 e0958680ae7beeb6f5ffe06093f27d482c22cba9dfc71fe727425d8fbe4b20e6270b2ddd6e8860b0f7433f84224f8b8251800570ea81f75209146876fd94bda7
+EBUILD tk-8.5.17.ebuild 3506 BLAKE2B 073a60dae07cd8dbcb19f626a686cce74d4e8e0f1216b4a8911eae7245ea2ad4d3b0c4d4a947d56ac8fca418e4927421fa264ac50ecbbad5998e05aeb468df19 SHA512 ae25cad437b2ffb91053c82a0222ca0b01329a353d273b2fa326399fe78fcf129957e746c0cfe1488bf2017ee0455161a71897d5d7b793f1d816b8b2df4d0cc9
+EBUILD tk-8.6.5-r1.ebuild 4098 BLAKE2B c760beb1cbd42ea5aa2c0bf577abb7371ae7665c8330c6da9985f0f743d42e87118f5f36621e6860ba5b3376435fc2c2542386fac54edc2066c3effdeeb1e254 SHA512 3706155557521eaf5477ef42f8feb8643c152ea8ade6b756b0e3c6992fdcdb5f71106e95e7f19da206cb1d12f5791584ada1eeb6f1defae91f69045aa79144f9
+EBUILD tk-8.6.5.ebuild 3999 BLAKE2B 951ef6cd6895648dd9f715d3445bf286d5fecd7abefd008d403613a2eff349ee84ecc1a97b692909afe544da32b071960b948ec329eda1a2e497cda85c16de98 SHA512 3cb86ad4c6b78581dea541b796c1ec9920449d4c28f3442114a43006ca8f75a20d21822222c728c71961b16b638298048e0fd22dd071b2630795c58f3b390a9a
+EBUILD tk-8.6.6.ebuild 4096 BLAKE2B 04ab45aadaba57c7ac09dc4c4eac8fbf93554ff9bc35f56fb27bdcd9af20005e1507757a8180c757858c7e29c1b618a9ba3b1f13f069f6d3ad73e92b7e590f36 SHA512 4f159609d9cf5c4ab5be78fc2bc6ccfb84f0475708cef065dac8806fe5fec348a121bb358e2a6562f9cbd200ececca2a6678edfaee00f5d576a4dbb6b7f35602
+EBUILD tk-8.6.7.ebuild 4105 BLAKE2B 88291b05ea46fb389d72e8aaf51bd0734af565f900481fdb11d14353cc8881ce4b0d8a46973e5a11e87bb857315d3476ef1bb3bff38fdc5fd2683dec4169f006 SHA512 55f7a2328cd8fa8f37e2ef06ce20a60e412b0f3405ef0637a31f1bc627113e74c0e68c2ffc4935a940c492441a229a8e8c06264cf4785ed114ddab4f0ddf4cef
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-lang/tk/tk-8.5.17-r100.ebuild b/dev-lang/tk/tk-8.5.17-r100.ebuild
index 74b8c11c8361..1eb7f8236def 100644
--- a/dev-lang/tk/tk-8.5.17-r100.ebuild
+++ b/dev-lang/tk/tk-8.5.17-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -31,7 +31,7 @@ RDEPEND="
 	~dev-lang/tcl-${PV}:8.5=
 	!=dev-lang/tk-8.5:0"
 DEPEND="${RDEPEND}
-	!aqua? ( x11-proto/xproto )"
+	!aqua? ( x11-base/xorg-proto )"
 
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix
diff --git a/dev-lang/tk/tk-8.5.17.ebuild b/dev-lang/tk/tk-8.5.17.ebuild
index c02680975894..ba1ccc104522 100644
--- a/dev-lang/tk/tk-8.5.17.ebuild
+++ b/dev-lang/tk/tk-8.5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ RDEPEND="
 	)
 	~dev-lang/tcl-${PV}:0="
 DEPEND="${RDEPEND}
-	!aqua? ( x11-proto/xproto )"
+	!aqua? ( x11-base/xorg-proto )"
 
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix
diff --git a/dev-lang/tk/tk-8.6.5-r1.ebuild b/dev-lang/tk/tk-8.6.5-r1.ebuild
index 58f59da86c2f..c1ec2facd229 100644
--- a/dev-lang/tk/tk-8.6.5-r1.ebuild
+++ b/dev-lang/tk/tk-8.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
 	)
 	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	!aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
+	!aqua? ( x11-base/xorg-proto )"
 
 # Not bumped to 8.6
 #RESTRICT=test
diff --git a/dev-lang/tk/tk-8.6.5.ebuild b/dev-lang/tk/tk-8.6.5.ebuild
index 6364158a803e..4e6adacef09f 100644
--- a/dev-lang/tk/tk-8.6.5.ebuild
+++ b/dev-lang/tk/tk-8.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
 	)
 	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	!aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
+	!aqua? ( x11-base/xorg-proto )"
 
 # Not bumped to 8.6
 #RESTRICT=test
diff --git a/dev-lang/tk/tk-8.6.6.ebuild b/dev-lang/tk/tk-8.6.6.ebuild
index be33b1d36f4d..92472b01b1f4 100644
--- a/dev-lang/tk/tk-8.6.6.ebuild
+++ b/dev-lang/tk/tk-8.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
 	)
 	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	!aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
+	!aqua? ( x11-base/xorg-proto )"
 
 # Not bumped to 8.6
 #RESTRICT=test
diff --git a/dev-lang/tk/tk-8.6.7.ebuild b/dev-lang/tk/tk-8.6.7.ebuild
index fa1e159eccd6..0261f20c9e03 100644
--- a/dev-lang/tk/tk-8.6.7.ebuild
+++ b/dev-lang/tk/tk-8.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
 	)
 	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	!aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
+	!aqua? ( x11-base/xorg-proto )"
 
 # Not bumped to 8.6
 #RESTRICT=test