gentoo resync : 02.06.2018

36 files changed, 350 insertions, 472 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6e1856301037..4bd7c422da66 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 8516d13d2cf7..efc944b39337 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,9 @@
 DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b60728e7edf6c0040ca87f991469c918fb0d4c96239d1483ccce0b729698cae9fd6d9988626c1a7ca2d58f47bf1c SHA512 f45e6f5eefe4a4bbcd233fbe06cf25fecec3ecabebea9064db0f52d900ae90783dd180f90d70901f82e2b632ce0432d28a913d312b15225e6256344c176a3638
 DIST byacc-20170709.tgz 743677 BLAKE2B 453e0083671ae17e3401bbc474a9724091fb3314adcee0e13ba55a95a12c4cd351ef901b645cb46e0df89d2053054e46a05703d418706bc962a0cacf55bb3201 SHA512 81b6e2dfe674d7e7650e1583c46f67e20cc5ff56b06ef73a54ec2070abd7f4af1a0db7909f31264d0e6157acd3661c19c3478e06c9bab395f53d0371bc1e9097
 DIST byacc-20180510.tgz 744070 BLAKE2B 9ba861ffcd310462513d7eb4b663c5c44f5cb6dc06ecf1cbcb41c309054905781c4ba1ffada88eaf0071caf16d78a5746d53e66190081e388b95f4a148684cca SHA512 89ac9d4bd1edfdcfa304b0efacc478dbdd84cc2a1cd4ef75515863b1ea2731b106202c758b469c39a4379bb155c0a2365baa290797da0a6bb3904295431556d6
+DIST byacc-20180525.tgz 745273 BLAKE2B 5b4732cede6d284f9f866b8e7f7f1f48b7eea26fcf203e633767115a2ba324586590477b9668b2f7e961db4765e2602ba78d78a2ed55d0c102153b5ed15e9cea SHA512 ab200b7f1f0295731cda0aff08ee60c1f8a4e057ca9de265b916de690e900abe67ce9b5f6f5d0e69945485e9adb5505b079d82f8e126eb1ea12d22bc6015d73a
 EBUILD byacc-20170201.ebuild 611 BLAKE2B 513619d2ce72704b5c32a23ab3642a0afe816835ed2989e8b12bb3fa541885745425069251e3b16ad6db79243256dc2759e68e44d3faf1a2ae3aca57ce37432d SHA512 9cb14b8ff369869a7f92ad8ae22a845bf3904da259171dc98ba8a87c8f3138bcdb618477d397b5b07d9d0d073df6a1d5ec36ddfb16f6376fcf708d7bc3c3c04c
 EBUILD byacc-20170709.ebuild 620 BLAKE2B 4a2997e5186c9100bbf77da2fb135b7fc552ac4621b36f6b7f72e3c663b37d437eebe7049657c67f24f460c36bb6121b255834296a085de55ff17d7e24c2ad77 SHA512 e7b6590d7bd61eef0a18cfb92cb0426a099b1e276edc0f5b00bbc4c5d48928c8c75620dc48abd5ce17b260ca3f9452ca800dfef57b61e4fc13e288625763871c
 EBUILD byacc-20180510.ebuild 620 BLAKE2B d907534063b452d07169f2dfd86b6a79c7114f0327243d0dca071b66a35e85a58194ea6499e7b88063220104ff910fc937c6444708274c2f495d5460f1c317bc SHA512 2171da36f607ae11b786965935816457f9b4472002bf85f65d92011ec1c176bf2c755ce3621afa07e007269b87533c54013789c5f8b41151634d88d4c6f7ce23
+EBUILD byacc-20180525.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20180525.ebuild b/dev-util/byacc/byacc-20180525.ebuild
new file mode 100644
index 000000000000..e0e5a971f5d0
--- /dev/null
+++ b/dev-util/byacc/byacc-20180525.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index 6f0232e254a2..c57cb4adfab2 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -10,9 +10,15 @@ DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50f
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
 DIST bufstream-0.1.3.crate 8375 BLAKE2B 6e64cfb797283f935ccf309fc054eda4c362fc482b68360619b1146698a0db5023013ded3f1c64ecfa29b55f10dcb8c230d853f5088f28da9ea1c018147d9247 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1
 DIST cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz 4858889 BLAKE2B 29ca3920b083264057b9d1d0e7dcb2ad945cd42e791b24cfce353085bcdeeab467530035f3e03fdcd9323097367c8cc20aa6eba96d15421aefe2ad99973efbb4 SHA512 e1d10ff096da535e3bed5275b31d8cb95d7135adadbec4218f77c187a6cb8e992088663bd21cd8e0b40627974cfcff39f508e387e32d07da0b5be486be45c42d
