gentoo resync : 23.03.2018

15 files changed, 20 insertions, 24 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ca5ff15ecd2a..7c169f2e16c8 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 75fac590c472..e59009cbc349 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,7 +1,7 @@
 AUX julia-0.6.0-fix_build_system.patch 3221 BLAKE2B a12ff55fd99444dfbdee5e1e0ead98ebc2c7d1bbeb95c7afc5c776248ca322dd596833c68f68d7ea4812def6cce322dc996f45187cb4b730e2ae44e080dec35f SHA512 5cca475d1fb4864bd26326eb3a6da0338fc473de26057848ae3c15f49c0a3b338c7d4d26ce906307d7f6fac2ca08c8df8551fc3a33b7d86dfe859dae52e50e67
 AUX julia-9999-fix_build_system.patch 2562 BLAKE2B 6300c91745656c47beff2f201376cb5ade9bc504fd416fe0c50867b4e3dffb5edd9295aebd1b8d43b1c1ecbeaa7382864c61604191f3df2b7162556ffd2499c4 SHA512 cdf084881f70890f523690eaae3e059ed09688156851dbf0c19878e8d6b76aee8a7144a9d604087c61c5db30634db530dfeba943ad170003439c8696715f677d
-DIST julia-0.6.1-bundled.tar.gz 2097663 BLAKE2B 4f16b636e10cbaf9ebd8394d0341c16d7cd7244b6e1467f264150cee64dd8f33aba7381670b7f66f822dd06eaa55d18b0ed04b38931a1943a8212275c1854c26 SHA512 50581da3628930b2d1b89d226f3551fa7b18ca23c322b7e93d1227cc0c3428f255a6087f9859ff2c592014407d53238e01a3847a727a87287fb8c7f679b022d1
-DIST julia-0.6.1.tar.gz 5587691 BLAKE2B b230e717bf4a4f63319883b87bae5b51a2dd2d0be61ffc15eb89304fe6394df67416ed11d40f258a13d7f3ce4272452cfbe1bd482c368d70cb0d3eea9512d8f9 SHA512 8e7b14e8bba1eae1d2a7f43a114dc42e1870d2e692d8892a09475f48839c9b596eb8aaa24b111d3bac6836282a4d7ab64d10c4481c8193f1574cabcf2541db6e
-EBUILD julia-0.6.1-r2.ebuild 5032 BLAKE2B 24dafef2be24f944372acbf696cdd11ffe9fc34d0ed16a716db090ca558c8ffd1339ae294e0d83e705bf5e482962d9af44c742066df62e7bb195f44dbabe8585 SHA512 8816ee8cfc87b3b0403d0af7d5381548f29a52b39eb45a776d90e9bcb91008112c5b4bc1a0f596259d58c3810cd97757cfbbb1e634df79553981ad804e8925f4
+DIST julia-0.6.2-bundled.tar.gz 3508868 BLAKE2B b5b3f52d8036e5603b62606cd096f22f8a975f9cab2f9baad902c0208a81868359005e82a17e513a7705ec717750702cdc12ab476ffac3c1c38158f06d80ae99 SHA512 3a9a6cc43aab2eae6c57812287958e3a1ac1718d6fdf08e5ce7c8e8e8a62231fb4d7b6f064e2d6941ac750d8924f5cb37ae3ac4e2d18f366a82c94bdc9e6abe4
+DIST julia-0.6.2.tar.gz 5592907 BLAKE2B d6d25f43cd650f6a079c4ba6fe533e6bdbf6a1123255d7651460e297ed3d35a832688e19efddf41c780fbda2eb861bc8ed5f7c59ea7efb5fdf490eb2e7a47f5d SHA512 679050463ed5825d34c477bd44cd91cfecc7d1735a2f52cc70b509afd9883cb60902861643266ecac5ba6cbb03f8fcdd12fc2e87dc41b9ed0eef813fa40610f1
+EBUILD julia-0.6.2.ebuild 5011 BLAKE2B 188b13404d5640ed201f3bd1b4906dbc223312fa1e027c1d8d8d3c0196311c8eebe0190c5083534a78f257f0fa5f7fa6d68ed7165d4699e441805e7ade37b354 SHA512 7741f561b551654993ec10b3353e39efc20e214f6c7eaca3844c0e74afddde66746fb898022b63cacff39529f0bcddb72ae77455f89c53a5ab28f6c8fc05bb8a
 EBUILD julia-9999.ebuild 3971 BLAKE2B f0308fce5dce9ff8a875a68d25a4b6bebd12d74cd834b2fcbd9f4fc525a0b2b23bf4b75789d1b03e7ba62a303ea6c7d8f44dbcfd9f6536305444426c616dddfe SHA512 7c2d033552ad94456fd90fc3eb2e825b4b03da90b24e9034f29b2bbe02fbe1eb5f1ef3ef8145831649211a7b193997f5c4ac5155a81745b55736cdbd3b87cc95
 MISC metadata.xml 1177 BLAKE2B ef735dbeb4067f98e71bbd22c16f43eab7c5507fb99815eba4a61370593bdf2d778ff6c18301b73869117e56014c93b61a42d5467539ee2ceac9307595cb0eb2 SHA512 1ed4c6477da40c7a79ee1f9efe1a33eb0ea61ee150a5a50b0c0e0241b0177541d7953d4043d159036f68d116aa41fa9413caa01b36c688fcdfb874e6627f234d