+DIST cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz 5828897 BLAKE2B 2b9d34839926ac3346eed98a5460551e678276c25b4c5ae62a6a43ac35d335f7ca0174f459049c58f4d7a81aafe8cecc9d2c4c9d07439d15073b2cbe5d220a9c SHA512 2e091155c9599b3a032c9d0698f64a0c1654e88a5c9df6c930063885ff0c3be6e3a8a6f9577982004e4b1c83d1c78727da8d364665da4d1a3e053bfacdaef546
+DIST cargo-0.25.0-arm-unknown-linux-gnueabihf.tar.gz 5826101 BLAKE2B 0bd4bcd574ce42f52698f2fa6d564b1292582f569a8ec547dde33668a4c8c72327fc949ed2b6d925672768ed0b7b47821d1c92d737faa9234d53c185443e0b6a SHA512 f24c4b2509824a8ff25ed6ce0ec011b019f7e6eb16ebc4382ab233db96732fd22c44dcc39d6388bcd6a6b79100eeb13ffe4188d727f4e07ceee4a5777520eaeb
+DIST cargo-0.25.0-armv7-unknown-linux-gnueabihf.tar.gz 5674664 BLAKE2B e9878f6c89bd9545b65f8c1e888fc4c632377bb77a64d4084c68f50aed0553bc65bce61bc732ecabee7fc88754f9e9305d9a8c9abe3629b4e7be490338a6915f SHA512 ef2da09b121374a33a607114ab4bf0a3e87af96cadbd8757076773aea4028e1105232dc9ce0f34a90e3bfc204d2f43c056fb07c54b6b7ca0861ffb2d124de0e6
 DIST cargo-0.25.0-i686-unknown-linux-gnu.tar.gz 6083273 BLAKE2B e27a6372c3a0eb607cdfc82b9e2f2b3e2d4cdb24c4548329a6fdebc0f4568a2c19bc03e1abd0f9b52f30528c8fb3b7595bede2a88de5c61f9ae2d94e55f4cbba SHA512 3bb78ec5041fc84648d94a1f144a5eb0cdb7e80e4f6fb308052d354b1916b6d279e6dcc024e9b0bd25dbc8fb1ffffaeba7b6ad413778058053aae7bdb73a6319
 DIST cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz 6004007 BLAKE2B dd94d56aba7ae7bb10dc4fe3c230d56f118196d8a9ad93f59c8591da5a2c4e466655cea468eab76ae35d6ece2a1b802090c7832b870b715e2e9affd39dea8cd3 SHA512 378adc19c342cdc54179cef408517ede6075ae6e8040df5c0dd0344c33e1f2697838218c3351000c213b84e97b4cab31f51ea6c1c7c1372621a55106b1f3c5f4
 DIST cargo-0.26.0-aarch64-unknown-linux-gnu.tar.xz 3060104 BLAKE2B f82d0fd5439169a0027daa406fadddc381deb35fdf806e2f9753dbd0b716b14e1a0dcc91ed036154ad36a4b42827e80bb431bcd038782386026e695075eb6f66 SHA512 b3b53bb1ab5bb6f04149667f1592f3e5b4c79c228f3b4db071507ab4b928f6990a0b4055b57ffcf1fc788f48209513dbfe4943b1620f1e1b60e770e434e03287
+DIST cargo-0.26.0-arm-unknown-linux-gnueabi.tar.xz 3670620 BLAKE2B 7f437a84bdbed165d17d6fde0c26ea0576512aaac40f5b087c336adb8324cbb119c3d822cdc0768981acba654c354381ec73cd8104822e9a7e2627bc7851ff09 SHA512 e823c02e20a6c19863d08792bea151b46acc533f1bb2823ba6a73127940fdd77f3e5f6542ee170cd0f70216fbbaf7029f91887da512b81fc343a55b646973d52
+DIST cargo-0.26.0-arm-unknown-linux-gnueabihf.tar.xz 3695968 BLAKE2B cc9c36ef582ba734792911542c65b2b779c768d2b60fbe45ba748f90f796f20684408225951d473df5044b70a76b70800d40355ca223df4343f3b739086132c6 SHA512 0eb2b64eaf30bddceb0cb10b15ddd34d6360fa2038c25116d074d7f480ea0af2ec8d2825680252894decaa88a10872dbea7b77e5a2c4923fd5fcb022b3835ea6
+DIST cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.xz 3694064 BLAKE2B 3ec8596000d2b0818e4803c93361d7a82b136a5d00c29577c951ebc73df9145d68bc0b055efd71eb9932934e132baaa0648a3493c53b6627553ae3c645f58022 SHA512 8a80f50b46b37cf1a8a90fe4841c7ef27e81791e533712fcdd8b35250c17db6199689337713667399cfff10c40b847f48466bf145b58be7a54f794e3f6b34800
 DIST cargo-0.26.0-i686-unknown-linux-gnu.tar.xz 4104468 BLAKE2B 1325a2b0c4da3c4788e04f8d61f938fd7690ff031891f89d29d74f5a1c43425d4ade0b306309205782ae8624733b8f365ca033052ba95aeee730a69900a4ab3d SHA512 4e30b8091123af894493e8c704723945abaec21befabf54ba3d618d8c6586352ce02501afc0229494f99b7612b82e049fb5c35ac419282349673394c75a2c6d7
 DIST cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz 4134388 BLAKE2B 961df201fa4f87308a28b217296c7927e6b67f513e7eaaf5cf12675ab4c01c50e60bf8756c2f8fafe1e4b2d7e3e5a8daa446fc1b72014828d0233209434f1dda SHA512 476041cb12a49819250d96f246d900769ab83386e584b3264b4f47ef5a2182d410a8606054a330da653cf2b2a290193c7260af5c98a29d6969b6c7c5169876ee
 DIST cargo-0.26.0.tar.gz 698823 BLAKE2B a16b69818c029d9e2f6a704d6c5875d2cd01d4c120b9df18c9e33df56009c58870e7f48a0a3709dabbcc88b535a0762fca3ab11069e4ba2506566f89e8773533 SHA512 0ceba204f6effb0b636b8a4cab38ae876e32d548a158cc2a67f3f80f144d4a05ce5ec44df74eb7e17a3dcd57105298dae1ac599b917c0dbb4b7386d3cf424070