diff --git a/dev-lang/julia/julia-0.6.1-r2.ebuild b/dev-lang/julia/julia-0.6.2.ebuild
index b625513a86a9..397cd144fe2d 100644
--- a/dev-lang/julia/julia-0.6.1-r2.ebuild
+++ b/dev-lang/julia/julia-0.6.2.ebuild
@@ -41,7 +41,7 @@ RDEPEND+="
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
 	>=sys-libs/libunwind-1.1:7=
-	<sys-libs/libunwind-1.2.1
+	!~sys-libs/libunwind-1.2.1
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
 	>=virtual/blas-3.6
@@ -56,8 +56,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.0-fix_build_system.patch
 )
 
-S="${WORKDIR}/julia"
-
 src_prepare() {
 	mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die
 	mkdir deps/srccache || die
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index f73ad4d56d3b..b030f6dbf28e 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -8,5 +8,5 @@ EBUILD luajit-2.0.2.ebuild 1701 BLAKE2B efab2a2a1353da44875c08337d617c41669fe71b
 EBUILD luajit-2.0.3-r1.ebuild 1359 BLAKE2B 7636abf7dc42fa1d7c0c791339718308ca2d4b3e08d4e1f132669bb8d0354e2cb106614dda5642785bb8050a6280fa1adf825e7d78ab166184489aa9ac9af6f3 SHA512 4d49cd2b1666c56ad86f63b20660846cc0d2b85bb430177adee0a059f09ee9337f979f04f27262eb8e54081dca2bbade2a13969dfed30f4a7ddde77c14a284d4
 EBUILD luajit-2.0.3.ebuild 1704 BLAKE2B 64a61522a1488c13178dffad3114f900b27aacf2c8b00971f83edb8312744cc045d03567beebbadfdf97bc0f7b8043826db3f9f71ddde5071b7d3abcfdc93556 SHA512 dde1467f89f2feac5123d2f63f1e305925fdca04f09fb4725cf5e0da3ff29ad0ce894fadce71fb1937a5954f14017000cf20175ba639c520cc868a7800577528
 EBUILD luajit-2.0.4.ebuild 1358 BLAKE2B 3dd160052c29cb09107ee75a1650f20959d192b74e2fe1dc4dafb7db0159366ebf264adc1aa078a45691e2cf62892994dbca695abf2a3ef56d4a49c2ba4ad174 SHA512 94f00d88a15725f285061b6d2f5be4d565bfa004776115f7625bfe6aa60ac08c7dd5797b1766de4a225e35938771f297d592f7a230ffc2bf948084bc4ed4631c
-EBUILD luajit-2.0.5.ebuild 1373 BLAKE2B 95ea182b485a7ff9a2ff82cfced1f98e03e0be758a7a1cc65235477fceacbe992ac26ca67456abcc8020a04eabe932d5bb0e3e14274e92be44184e82e5333270 SHA512 3bcdcb189406fc9cdd589483e73cd6c381764edf20c9d1ca23d2e6a815c349594000f754134674333d4b9e0c5cfc77e79c3c0dd8aa03141c45c8f22f936ddd35
+EBUILD luajit-2.0.5.ebuild 1362 BLAKE2B b182f5afae6fb12e66c1cab40921bb1f81c712f25820e1e40eb82bcc8e3d0596af2a173b71e981acf92eb035375877369ad23d44065ebbc278926f487b30929d SHA512 ad29a171d9798cf7713a1480141ca29e5a38d25eb68c8345d7969b21502bdd60b30b1279e1e294ade12f3de8f6e40685aaa1b5f64a5ffbef0a48e94018caab9e
 MISC metadata.xml 552 BLAKE2B 50666bd08bb7c06c52a28652c0a87988e815c1d3c10cc1425cc7979689fd4738f56aaa6478aaa616a0b76122e42f790b3b415a60078dcc256499019912f0c4d4 SHA512 9d6ef1cb9acf52db52ec192bc51cbab6a7aa198dbf108ed76b25b0e258491b2f8d5ec0981c538546cc96de490c8c1ac852e337ef09ab5898ad4f2c48f5670f07
diff --git a/dev-lang/luajit/luajit-2.0.5.ebuild b/dev-lang/luajit/luajit-2.0.5.ebuild
index 7f2cfeeeefca..5796c4dc31f5 100644
--- a/dev-lang/luajit/luajit-2.0.5.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=5
 
 inherit eutils multilib pax-utils versionator toolchain-funcs
 
@@ -25,13 +25,10 @@ IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
 
-HTML_DOCS=( doc/. )
-
 src_prepare(){
 	if [[ -n ${HOTFIX} ]]; then
 		epatch "${DISTDIR}/${HOTFIX}"
 	fi
-	default
 }
 
 _emake() {
@@ -59,5 +56,6 @@ src_install(){
 
 	pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
 
-	default
+	cd "${S}"/doc
+	dohtml -r *
 }
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index 4c281951c95c..5535b979068a 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1,5 +1,5 @@
 DIST orc-0.4.27.tar.xz 465116 BLAKE2B 1289867c84371797350847e1ae71a002ec250abc56611fe6ec8d263ff64e17ed8d990f45adfbf6d1a0c7e98c2e6ec30c3135e433f00e9fa53cecce359f5b2d72 SHA512 5ca0b4553e370ea7c95acfc8248d9d568dafc9577041d47f52c7d0945456c534e18e0e80d28df9301d6deac1ea4f8ea6a51ca373b32927c8724846d8ec1f73e8
 DIST orc-0.4.28.tar.xz 469460 BLAKE2B 86fa2d10a33fbffbb2b96827adbddaa81d0baa8135fe21fba338cbcd25a1c1e853873ec1c4ef5c0a32d66ba95f855f1f16ddbc32f68a89e5a98c75b9b0261aa7 SHA512 2ae3100e7d0c03eba9a8a10a8924da4d729e1967b63e5dfdf88c4aee907d7ece82c782d74f4cb7e28a366dd74ce5e1ddc6e2b971e5a2f879b0501cc313b93410
 EBUILD orc-0.4.27.ebuild 1832 BLAKE2B e0e0f1df95102719f9f079efdb27760192acb8b3b27232a27984cef94bf03587d16424234d368583200f9e6e4183f7068cd322b55d3d9d559d57d87c5b00d438 SHA512 3a66189a789f995069dc8869fb33846306f4a0e5ff3419bae1e921c26b1187615e17ca6c6f4647eed8e4fc0ab4f5e03a6df0a3dfe762a9090aa409912cfe4497
-EBUILD orc-0.4.28-r1.ebuild 2171 BLAKE2B dd458f3037a721503a42531f4bc119816315981cebae67091675031863650d38b4d4c16000121fdb8812f68f1d9dfbe036861ad8708b8575c3615b58ad46b23e SHA512 5dcd22342ecae77d8e73f7d316f82b86cb77906f5cca2a1094ea5afcaa4381667e9f4d23d4b3bbb96169da3e96fc6109c29305e2894ef5a64766d7ae076ec932
+EBUILD orc-0.4.28-r1.ebuild 2170 BLAKE2B d06a664541d730d426ccdf68e573aaee029686feac2a5542fd299239210b46c599a95eea71c280a26e0db5cc8863315a8cc16b4febacc544e26b3e34635e50c4 SHA512 b4cfdf51d5460c812afb480b9b547070ab4069935a4d9d375a8298fd97de84b650a0f4e25882d7488fbe589e925916e4fece70cbbdb28078f6baf7fd3ea0d678
 MISC metadata.xml 354 BLAKE2B b24bce431d7ad10e9231e89b522e67de16192ee4e48281b8a17f002692632449ab676cb9df6ff5a22563d6f9657ee6be11e452bac41f8a537c598822efab85d1 SHA512 4f17c4c3faa3f2c5feaefe4727b3500360f7cc5486c794e9a34608c3e437b4e2cc266bc9e0e2b3824952a8da62421fda59e9bc5140ee88898f8f7bdde402762f
diff --git a/dev-lang/orc/orc-0.4.28-r1.ebuild b/dev-lang/orc/orc-0.4.28-r1.ebuild
index 9b33d449d8b1..3dd790f975b9 100644
--- a/dev-lang/orc/orc-0.4.28-r1.ebuild
+++ b/dev-lang/orc/orc-0.4.28-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples pax_kernel static-libs"
 
 RDEPEND=""
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4ee6973d5af1..ed9c3b02c79b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -12,12 +12,12 @@ DIST php-7.1.15.tar.xz 12201380 BLAKE2B 4387382daf3883962eb0e47d86c983a65c293e89
 DIST php-7.2.2.tar.xz 12022280 BLAKE2B 63daabcc37dc530524c9df58526690837b61ea71e9616bde22b3bb367b76504fa87f6cb976f120e57d6ccfe7ec6b3a1608d951ab3d68213fc401a6e1131e0e84 SHA512 36a3565161fc481307ac3e76c8d2ccc457c265bf510f085be1907835c7da7c747a0876502192d77bd664f94a584a1b149deee2600c650481fbedbf02d72d5fd0
 DIST php-7.2.3.tar.xz 12098236 BLAKE2B eb5f6618f31aef85db5f9010f0d000880b6f6e83314ba99dfad90c5d205cd2ac74ad4712681aae49b7315fab88a70c3bc93fdc7790f114b1ecab8cdf1c97ee4f SHA512 843d4ae46182eaec58beb583a321c55a6baddb0dbf1b77d7cf31953d816fc74813937576a87d0a18d388d256c5ec3f1c80065ec636e2f70d362384112b8c6c72
 EBUILD php-5.6.33.ebuild 22554 BLAKE2B 0ab011b206772d7d83ee135cadcf0a9d304f29d6ce78fa0bbe7779d13cc1205287033878870810240996de89c519b805da989babcab926a2285e16e33d0352a7 SHA512 27eef42a39637986fe63823cb387e5d6ec481776baaa15ee51009f265d0fdc4ea0d8120349858f290f9c743091e679f309a190318bd02baf0b87931d0567dc24
-EBUILD php-5.6.34.ebuild 22660 BLAKE2B 57f9d7378f05378cfdbb017f201119e7421a53a7b326ac851d4569dff61ad27a23c532bdb9546250d98c4e21542065c2b64716d848165aece4c7c8c0cbf0073f SHA512 3585741d38ab8e69fb93524dd7ca0cfde802cb16cb1f3440735cd8579b475924b106054daba3ad447744b911cc13adfd2b4731aade4b840099575e92db8bf453
+EBUILD php-5.6.34.ebuild 22659 BLAKE2B 2f5365dedf6e1d2d773272d1b6ba7a8d02383760d67409571b6d9325e2530eb2a08fc10d26488e02653e12ff368fdb65f95b1daeccce1086cd3a864d9e09840e SHA512 4391c1aeb29856cc2e692366fe6759604a1f0960afdbcd736bcb949b6063de15479aafd9021932c3ca907c0a4421ccc36037bfc504a9e01ff8ee1181def8d345
 EBUILD php-7.0.27.ebuild 21616 BLAKE2B 77a83b763bd9f4b6025efcd6463f7147a600b0b5a649dc3c877ac027392e5561485c9d6251f7d5efd9da8fd297cd658d6dce3d66e547c076cc243625e7bebbb4 SHA512 274b6ad641240d21df903f37193591e4461e0f2942c068298228ab4bb9ef35909ffc7be7cf6e82f348ede30cd97dc4ceab72d78934728f3b79a1bff66b06f5ef
-EBUILD php-7.0.28.ebuild 21722 BLAKE2B aade53337321f611e58ca18a0e080c98d0bf0ea6b1a79e3e1c0876598a2821db281455b7e3812880026022d8abaf37414bdd1d5777e2e966cf88819f81a3c187 SHA512 2ac45a42fb9457f7e79441594d0221af3ee8c58270ca0b6c9f90acae40cf97a75e10667046708ab2836c7f86dd551f7becd711db3c1f58996211c112d651829b
+EBUILD php-7.0.28.ebuild 21721 BLAKE2B 57bb8a9cf7efd84407b256bee05ae02d1a987ba9297833d709f00cae2c9716d19cb7359ecb6e828f67e50a970619fed3779dbbfba9de2f3d4997b6256677affa SHA512 d093e5add76f2ed5f62560b17cd3c4536cf5554f57837963b569591ea457bf41e3cc4fdd7fff701ed043cb3af1af862293cab033bee3016fee59b95517692cfd
 EBUILD php-7.1.13.ebuild 21482 BLAKE2B a5c1e77bea3cfc4e7020a858c19768073c51a2ebf6d1e3e7a43ad2db87ba317e9dd0f51d88c34cd7a3eb9eae0dd830cd4e347a615b58fc2aba5eaf9163d9a84a SHA512 890a25fc5475d67012dfa757532aa691676dc8e6a98b9d648cbfcabfef4dedb98ca96048ba183945e5f0e91942714191c18aa3120c8917159197a501aa05f378
 EBUILD php-7.1.14.ebuild 21513 BLAKE2B b04b090731e9e50b8cfe26b0763135405e8e1b0a89c89093e5ad78db4b5e3524cf0fd088cbc84be10ccee44436e49172291c17ce63703e952124bfb45cf3bf8f SHA512 0b2ab1f819f794519f46cc8c5897c8cafaec2a557c19fd674bb6828691993726468bbb0baa0ef5e978d3f0d4c8b6d7db83968838d72a28484788e56e5260f559
-EBUILD php-7.1.15.ebuild 21610 BLAKE2B cc17fe339105dcbed9e7bcef72af613bdfb66952a764422ab32f72b2cb0e978ad8284e22b47ed8051c79805dccabba2d1ef433a1557d0e9cbab39e23b2ea9f16 SHA512 8e9cf77bdb9c49b083cf7ce02126efde00485151645515ca69d0da4994f8b132f1d53126dbd0efa34523a86b96899974915ae0011bb5ac4be4d9349dc4172431
+EBUILD php-7.1.15.ebuild 21609 BLAKE2B 68541ac5b2120ccd7b42446e3a7ba7ae616e8aa937ae6b94a3bcaf79078c110e20cb7a5e222740a657847da43c7aac6e1735e1939900c6aaa67ca00f3e2d9746 SHA512 3327ae4963dcf14cd0d0d39f995bf1fed253f279301c8bc81ee0c001e161fa982ac8e3c05810067280a35aa990a2b2cfa73b45926a82ffbe94b9f163bf05cfb4
 EBUILD php-7.2.2.ebuild 22044 BLAKE2B 7caf5e15355936098996e4a4ab5d308e835f4c8ebc7ce6ee569f32d2c99954748277186d9bb9e85d7b249fef134977d1aa7909ed1fb269867def8733ca0a1e42 SHA512 e9205bf85fa30495c9827439a4d18948383d50dbe65c1b433439d3083e3dedd0a05e1cd5cf24ab3e8e661ef29e35e9014acbdd9eb449eaf6ba2266f89d3fffa7
 EBUILD php-7.2.3.ebuild 22144 BLAKE2B a1a4343e37b3cc7a3c3ab83f659335d44941f53681dfc436b8fbc0f0b6c83f44b93f9afc0517a2b34bbf03e7dec4804e2a04a51ca1d18fc3897d2de916f10755 SHA512 06156857b83d4f3744bef4e4d84b255c4d63e9e151507ac34b329982d0cfc1611ed22c24984e9b0c029d116601da15fc6f932842e91bf55e1809f40725032e67
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/php-5.6.34.ebuild b/dev-lang/php/php-5.6.34.ebuild
index 90f4445bdc40..9d6dc1997d2f 100644
--- a/dev-lang/php/php-5.6.34.ebuild
+++ b/dev-lang/php/php-5.6.34.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 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"
diff --git a/dev-lang/php/php-7.0.28.ebuild b/dev-lang/php/php-7.0.28.ebuild
index e40adc29fa95..7c206fc0a2ad 100644
--- a/dev-lang/php/php-7.0.28.ebuild
+++ b/dev-lang/php/php-7.0.28.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 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.1.15.ebuild b/dev-lang/php/php-7.1.15.ebuild
index 250a3cd30b49..119b8e8e852a 100644
--- a/dev-lang/php/php-7.1.15.ebuild
+++ b/dev-lang/php/php-7.1.15.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 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/python-exec/Manifest b/dev-lang/python-exec/Manifest
index f88b36264657..1a39a4dd86ee 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 4446 BLAKE2B e2e8cde260d2c2520abfc4bda336c9cb25f067e4ff4be1393f010c79971ab91e6b875a6b7109d2d52a17358b9171cac6ec1a7c9cb60347d03bb13fb0402df162 SHA512 c010bdfe3bcf6593a338ca7987291d4b62f3e9cccfe6e23cb5b0dc886ef2bdab2100a6dc5d73e6505545bca770fadf0593a58b443bf0a0e4009cc5401ca78b2b
+EBUILD python-exec-2.4.5.ebuild 4445 BLAKE2B 94b71a5e51e131b4457c0687eb4d288c8e923eb6282a88e8af2ec5a99839e0bf12a2f6d47fa0c2c242bee69daacaa998a34b894bac17e0c4e3fec6913848f223 SHA512 2d24cee521f09c3ac67b516abaea43c13ee684d35c3606363bda2433bac7f80e1760574e01eb0d5ed82dbb29caf8d17407d69e212c66c8a6e3d8dcf1782e2629
 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 58f3f67492f6..e0fc944ae546 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/ruby/Manifest b/dev-lang/ruby/Manifest
index c7e1927b33cb..f527a612f723 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -8,7 +8,7 @@ DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4d
 DIST ruby-patches-2.5.0-r1.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
 DIST ruby-patches-2.5.0-r2.tar.bz2 2986 BLAKE2B 64d64eda19bff94f205a6314c2af59896064fb64c118e0f3859d82aeb7e58478170b9160804ab8faf569054b65228abeecc5900e568e17133c21e9aed9bdf589 SHA512 c2bca3f98c7bb1de267b9f07eb1b0903c499c79e9c9d0166a6924e88e837434f27ddedd7aead7ebbe32f0530f751601ac5486a0db46ee28b94d7cea13e0e7924
 EBUILD ruby-2.2.9.ebuild 6916 BLAKE2B c194ff14baceedc1e76d9098aa346dfc83a8a4ceb11668f197b385ccbac5f3d9f40bc846e5a027c42f965d38ad448545f5311ef659beafd4cdc90f8cee84fa8c SHA512 ff1d71308241fe8859b5a7e23835742c209af547a0f61cf0d775b9c4d8df3acf9113e8fd4047743eae4fe86a6bf0ed5cf40bcc7de9e7c4792d8cd89b506f510e
-EBUILD ruby-2.3.6.ebuild 6877 BLAKE2B 6e9d6af61b28fb15a30a47de317e21e5b7bcccd75ed75559ca6fe31b34bfa5c907513bb448100bfc6f1d3da7c57dace25629ed2de981f65c70a442c9857bdf8d SHA512 4d0d7c0699bb440a111cb5196fe7d59c72aeb30940468d702d7aad8347063a3712280357f31f87b27098ec45615d8efc14200f25099a5a636d3b9b06b490d644
+EBUILD ruby-2.3.6.ebuild 6875 BLAKE2B b26271e0f50c4a0d8877519053e3fb25b01d593bf1408b927c382869393e0c563cbe4d5f2e1805aa1e24bdac2aeead7120598b84f975ee73d36447b2cb5c4126 SHA512 7fa817084c0b82cf4b919c728e421a265ad495e92be317354c9c82a4188a22bb828d82f09f1d3a516d5d6c1b9700a395117a226435c3672e11f1912fe0be6520
 EBUILD ruby-2.4.3.ebuild 6980 BLAKE2B 2a08be5225e43fd5e5d7c90ff63ed43b6eab9b6e69ac1df7aead9657d651267e8bc0e741e16a276bee7fe5ecca5565d17d1428d96e5713305d278f251cdd99f4 SHA512 f43e497753a3fcfc0ff3e4ff840ae8cf3003671da0fe55e62651c17592f885cdbb99ed76ff6b99581ffd0903d23bc03b5425839f884f9e0e7ed925fb748edd4d
 EBUILD ruby-2.5.0-r1.ebuild 6772 BLAKE2B f9ac0a58ebcd718715fb67cbbe90cc853a14d8ba717bd91e93645115c5b37dc4def3827dbd01ba7b91138468b124c3581f90a133e88884a7f2b9a902f3b4ad82 SHA512 ed302d0d2a27d002a1b89aaea3b25ce6c88660f1fd30469cc2d292cfe3679bc477b6f8ac986964db45541db091be3040ee8dc8a76f5c10995d307dcb4246042b
 EBUILD ruby-2.5.0-r2.ebuild 6772 BLAKE2B f9ac0a58ebcd718715fb67cbbe90cc853a14d8ba717bd91e93645115c5b37dc4def3827dbd01ba7b91138468b124c3581f90a133e88884a7f2b9a902f3b4ad82 SHA512 ed302d0d2a27d002a1b89aaea3b25ce6c88660f1fd30469cc2d292cfe3679bc477b6f8ac986964db45541db091be3040ee8dc8a76f5c10995d307dcb4246042b
diff --git a/dev-lang/ruby/ruby-2.3.6.ebuild b/dev-lang/ruby/ruby-2.3.6.ebuild
index c0e688aa9c14..b320959036ce 100644
--- a/dev-lang/ruby/ruby-2.3.6.ebuild
+++ b/dev-lang/ruby/ruby-2.3.6.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="