@@ -178,6 +184,6 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
-EBUILD cargo-0.26.0.ebuild 4149 BLAKE2B de03fe7e2771362343f15663ccd7ad024ac6ef84b829dfcd1f64b828fd61bdb9ee65298b3e2c913bde8f90b1de93efd5b290c2cc83aae19e7247ab38f08ebdbb SHA512 9161b7ecfaedf5b99e03ce8d06eb5286828cc8f2ff7ccb32ee1d94b3ed5f4c796c86280faff2633b5686c14cfcadc9fe88c439591544377c9b19de9d3ab761ea
-EBUILD cargo-0.27.0.ebuild 3930 BLAKE2B 73edabb87663068eefd6f777facb48a9569d341676fb58a5c0e5ed970d72da67757524e4a942df1935d87182796591ee8320f0ad4d00fc70f7dc4ea70df26085 SHA512 d367c3b858b0e668f85ba2003fde3cfe318697d6b89b9aa9d37ee6e966590124182b7edb7209409d08ce5b787e10654e999deb478dcc57cd2eaf95badfd24a96
+EBUILD cargo-0.26.0.ebuild 4718 BLAKE2B 5e6e064d0988f196816a726ae1cb46dd962ca7a3e3d6ea6edccb219c42448adb29ebd0e90f695ef72f244891fccdfa6d2f3e75baf133124d30bb39bbf25eda88 SHA512 6328f4196c0ab5ae4edb45237fc9a315a1b27be5ae77e7ef39eeadaa50396c98393fcbbe64d1bc938d681a87628e0813f3086869cb2d01290e969a5aca95c65f
+EBUILD cargo-0.27.0.ebuild 4499 BLAKE2B 5012de1e42da4a97744a48cd571e3a69c93fd6107bd6a53096bb72e96a6a9e19e126b5460f3ef321aa0d08db9ea0460780e8f8ee3f450d6852a6f51ade8fe49e SHA512 7df8362d68fe3a909d2f7692b45065652166c2230652168cf77ada8bf3465bb5b5ee97a41e435fc0526da575e6d2ac42ef60b41d917dcf5e547322e6ea3cb3d2
 MISC metadata.xml 334 BLAKE2B 492ad458d72b54f13c18357d77a28f82fefde1c581c34a19b5da9d6dc1c32ecf47675aa3198ccf8a934d25f494f9c6ba42bba0dd8d32d2c4f62e6411426ba3bf SHA512 7d50f6dfd848ac87a1411295bc5133289a7576d7cf3b82c88fdc3e17ba5371e25c4ccd5f2f404ca31ab81531d21e8d2023236f81608078a1ed32832d005653ab
diff --git a/dev-util/cargo/cargo-0.26.0.ebuild b/dev-util/cargo/cargo-0.26.0.ebuild
index e913e3df62f4..3d049bc2ded6 100644
--- a/dev-util/cargo/cargo-0.26.0.ebuild
+++ b/dev-util/cargo/cargo-0.26.0.ebuild
@@ -151,6 +151,11 @@ SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
 	amd64? (
 		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
 	)
+	arm? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.gz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.gz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.gz
+	)
 	arm64? (
 		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.gz
 	)"
@@ -168,6 +173,12 @@ elif [[ ${ARCH} = "x86" ]]; then
 	TRIPLE="i686-unknown-linux-gnu"
 elif [[ ${ARCH} = "arm64" ]]; then
 	TRIPLE="aarch64-unknown-linux-gnu"
+elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabi"
+elif [[ ${CHOST} == armv6*h* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabihf"
+elif [[ ${CHOST} == armv7*h* ]]; then
+	TRIPLE="armv7-unknown-linux-gnueabihf"
 fi
 
 COMMON_DEPEND="sys-libs/zlib
diff --git a/dev-util/cargo/cargo-0.27.0.ebuild b/dev-util/cargo/cargo-0.27.0.ebuild
index ec3ff62a6ba7..da876c730da5 100644
--- a/dev-util/cargo/cargo-0.27.0.ebuild
+++ b/dev-util/cargo/cargo-0.27.0.ebuild
@@ -139,6 +139,11 @@ SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
 	amd64? (
 		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
 	)
+	arm? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
+	)
 	arm64? (
 		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz
 	)"
@@ -156,6 +161,12 @@ elif [[ ${ARCH} = "x86" ]]; then
 	TRIPLE="i686-unknown-linux-gnu"
 elif [[ ${ARCH} = "arm64" ]]; then
 	TRIPLE="aarch64-unknown-linux-gnu"
+elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabi"
+elif [[ ${CHOST} == armv6*h* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabihf"
+elif [[ ${CHOST} == armv7*h* ]]; then
+	TRIPLE="armv7-unknown-linux-gnueabihf"
 fi
 
 COMMON_DEPEND="sys-libs/zlib
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 5addec7dc680..d6855f83afa2 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,4 +1,6 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
 DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
+DIST devscripts_2.18.3.tar.xz 731708 BLAKE2B bbd993b6dac144dd9a9e696133d1613fc88ca7fa31debf8478bb0a8232b811b9c6cdcf0989db29f478958f500c5f885e382700c0ea451675721254cdd4d42797 SHA512 3fcd2ff4eb97fbc8d8f768ca11f03b96de0f2ab0b8824e089556695c65521cf2e8e2d532968c07292818c8cd7ea93adaa508b40aebafbbf744bd6b78d249321b
 EBUILD checkbashisms-2.18.2.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
+EBUILD checkbashisms-2.18.3.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild
new file mode 100644
index 000000000000..be58ae776f20
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 458df8c765ca..50cde1a3ecf1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,16 +11,12 @@ AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 BLAKE2B e9390cac784eef6d3b83b88f9
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
-DIST cmake-3.11.0.tar.gz 7948287 BLAKE2B c56da8645d87bc06735e2afb9b8481918acd0a43e3fc96b6f58c1a311fa6a7a270a9be8d13d2106b3fcde802f8c084314717262edd760c7c7f06bd8c07f1fe69 SHA512 03b058483d236d4f4427c93cc41af77068c243fc4b6f24aeaf2daf97af215bc664bc1b733195463af4cfc94ec70076710f425661859d752ddf3b9610adca9834
-DIST cmake-3.11.1.tar.gz 7951125 BLAKE2B 157c2eac49900df554fb335c4a17484ca425a97e2c41b9539cf1f02cc09246e515d8c2b43549a7a395df378f1dd3f4757465edab6f1ea5d08d5835b6728b35d7 SHA512 d5df043453a9f9478a0e165ded6ce247a7b495fe8c4e56905bb523889a016fb8eb769455c2c2c5f6118c61bcffafe4e3e219ad99b2a85918323c2155f10089d8
 DIST cmake-3.11.2.tar.gz 7953913 BLAKE2B 2979f360fdd3727f571d84181a9f1064246871d7176cda7ca60766722eccfe738121fba498e46e502355cb54b9f88b7ec2a1a63a81688846fdc959dd7c11681b SHA512 c8ffa0885778ea942eb2533dab72da8719f67a212a33883913af047717c87368cb58e1d6c578b542d96d7dcc85d126abe81686214366c32174fd5553b399b69e
+DIST cmake-3.11.3.tar.gz 7954155 BLAKE2B 949ee8c3dfae9d15eecdcd5c2a35fc278e84d1215858714112aea13aa5772f925a2a1b89bd39360e62b8638166038899e80ab48b6917e2c046876283d15d0218 SHA512 a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
-EBUILD cmake-3.10.2.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-EBUILD cmake-3.11.0.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
-EBUILD cmake-3.11.1.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
 EBUILD cmake-3.11.2.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
+EBUILD cmake-3.11.3.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
 EBUILD cmake-3.9.6.ebuild 5953 BLAKE2B db46745391e5a79484ba90e2dfa02e9dc69de0d84996b21166b53fe427555e57dbef2f37c927afcbcea9df113917bb1548fa6be15a2cce4f881678fef86ba2fa SHA512 f8f54d756d27df0d80bb2d0280af137dd41753fe999b6598fbef1a1f47fbab5e918ec4a828d7fe909ebf355dbe0956b0c746a0eee576a02df14e0fcc1c6d4acc
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.10.2.ebuild b/dev-util/cmake/cmake-3.10.2.ebuild
deleted file mode 100644
index 843a7d270713..000000000000
--- a/dev-util/cmake/cmake-3.10.2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.11.1.ebuild b/dev-util/cmake/cmake-3.11.1.ebuild
deleted file mode 100644
index 6bab5d7c8c20..000000000000
--- a/dev-util/cmake/cmake-3.11.1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.11.0.ebuild b/dev-util/cmake/cmake-3.11.3.ebuild
index 6bab5d7c8c20..6bab5d7c8c20 100644
--- a/dev-util/cmake/cmake-3.11.0.ebuild
+++ b/dev-util/cmake/cmake-3.11.3.ebuild
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index b1caed8ce005..fbf85517b8a5 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,5 @@
 AUX debugedit-5.3.5-DWARF-4.patch 3235 BLAKE2B 6c12d8dc99b746fb2b5b813fed429f94cc4b0e737a6cb287f4741705b94782ef9bfd2a87e3284a63ddba20961d0a676823ac4145247edc328c46087d95842a2c SHA512 594bed4c2433e15c840316ca132619fc2b65ea5477cfe416ef851414d44932b3f8e75d006025eefbfc9c6cdcea956ff9ffc28dd4ef4fe5858a486ce5d08f43af
 AUX update.sh 1690 BLAKE2B f2f913fbbc3e06f1ee5ae8423253c67080471dfb0176e6c1b4ef3665a7b3b1ab24d7811ea8611c8afbd5b56072c12c0b97b08f87faf176d160ecee19f57f624e SHA512 5b271427d6391f717286289c5ec6eb794e99b7f0bd966100d3db03f84507000bc9256526f4ad6cdf809ff1800d53d5ed64d76bb14733507563d7a6123c9fc422
 DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
-EBUILD debugedit-5.3.5-r1.ebuild 839 BLAKE2B 3dee99ad0d1236a55e8ce118b72875abb0d782e6cbbc0557c264c7e52eb2ff155d7acbcc44302fc79ad3db55d304b1dccddd9da2fc19192f9cc31765719bc52d SHA512 692e99f06c5ff651970549cdd37d0c6f50cd86271d11d75a3e71e5696aead523f9c0a109f46314fa728aafbb1ffc4ffcf4b8818acb0d5476838483fa2db7aaa6
+EBUILD debugedit-0.5.3.5-r1.ebuild 948 BLAKE2B 1a5a19e80f3491a726caa708f13047069c4923a8829e99f351d7f823d1233cc9e152ab7dab992abcc9f8bc527dfe43bff45bbcaa7d8ab61503a1da1357a83ba1 SHA512 6660837428c4aca44724a4de55239ee5b71b16ac809e586378f37778ff058319e327715b89bb5fecdf850d259daae037544366957856db76b3ae9e9807c3f547
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/debugedit/debugedit-5.3.5-r1.ebuild b/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
index c4baa6c94f3d..2ef416c8ba0f 100644
--- a/dev-util/debugedit/debugedit-5.3.5-r1.ebuild
+++ b/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
@@ -10,10 +10,14 @@ EAPI="5"
 
 inherit toolchain-funcs eutils
 
+# See #653906 for the need to reversion.
+MY_PV=${PV#0.}
+MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="standalone debugedit taken from rpm"
 HOMEPAGE="http://www.rpm5.org/"
-SRC_URI="https://dev.gentoo.org/~swegener/distfiles/${P}.tar.bz2
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~swegener/distfiles/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,6 +29,8 @@ DEPEND="dev-libs/popt
 	dev-libs/beecrypt"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.3.5-DWARF-4.patch #400663
 }
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 6fe67bd5a6e9..a3f6c5ccd44a 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20170509.tgz 509135 BLAKE2B 30f443953701f79db86a317d3c1a3a7743685388cf432a4d48e10f0df5181207e0a182f96566cd868d9ee5db8296f362e57f40a8e58c99d3b372eb967bc56ebe SHA512 dd3fe2041a15dd344ea39a1ba111d3b26daca1cda91a4e82f1223385a49cdf3de15f11129366a20c5a24b16b5301f215543850a390d70d0559f98247bbd49a56
 DIST dialog_1.3-20171209.orig.tar.gz 511503 BLAKE2B db633f882cce8a0ecd1446c26b305f5567bcdc0fb8e073ff3a443fbf56662638685578040ecd21220192c069899998f587aa04db8185074b4c8af957df77c49c SHA512 0355578bc64e2c75a2aae3ae83aff62eae60556a2890d50a72988efa76b82055755922bc1156a92370d773524865e76b8a0ddcde77fb6e6b5774c987fc22dee8
-EBUILD dialog-1.3.20170131.ebuild 1281 BLAKE2B 03cc5e1966799eb10c9f3638bf2044ae3c433b6c1869cea89e9cfea2ff6d6cf8053f1138a721b14eb97db15a8b84ab6348552ab07e1624350d002c72fd79c924 SHA512 24a9feef1da4d2550c73d48d7a0bb02fa34a89c722672d0bd4c2ecab1e4a96f4fa4084ce79c32cecc928c468af8d414554dc244b66900d13be825625a8a6a287
+EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
 EBUILD dialog-1.3.20170509.ebuild 1290 BLAKE2B a9cc5c942135ea7ddede6b99f89a2b809b845a96bc6048d079e407a7cde93824a24795b9b3a0054cccdc541dee503322dea52d5fab87feacd7de55c206839263 SHA512 d0446c58fa792ad28393ee9946b866a7b45280e2aaa8d63add0f8c53a68229eaef793d9b65822edc1de13e354476c12a2bbbffa9aafe6c06adfb92648a520beb
 EBUILD dialog-1.3.20171209.ebuild 1350 BLAKE2B a2ae71b554dc8f96da4422d00ffbb49cf3af2456a58e97e8151db89ff16903200108cee08da78fa2e8dab1b36909c2222ad4a6336beba1f4010bdf6d7266f790 SHA512 52522ede770c6101897f8eecc5b0c9ed82c5ddab01a092cde57f7e08052e31188386eae7fa0a9044317b5d25c63502b69aa09dfa535780473a89888f1342ad47
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 0267085e358b..6584c3579105 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index 799dcb702cf4..a06f725aa821 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -2,5 +2,5 @@ AUX gengetopt-2.22.6-docdirs.patch 364 BLAKE2B 06919d379a6f0e13271d89dda845dcc92
 AUX gengetopt-2.22.6-makefile.patch 264 BLAKE2B 73c1bef7d171a3acb7dad8930fa1d7ce87cf83b7c395756a6658be276d3c22c2c71f9687d1666870d696fefb2940bb0ffde7d0c1de27c5b574afb6cec59cf747 SHA512 062de57db53d79261132fa62e7ecdbb6a3430231489beadc028e39258407a367033a3490b30a25acc5c1b95f8dec9557889436bd9b645f15ceb6b6b1f6655ebf
 AUX gengetopt-2.22.6-no-docs.patch 247 BLAKE2B 7d703bd0224aa6ea25095eb36902a09695bbd262f0aba524f966b97ae620abf82f230fdaeaaf29f3ad4eecf2c42699c715bd12864e26e646a41cb83d8c51b55c SHA512 05b910473674359173d380a4fc681d824fd2ca4348ff098b5d8a9110fad487ff3827e8e20b8981de4d1db1a692cdf624a5cb4c8230b2fd0182e9bfdd99ea35b7
 DIST gengetopt-2.22.6.tar.gz 1056293 BLAKE2B a99fa2ee362fc7b01ebc4c81f9daa17592a30b63f63883b73ca67885fa39f2ece48bda3f04ed5b98e74785c4030f94cc139df93a847e8789962e51d0950de0c7 SHA512 dad5baf1b6c4c76ae7f532dd63c6aecdc30f31d68a259b6a26a10197f1fe42dc9147a52ac12a0c3fc4b7cd61d288a343a9223f967a5a9a15a0614330b41f68dc
-EBUILD gengetopt-2.22.6.ebuild 796 BLAKE2B cb411242956f215d68bc9ae5ebdf63c2913682c7609679a06b722b0e9d65ae8ea28d8605951802ea9a851e33415c854d0c98ac2a049e8b28b3910a1ad570245b SHA512 24cc40ef928a9f56fc58e2df1bd66cc317cb079aaabf316a7c35c0ed5143a6eac619769f69616ee2d3eaa6a03c1e1062f5a6cca1ac4e7e94d42c6899c8051e79
+EBUILD gengetopt-2.22.6.ebuild 801 BLAKE2B 53d523dc4b84feb8d86bad53e7b2eb0654e0ec252732bd893b8f10ebe29d6179fbebe00faa4729ef2f9ce33f59ec29eaad2f2117165b941d3b7a0a341d24dea7 SHA512 20b5852e27a6075403100c80d678c0c4066c6b0f7db7741321e5b099c7980f1b93d01226a08599bfbc2f965f3744de4e67461fc45dd71a8d5335d6c186079dfd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/gengetopt-2.22.6.ebuild b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
index 74404faced25..cd8b5f7a020c 100644
--- a/dev-util/gengetopt/gengetopt-2.22.6.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.22.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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index f60ec0dda640..348fb31c032f 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
-EBUILD glade-3.20.4.ebuild 2393 BLAKE2B 6f129eb10fa9c75f9c936f39934662b1a9de30c57a697909ee60b8d61e98d1f31cf1263c49bf726555f478d688e92d6db646146d59aeb262217305e3d1d3a200 SHA512 dedb92ff2fc2f749ecc373a87caf69eaca986c800c740d3d9b172877d4531cc8a9cd2cb95c18d6b570f838353118c6d372f268ea61f04739cc071aaa907e2ec7
+EBUILD glade-3.20.4.ebuild 2392 BLAKE2B bbf88955bf59219bf267237688428ae0388f0b0d0e0effd998ce9ebdae0b3a23105a061e8f4fc90a721d5e7fae185ec0445ca0627fbc5f3486e42c8374bc3dd0 SHA512 752f71915b7429278da6a7b4a10f14cbba5b858faec11b8cf31901fc7e7b99ce1fb31df964792c413fc69a00118a68896f0a803345adf00b5981165c4fb07328
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index c7773d9c16d8..70eb30d633cc 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 7873f878fede..4a4c687cabab 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,5 +1,5 @@
-DIST goland-2018.1.1.tar.gz 218213751 BLAKE2B 4fda04b45da9757e829158a8e6079cb5df9ed3c02b06268169b403258f93a70bb4861b2a85349caaabdcc6c300b95b91989f7957780c7fecf2334530e90ecf97 SHA512 642eda4359da203c282cae2ec855efde0785b59f613070d4f29cafe9ae79fd8dfdc0fac26bc27246ece7178455ab6eda1a278cccf97fd500712972b34f1c1ab2
 DIST goland-2018.1.3.tar.gz 221579069 BLAKE2B 16ead14bc3401fe7b031576eb9581613cac1352b42933acc83af77946376017b6658fb04b556b028a6f89f86a65b60290e1f6f9b5febe2dc10c85b5c6004879f SHA512 24f1c384139276301a27a9df1056560f3ee89ef9817690c00626eb0522fed8a58ded3bd3632aeac8f25855dd2c031c40f937761625f6545504eb2f3e7d0d509b
-EBUILD goland-2018.1.1.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
+DIST goland-2018.1.4.tar.gz 217585781 BLAKE2B f4bdd554003b2397911cb767ffba558fcf06ab9cfd20c0017579cf82c6af93681e16c23db82c3cf0b47c4bb6a2c37c564be5ee9d6400cf91cb3a0938309166d5 SHA512 972c15d6636728e214b355ce4ce7174d08e0e842c6ca4e4385fbc4330930a2fae3a964b1b3753c38fe77ac2b8073fd7366fd0085d00fcf05b832c985d6243325
 EBUILD goland-2018.1.3.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
+EBUILD goland-2018.1.4.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-2018.1.1.ebuild b/dev-util/goland/goland-2018.1.4.ebuild
index d46b730ae466..d46b730ae466 100644
--- a/dev-util/goland/goland-2018.1.1.ebuild
+++ b/dev-util/goland/goland-2018.1.4.ebuild
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index ba337f7cb541..69e14a91e4ef 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2579 BLAKE2B 37ac029c3b48f3da9891a1d8aa053a87b0a0165fc7ed12d9e65cf7814221eea6b67f244fef6d830f11b8616fff98a2cc6022c525388339d4637e6bc38fcb3fe6 SHA512 debea3a5905dd33846565cd67ded6a92d39e8fd371c6886b15322ac73185171a18a2226a05ea5e0341d70a03acfc0ee6513bd2b192934a72c1b6d1ed3a157974
+EBUILD gtk-doc-1.25-r1.ebuild 2578 BLAKE2B 024f52506892d66d9ab10ebbd5ca30d6e9d0efcf697a38ee187ec83ece15d63301722b7c46123f5c9bc90df21e0b5634f09d47b92912c830e1d49d5692846425 SHA512 f5e4cd040ee03240b251593e4048d08b97f8f770fe3a9e6abd8dcdb36586ad7c97122eb6cb4a82cc257ef631d3cceb214b13290765ea2d901481847c79f8e46d
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index c7c27f2f2628..31a2782d08d2 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs highlight vim"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index c3b38987d655..2b9a349adbc5 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -5,6 +5,6 @@ DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236b
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
 EBUILD meson-0.45.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.46.0.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
-EBUILD meson-0.46.1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
+EBUILD meson-0.46.1.ebuild 924 BLAKE2B a28ab9bc203e3c090b8504afb6e77cc7d1b3ea65068f99a011aec4f8855b3bfa587908b4da501f0ab1675c4f60b252188582166e8974bdfbfda98ee10c8c73cc SHA512 32859679d76f6e53ce6482058577d4f022c3e8966b519a3aa2614082720569c9449af18a4a3628a5c05bc67bfe41f9713a6abd16e09974eb55417959bdebb1c7
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
index 37aab5a3b433..e359d174f2d7 100644
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ b/dev-util/meson/meson-0.46.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index b28e0190ac2e..4940726e140e 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -2,5 +2,7 @@ AUX visualvm-r1.conf 786 BLAKE2B 863af1d373f3e8633a630c6a1cdbc8ada09b1a9b5f35704
 AUX visualvm-r1.sh 424 BLAKE2B ad18e375535b92e5bc5720c7b4f9f9526ee136d29d51103038a68e8c260245222af1e912b8320ca98dbaeb1a8736f041fea89ae87b15d1db9cb916eb1552c8e6 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7
 DIST nb802_visualvm_02102016.zip 23257637 BLAKE2B b18570b69a646c975c4b93028438cb7827f82e4e8d7d02bd11a76faf2a40164b9171626a1bd3b0664a216a30e27ff8b14d68941c8eff92e426fb92a45fb95687 SHA512 e33dba0cdfb509e9351fac343a4fbec07d3a893b6f484d0aeab972aefe41b061422dba8695003c6ca33db52d5be2f4ce218ea4fc7129f67dbd48c991c35349b5
 DIST visualvm-1.3.9.tar.gz 3623394 BLAKE2B 8132447427b4abd206a825b4ce45ac54055cbb761a03624438baed7f58decb370d36bd13bb233638daad55086e04e01502b971fd0c95a31648a5b0795d8eb30f SHA512 580e2f3dd7cab1f71c8ae3004101c1067d04a7b4c164e6a59bbe95ca927dd275b8b4389e724cb7d8b38586986762126f261abc1779fb229a778c1c8db0f20387
+DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
 EBUILD visualvm-1.3.9.ebuild 1448 BLAKE2B d86f03eeb55c832e33dbed3ee694e6d7737b0bf5b414e5d5c7c675b154be35320afaf47c20c71955d6791278b2a600101479e5887b0fbf68164f816ed14379c9 SHA512 53f14fe6f1ceb34d9a1b0c3da20baa510f115c99b479603a2af36510b20826d6e23f71b7102288ea0a4f817c8ad0e4511bc9c2d427b2324e9eeed9106395d6fe
+EBUILD visualvm-1.4.1.ebuild 1689 BLAKE2B e1fe2081e2792d4b12703ae7250df86464270f6417f164747b0ee9919d97cd479589695f1a515a127fc3acdb2e1be4e490e5c3bb5626788da9acaabe2b8975cd SHA512 71e6ade4c914312b3b03fd6450a51d28b1596f169704ed9a8add7f44009ca83304091f76191a981c425c223abbefcbb73c22cc6830267b09e2021616bf9012bb
 MISC metadata.xml 452 BLAKE2B a1a04fcf6da524fc4bc9d68c415c429dbf43813e594797eaf24f6590e47dd6466d9ec5bae1909011976ab9a47cedb07bbbff29f254f60371aa50ed88a3d9a50a SHA512 cfb0070326f1fc73f96016a138bdba35b6799333a625c38c84fb486134e1446f71bcfe2f170cdbe9ff86befe66905ba79caebd68f811547ec638e69821a5a739
diff --git a/dev-util/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
new file mode 100644
index 000000000000..b29eb860b654
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.4.1.ebuild
@@ -0,0 +1,65 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NBV=90
+NBT=24042018
+NBZ=nb${NBV}_${PN}_${NBT}.zip
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+# Netbeans plattform is already included in the main archive this time
+#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.7"
+
+DEPEND="
+	>=virtual/jdk-1.7"
+
+S="${WORKDIR}/${P}/${PN}"
+
+EANT_BUILD_TARGET=build
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+    unpack ${P}.tar.gz
+    cd "${S}" || die
+    # unpack ${NBZ}
+    unpack ${S}/${NBZ}  # archive is included in the main archive
+}
+
+src_prepare() {
+    default
+
+    # Remove unneeded binaries
+    rm -rv netbeans/platform/lib/*.{dll,exe} \
+       netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+    find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
+         -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+}
+
+src_install() {
+    # this is the visualvm cluster
+    insinto ${INSTALL_DIR}
+    doins -r build/cluster netbeans/{platform,profiler}
+
+    # configuration file that can be used to tweak visualvm startup parameters
+    insinto /etc/${PN}
+    newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
+
+    # visualvm runtime script
+    newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
+
+    # makes visualvm entry
+    make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 26da4632dc52..ced5774f73f6 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
-DIST vulkan-headers-0_p20180526.tar.gz 451276 BLAKE2B 7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c SHA512 a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
-EBUILD vulkan-headers-0_p20180526.ebuild 858 BLAKE2B 8eadcfe957a20687759e68935626abb8e5652da92cd627ab932641c82c0c28387c3ff4d3a35cf941179cfdb85f8e6619413cc8f896bf0aa445f32603a8c31ee1 SHA512 bbd52551f0bd14cac8f57e5861efe8da1e8857a9c0e010e31556fc5f6fb42e21c79fcf595d4d9eaa14d24037e69b7000c9016b0db8b01134e280a76c588c2d7c
-EBUILD vulkan-headers-9999.ebuild 858 BLAKE2B 8eadcfe957a20687759e68935626abb8e5652da92cd627ab932641c82c0c28387c3ff4d3a35cf941179cfdb85f8e6619413cc8f896bf0aa445f32603a8c31ee1 SHA512 bbd52551f0bd14cac8f57e5861efe8da1e8857a9c0e010e31556fc5f6fb42e21c79fcf595d4d9eaa14d24037e69b7000c9016b0db8b01134e280a76c588c2d7c
+DIST vulkan-headers-0_p20180601.tar.gz 451276 BLAKE2B 7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c SHA512 a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
+EBUILD vulkan-headers-0_p20180601.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
+EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
index 531392083dfb..d6e2cd6c4876 100644
--- a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=6
 
+inherit cmake-utils
+
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
+	EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
@@ -21,10 +23,3 @@ SLOT="0"
 
 # Old packaging will cause file collisions
 RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
-
-src_install() {
-	mkdir "include/vulkan/registry" || die
-	mv "registry/" "include/vulkan/" || die
-	insinto /usr/include/vulkan
-	doins -r include/vulkan/*
-}
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 531392083dfb..d6e2cd6c4876 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=6
 
+inherit cmake-utils
+
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
+	EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
@@ -21,10 +23,3 @@ SLOT="0"
 
 # Old packaging will cause file collisions
 RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
-
-src_install() {
-	mkdir "include/vulkan/registry" || die
-	mv "registry/" "include/vulkan/" || die
-	insinto /usr/include/vulkan
-	doins -r include/vulkan/*
-}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
new file mode 100644
index 000000000000..8245a479840b
--- /dev/null
+++ b/dev-util/vulkan-tools/Manifest
@@ -0,0 +1,5 @@
+AUX vulkan-tools-Use-usr-for-vulkan-headers.patch 1240 BLAKE2B 2206e0777c2c7fea95a1e0b43e09de372b6a898275b3dbfa3bc1cac84125be42ade8834ffb8b2fd872f8d8ffa64aa70b456ad5c2e63c98c9aa4abd1995777043 SHA512 c96da656fe2d32af3ea5fbf348e6297be88b1581bda55e65a97d8d96229363b26285495929d5fa749b8e8fc9c20aa16ee529bcdf020191d46eac9bf97bab4511
+DIST vulkan-tools-0_pre20180601.tar.gz 421373 BLAKE2B d7c6870cf27397800a2af512b0bf05919b01dc30d84961d8a8dceacf005be461a8b250ef65cbfee8b070ef7f6fe8544deb855c06aee99f6b5175f4073b5a051c SHA512 f41517c22fb06aee07d40b947c756d97453810998ccb6e8cf8c48a439de1826361fcd84f0e96eaf3898e373e732d3b938c807da6fc2a736d3b986c2d30778ba2
+EBUILD vulkan-tools-0_pre20180601.ebuild 1481 BLAKE2B 9c4721737812adc65849caf875b2f3537891a7f262c9edcec63d26a441c2687c73f3afbe55621d5437c743b915b642eadfa0006b0c2efda72b03033e62ac6770 SHA512 0c2213ab958601328942132d9b42ae884926ed7d132719bf205b040f55fa7da1590f678663b83032bd8da34234566d1ff43a5c2652cc8f4bc1dbdee9bd53c4fa
+EBUILD vulkan-tools-9999.ebuild 1481 BLAKE2B 9c4721737812adc65849caf875b2f3537891a7f262c9edcec63d26a441c2687c73f3afbe55621d5437c743b915b642eadfa0006b0c2efda72b03033e62ac6770 SHA512 0c2213ab958601328942132d9b42ae884926ed7d132719bf205b040f55fa7da1590f678663b83032bd8da34234566d1ff43a5c2652cc8f4bc1dbdee9bd53c4fa
+MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668
diff --git a/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch b/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch
new file mode 100644
index 000000000000..b9797e19ad2f
--- /dev/null
+++ b/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch
@@ -0,0 +1,35 @@
+From 9498942c820525dc531f643696b7938d3f5fa482 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Tue, 22 May 2018 19:55:59 -0400
+Subject: [PATCH] Use usr for vulkan headers
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa9a3d3b..2998edfa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,13 +29,15 @@ endif()
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ set(TOOLS_TARGET_FOLDER lvl_cmake_targets)
+ 
++set(HEADERS_DIR "/usr")
++
+ # Output warning if vulkan headers submodule contents are not present
+-if (NOT EXISTS "${PROJECT_SOURCE_DIR}/Vulkan-Headers/include/vulkan/vulkan_core.h")
++if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h")
+     message(FATAL_ERROR "Please run 'git submodule update --init' before running cmake")
+ endif()
+ 
+ # Header file for CMake settings
+-include_directories("${PROJECT_SOURCE_DIR}/Vulkan-Headers/include")
++include_directories("${HEADERS_DIR}/include")
+ 
+ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+     set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
+-- 
+2.17.0
+
diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml
new file mode 100644
index 000000000000..a670686d9eb6
--- /dev/null
+++ b/dev-util/vulkan-tools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
new file mode 100644
index 000000000000..38d11f8da2a8
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="b7940409945face40657080b6074fc5588a0c0ad"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+DEPEND="${PYTHON_DEPS}
+	dev-util/glslang:=[${MULTILIB_USEDEP}]
+	dev-util/vulkan-headers
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP}]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	   )"
+
+PATCHES=( "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DGLSLANG_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
new file mode 100644
index 000000000000..38d11f8da2a8
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="b7940409945face40657080b6074fc5588a0c0ad"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+DEPEND="${PYTHON_DEPS}
+	dev-util/glslang:=[${MULTILIB_USEDEP}]
+	dev-util/vulkan-headers
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP}]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	   )"
+
+PATCHES=( "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DGLSLANG_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}