gentoo resync : 09.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
commit: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree: 047fc92023c520d07f13ec5ac96e094d1b312a7a /dev-util
parent: 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
108 files changed, 875 insertions, 1287 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4bd7c422da66..9412bb88b342 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bite/Manifest b/dev-util/bite/Manifest
new file mode 100644
index 000000000000..cb54affe202f
--- /dev/null
+++ b/dev-util/bite/Manifest
@@ -0,0 +1,2 @@
+EBUILD bite-9999.ebuild 1452 BLAKE2B 2dfaa75c4cea242833a8d84fc1fbd91a340d16379cbaad63d69667cd2fb91d345a2d2f9adf386b6cca2621a3c1453c40c503289e61b4677067f1a9094d94a649 SHA512 d3fa7b51f7d0841009aa133a530b8e52629aa4834a1d3513bbc46d0c1635d3227c7ccb1dff9b43f77c58acac5206b2ba6188a7fe3868634a7e7d471b31b8fd22
+MISC metadata.xml 330 BLAKE2B 84591ee05d14a0a3c7db1cd1fc966aca6a614c129babd365d5c2717ca19845a3b391c280e1861ae8c900e8a6124b725a15c775292181f2fc8cf6e5dc000eee01 SHA512 790542c11e1210fef48d1235385493814128da8cb6f1ab33e569e0f37e862b568ffe92f4a18ad6cf0ac8f8917bd884513fe40597540ad299af9feaf7722d2bb8
diff --git a/dev-util/bite/bite-9999.ebuild b/dev-util/bite/bite-9999.ebuild
new file mode 100644
index 000000000000..9460f20c7e4d
--- /dev/null
+++ b/dev-util/bite/bite-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/bite/bite.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/bite/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="bug, issue, and ticket extraction library and command line tool"
+HOMEPAGE="https://github.com/bite/bite"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/requests-2[${PYTHON_USEDEP}]
+	dev-python/multidict[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+if [[ ${PV} == *9999 ]] ; then
+	RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.8[${PYTHON_USEDEP}]"
+	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+fi
+DEPEND="
+	${SPHINX}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	esetup.py build_man $(usex doc "build_docs" "")
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install install_man \
+		$(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/bite/metadata.xml b/dev-util/bite/metadata.xml
new file mode 100644
index 000000000000..f5edf41502cc
--- /dev/null
+++ b/dev-util/bite/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bite/bite</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index efc944b39337..08fd902eed4c 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -2,7 +2,7 @@ DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b6072
 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-20170201.ebuild 610 BLAKE2B db86272365c30ac4a30d1538078bc3b6e436e624b70c1a403a8e6e878480c075910e72e188d91e60d2b4d71edea2dae6370d81b9bb2685dc8f177c069edddba4 SHA512 22ad1a4d24aa1ae4ec9b7de9e5d6a881547bd4fe4baec8a884313201c2193ca85a8fa30fed24b23ca8b4c6295388dda357f2e5a50a8368831a0ed600596c9755
 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
diff --git a/dev-util/byacc/byacc-20170201.ebuild b/dev-util/byacc/byacc-20170201.ebuild
index c7fadef836ce..0ebf724c67b4 100644
--- a/dev-util/byacc/byacc-20170201.ebuild
+++ b/dev-util/byacc/byacc-20170201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/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"
+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 )
 
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index 409c154b479a..08ca65b78523 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,9 +1,5 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
-DIST clair-2.0.1.tar.gz 5194465 BLAKE2B b91bc130ce7237c5398715bfd91f6744d89bd9690ddd5d99aabbcc62b22c148dbbe2594d1c1376010d9cd992012d639ceef4e9a78d1837c633978f52b4d223ae SHA512 03293829426d81157860effd893b72164679b4ec40c19294e321d489ced67dfea72415cdd9b1005ae590367c68f746664a76f63a29c7d714b22917f2323c4937
-DIST clair-2.0.2.tar.gz 5194625 BLAKE2B a1866ec881036a3f3891935782ccb4709c26a8051b4d762be2e7eae2da11ecbad794d21fd2d62c842f5d6d18a8f203a2258d9e9fad985455becc494753c75e43 SHA512 1522c40059594f8f7ce17781269a3511e987173c741c550e5c0b87beaabe73e368a23ddd75a2499a6e9f8920308744809c4c938af31cdb93ce2f0a817f906674
 DIST clair-2.0.3.tar.gz 5194681 BLAKE2B b4f809e7699fbf66745c7f528f3f2c249e81541a64c540a8c39b9fa8f5b581d1297abdfe80bdb0ca3aec00010c6c95e8073397df284d2a92a3e95f91049cde80 SHA512 bf2d4ab15efc50bce3e828d0510ceb44463a6c1d978a854b3a05899996203a7c33bb6e60470eccb6e0a1e23b8ff41955cd0fdda4b77a9a7e042e1e27dd2e0885
-EBUILD clair-2.0.1.ebuild 1064 BLAKE2B 1ac199e921555271086203ca46d483133700eadb1cf6f27f699a29e3349b299cda0fea0b451e3fa80aaa2c70e583952b99ddead136244399dc6495fc4d7648f8 SHA512 539d973c09c5926ced69ec55043b292d988ac50ede501bde4a49de8c9ee50db5a731d2ff0f95d76b47c83c1391b535705789f02ac05175f0d08819d1ebc4e4d2
-EBUILD clair-2.0.2.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
 EBUILD clair-2.0.3.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
 MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
diff --git a/dev-util/clair/clair-2.0.1.ebuild b/dev-util/clair/clair-2.0.1.ebuild
deleted file mode 100644
index 2ee9185f3f21..000000000000
--- a/dev-util/clair/clair-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/bzr
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/clair/clair-2.0.2.ebuild b/dev-util/clair/clair-2.0.2.ebuild
deleted file mode 100644
index 8c92e5db7e56..000000000000
--- a/dev-util/clair/clair-2.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/bzr
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 50cde1a3ecf1..0e26954e4910 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -16,7 +16,7 @@ DIST cmake-3.11.2.tar.gz 7953913 BLAKE2B 2979f360fdd3727f571d84181a9f1064246871d
 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.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-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
+EBUILD cmake-3.11.2.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.11.3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.11.2.ebuild b/dev-util/cmake/cmake-3.11.2.ebuild
index 6bab5d7c8c20..050883851f5e 100644
--- a/dev-util/cmake/cmake-3.11.2.ebuild
+++ b/dev-util/cmake/cmake-3.11.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	app-crypt/rhash
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
+	>=dev-libs/libuv-1.10.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
diff --git a/dev-util/cmake/cmake-3.11.3.ebuild b/dev-util/cmake/cmake-3.11.3.ebuild
index 6bab5d7c8c20..050883851f5e 100644
--- a/dev-util/cmake/cmake-3.11.3.ebuild
+++ b/dev-util/cmake/cmake-3.11.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	app-crypt/rhash
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
+	>=dev-libs/libuv-1.10.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
index 5debbd53be5c..3b09404e21f0 100644
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ b/dev-util/cmake/cmake-3.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 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"
+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 server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 0861ad92204b..76b834c53dcc 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -2,5 +2,5 @@ AUX cmocka-1.0.1-fix-librt-configure-issue.patch 1641 BLAKE2B 71214b9f0aec0bfbc3
 DIST cmocka-1.0.1.tar.xz 80240 BLAKE2B eb6baae44e75c3237038dfd32bb2844ed368eba7e2b7c8ddef82984d6b4b086b1667a5d021355d918be7ff63306629e7c6286c2f0ee4f5977362d96b6a9363d5 SHA512 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 EBUILD cmocka-1.0.1.ebuild 1150 BLAKE2B 3d184570ee233cd04095eba9d700798a15101fd01482acec0aa381185b34ffcf7e3c9023a9c9209fa673c8151bc3f7c48920032fa1304503f7681659195a17b6 SHA512 fe02af0cc7c5fef6b3655f07a7c23e7dedf9d973226391b0df31c7c3b62cd91b6f02ea0244faf76c0d3df0807704ad1ce39a2464becdd782b0130ed4b4c80a29
-EBUILD cmocka-1.1.1.ebuild 1107 BLAKE2B dd77fd0a443f3ba916b945c3c5b5373f8c69595333df0e425309a78915987679d4867115947687a60f57e8944a8eb12a8bb5fe57dd8db0846025a6ddf3c87291 SHA512 df5ad4f6532bd8302a7ba005c6b4c6bd4ad8703423b086d4d741179a927baeeeff86efa11ab3903514c3f8e9d992c53639bd0753f62cd50fa99eb21ca816a511
+EBUILD cmocka-1.1.1.ebuild 1103 BLAKE2B ad60b9dfe2f5bd7488b5d75fe2dbbcd9d99c0d305dc6c7da1d6eac2473578f2a9efa08e491faf9c6c5553fb4227b4816e5aaa5017b070d6c9f7d691a6216db6e SHA512 e730b7c1b6631572a44aa208692418c35cec596beb6492695d4abb7daba5f61d662b54bbe5e97e1d6e487b1b10e74b6b150e607bc7c316e135c3b2c008194f1f
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.1.ebuild b/dev-util/cmocka/cmocka-1.1.1.ebuild
index a8ba1e6b6d77..76dbc78372c5 100644
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs test"
 
 DEPEND="
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
index 50316a061bf4..a6b748223c12 100644
--- a/dev-util/cpuinfo-collection/Manifest
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -1,7 +1,5 @@
 DIST test_proc-04January2007.tar.gz 28831 BLAKE2B 1d405fb971eb0a4958a6127fadd9535ba24529b88d63e22ee726b6296ef5bf77f20e739b4c9475f8f20879950ed9fdb85a53f19dd7f14b91613b51b3a8403407 SHA512 6ff9f42c0847ef897069a7b36ad184b05ac022d1db5ab581e87d2992ee2a511218ef2019a0a94aadb91038e2b99e530618b0b6a380b0aa36f4178620e6719922
 DIST test_proc-14November2010.tar.gz 95697 BLAKE2B 476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
-DIST test_proc-20July2006.tar.gz 27570 BLAKE2B 3f5165a2fb5b368a5b406298dfcc2052007f83974e67bd83985e1db469eb865ce8a6e3385a9c81224d7a0f6d070eeb28258d0761022b111721adaa2e6223ec37 SHA512 c76f59a2b51e414a45c346a8a1334a905be6e5f7ea12f8a2cc92f44048bf0af66b548768910aa07287a4084c675310b6c4cdabc86640705382d654117357b2a8
-EBUILD cpuinfo-collection-20060720.ebuild 543 BLAKE2B d8fd7f2e645dc93b5f090899d41ea17d44b824a5c69a1b34c573dd5db8386c3cfa68a670fc7693dc39e0eadd5792ca0f4cb72e3025570f4e12dfc0a49ecd3d06 SHA512 8feaed0e07e25b79e16f0e27955fa00ad00388e95e280d3d7d23736155ce8cec0210398db83fca1f1affceda97df03934a687280a19b0d76bcb6b71df7a2b1cb
 EBUILD cpuinfo-collection-20070104.ebuild 558 BLAKE2B 5949deb685d52180a0a082fe90dfc66196a287a8d320c97cf152cf6f40987d14663a892c00a7ee4a8d172119da564337b5ac1caeeb47a5d5244ecb2242908575 SHA512 cabde97b357707de00f6545b1ebb7d10cea3212f279791a5cca81f19a877060a893420bd2be5d1aac0415872089d7d4304423fb4210345d36d9023ede6d37fdd
 EBUILD cpuinfo-collection-20101114.ebuild 569 BLAKE2B 6d6ce7d7ecc561c103e0f0142413581db70b85064002f5e5aed9cf5b6c058a3f77223616e84502202b901bc341ffb619a90f3148ffe260fd631a10872474368b SHA512 ffb9aab99d69680dc2df9b5ff9148b92bd4beec3b795f5186eae5d544cb0557f5caf436057d8b34e0b14cb8fb0fc4f6efdd53efa15bce41cf4ead28a73be300d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
deleted file mode 100644
index b34e13a31027..000000000000
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=test_proc-20July2006
-DESCRIPTION="huge collection of /proc/cpuinfo files"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/cpuinfo
-	doins -r * || die
-}
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index a1a22ae2c8ae..b8927636da3e 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 476 BLAKE2B c9a5914641dca48927ea9ca4c707ff9c9a2504603c6204feccbb2c71f1734b709e8c5df843c50a6da768baa3250d1879ee73cac4b80472e18f51e19383ecb9c7 SHA512 574b488acc9f5530861d82ec293c6941f4c9bd2838a789ba798239f3ff4b654d4df41cdb550c11001d696ea9bff0ed6c1bee2f20f6210ff8c37f3e0fd4d9bd8c
+EBUILD cram-0.7.ebuild 483 BLAKE2B 1cfd9d53f13d765ee9c72af7bef57d4e85b7f7630e726d5e416662719b7302c25543afa4ac60f6da811cf3cc1669f2d65cb3deca8cf6b29f0c143712c93ab652 SHA512 24740105e2df30702344be4ce39d95d18c0310f1e18d44480f09619116c0b46318bfd2c2426997a0dfee056933d9829b6adce932563300e6ca383ee227f3c250
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index e58431cd89f3..3c164062131b 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index f3ec524a5c1f..75867c175da0 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,6 @@
 AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cdf9fec5d147ba667522667fb7833f4dba37d91c83cc5033967d2d544b66562ea26634a8b8c2f292f23536ed7690b8d0f3d22ea SHA512 cb9639f7d17bcaedc720774ece7386608b39a91e44cc0aa9cd4359894a5fb06ae29a03b21bc913a110864161f8df623b82477e0d23265bdee88d13aba6c88535
 DIST ctags-20161028.tar.xz 852108 BLAKE2B a4c954c560bb2d0165c12b4ec4f7b7c2c674acde98d438d9388f5d6102d325759faa3d4801eb0f63da70064fdeb32ef1c1cdd4124ade8d87cd9632b77c823e1a SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e
 DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa8ce8998bdb0a245d7d58033e37c2984af963a312c83b364dafd37633270f5f5d06fdb635a927066282e9382f6a2 SHA512 6ed134347a4be16a5dcff35186bd949e73bea645908a5ac43082b92fdfa6040b0b99ea04590948ae8308d4e9eb1042c83a4f0df006709f15cebfbf0741d73641
-EBUILD ctags-20161028.ebuild 1728 BLAKE2B a2609b3e6a0f49733213230ac8b9718f5766ca0ca68151aab7b15bf23a27875e6095b6558cf8e88a77692a7c83f981c99778e2fb14d7dc07a12350e9a3f73d5d SHA512 df496dad6d9f51921d0a39222463424acd1ad8639c6d28c01e929e50997f86cf77692fe39ff4653d5b408b9cdc2a325defad4463de7ebbddb503c559a9641606
+EBUILD ctags-20161028.ebuild 1727 BLAKE2B b461614b554f4a489d230b6892878b96968f2483b3a6951f206c5e50b852df641aef7025f4d6b50df9951556dfbc165ffac8a2b88d63bda4270151b906167d75 SHA512 ddcd0d9a4d410de17e7d752711c481417d1e93cacf3c3f335da79a33ef37f48d63182d0f0cf12c147ed4a67f7747911789f342dd63adbe90bfd6d5cf6bba6b1d
 EBUILD ctags-20170704.ebuild 1864 BLAKE2B 648dd6499ed80bd2f00e51fbd2524f9ba735d27878bf37ed520135d8a15fd80f1f6351c02fe2bc97fbc49d3275dac201f064736bd666395027fa92a55e860062 SHA512 fb3a06df7d9fb5e0772cfa45c364af9c42ca0c6b3c57c4f00f415236c18ef2fa30f5a1a0055776ea805818faa154d4b6cf18e20b57362f27dc2dbd532894c929
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
index c82ea79817ee..9734f3d20018 100644
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ b/dev-util/ctags/ctags-20161028.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 COMMON_DEPEND="
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 843f71a4e472..1b50c4fa931c 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,15 +1,11 @@
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
-DIST cucumber-expressions-5.0.13.gem 17408 BLAKE2B 113554f5350dc289dea2a97530e1982f4afa00fe23da4e63d55d648e8767443c2f6c18bb2639defbe79034e709dbfd5865bdff0e11f090320132de9724994b9a SHA512 7035d3d6b9bba0f56ca15580956bbb69c3449ca75c825563217ea5773984a976e455866a0046f045573c5fcf8398887e19a87f425299a3231a077a158ccf2f97
-DIST cucumber-expressions-5.0.14.gem 17920 BLAKE2B 623b1c328703d6f9919c9fc7ffab64d26b752fe8f75d21d5ff2323aa502fe49e9b65bfb5f9f0c64c4baee3189c28e5cf05a404fd499c72fa8cf95157492a0e6e SHA512 7e44de399250d21d017a38d72e15390e9e0dc48b03755508767c5c237aebec830623428420a500bcef1bbb9db2157994b59718a731e8baca4266d1393e0b5843
 DIST cucumber-expressions-5.0.15.gem 17920 BLAKE2B 83c741f985aee1fdb316693c70f519bd82e4cb373285f0bc9976405dad143ef562cbac92263e7fbf73254713a699270cf99080ed9d3a3f85a6b982caafebeb6d SHA512 0d50975fac9b94e17f7f0388b50cf1fe98775dc34887846f72d4b1f471ff957b466b9d567fd6e0da7561860d6e2d8364c2f3490ad9e8059ee0d1cd99ebc5f386
 DIST cucumber-expressions-5.0.17.gem 17920 BLAKE2B 4b90510f296d3affa659244948913618963204f80db95043924dfdb709e0654dfb5cef55b77c048cac7e7f3cb2af4a9a49150dd77c99f9a87b68d4dbf9f54f16 SHA512 2133e53733c2e68608885df650fed6c8975e310875079ea719c5bfee7635d7b49cc1c5bcc6946ca90323243b13606222993be31bc71da55cdd091b6b93e6567d
 DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d45364579213e97517f0ce57a954f58533230e2ac362c2664567ba79ee3404d02d2a7811986dc66e6a8365572978da5832e1a96 SHA512 4016248cf116920512895a874f67331a84f782dfbe560dd4a9d64ef001fa8d66ea2663b96dce8e2fb561fd533e6a8a0d399dcb923cba451cc452f15c571e3288
-DIST cucumber-expressions-5.0.7.gem 17408 BLAKE2B 1f958063f276154bd75485e1f2b9beabfc41d26e4029ca7a7e89d6f6d81dc25bbd69626920dfbf1a9323f65b6eea105dab328f06daf15c290a11ea0c86dc69e4 SHA512 af83d028df20ac608ce3fd85850da451f1ec76de688f1d0bc71c1e6a0e70cdbb15f4df6710cccf6b736426f9a547b5a5ae0bb860cd626291237c2bc11371a24f
+DIST cucumber-expressions-6.0.0.gem 18944 BLAKE2B ea7987ff411b00b80683e4ace66d6b3e5b91ef35a93af369a79f19472c6fba3eb0be8453fde3d716eef83ec221e35e7c2d0634e0c941693773fbf174e578f45c SHA512 e47a7099cfa3d49cd17bd6f289e0dd6856990e60d1ed4ed68897a4efd40eb5715bdb1bd2fdc0aa5389cf92cd67402ea544238752e38af6156a7b182cd6ebef4e
 EBUILD cucumber-expressions-4.0.4.ebuild 479 BLAKE2B b6d58cb994fcc741ba5c6f8d26531d01530c26803df4ef3a914882bc9eb440a9da4c2b84a593a622807616b8e2bb82191b827f08facad37521d83840bc53e6c3 SHA512 43d857be0ad1cf4cc39ce9852c8d032b65607331eec1402ed7f0ec92524621ec34bf4c2213e8c2bccc0763311a06b0db38b205baf13219cf8d49b63eb52b8f9d
-EBUILD cucumber-expressions-5.0.13.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
-EBUILD cucumber-expressions-5.0.14.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.15.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.17.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.18.ebuild 479 BLAKE2B cd32c66f95ec375ed5457e7ef41cf01537bc7074628379c887d39930c6ba8e999c0bfe85f3894ab0db0350912085eef5b53a26fe1e6d78010f01cb5316f2316c SHA512 02a0b11ec9e2e6de1178eebdc91b3f93fa6d6f834aed8f6e5fc969ef482653a8684ac84e26ec619fd53af74db2d8544745c3164fe6a1d3fe247bc081d1f4d131
-EBUILD cucumber-expressions-5.0.7.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
+EBUILD cucumber-expressions-6.0.0.ebuild 479 BLAKE2B eb8da200398a284c6d43c8fa78fb0a785a8295e0757c2a993ba6855bcd076f31911aee0b9db905477aa973e7cf9150597ac27cb9ba9eb2872e94e5b5b7069d70 SHA512 08f7b4addf7b69101fa252217e4552bb003944108fcd70970a5f09053529d41bae3e1602d2d673b0c84b3502045c5b0c257848b69edf447ba5f89cb6d49c3dab
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.13.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.13.ebuild
deleted file mode 100644
index ff5320baa208..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.13.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild
deleted file mode 100644
index 832428b34fa9..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.7.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
index ff5320baa208..06b14165109d 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.7.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -15,4 +15,4 @@ HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
+SLOT="6.0"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 53b61025ff4f..11c8ad3ee642 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-rails-1.5.0.gem 406528 BLAKE2B a43f6bf93d10df49b57f1da914474f54eb5983b53afe54cb13fe1a1b95792c5c9031b26651d3ac8fe2f8788d86e6ec891aaa91853e95c603f746f02a719f7b6d SHA512 d5a416cea8055319b768243b2029fcc05412677ba8fdc523b246d69e12d820e429b80892d6cfc43600aa84257e2175058ddd5f0946d68c42efa7ebadbf1a536d
+DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
 EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 3948f577a0a4229a2cdb34f1e97a034380127860894c5a62b918e021cebdec058d91c5cfa7ab938441b27d4172952413ea11aa50adc2104d19e6e64bf4b33ff2 SHA512 c93c1ac5595bfdf823e4c3e2c127eab035cb2c954f19c4c78baeb2f7dab21f4eabc396e3c359b36a5b9ec53324e02d30b974a475df23e0d81d55c33a729243d4
+EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
new file mode 100644
index 000000000000..4bb922cd0f1e
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-4:*
+	>=dev-ruby/railties-4:* <dev-ruby/railties-6:*
+	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 11009dca9859..f56db4a60b78 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -2,8 +2,11 @@ DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87fac
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
+DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
 EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
 EBUILD cucumber-2.4.0-r1.ebuild 2473 BLAKE2B c2af659c58de223eacfee53adeeeaf69095aa1a84b062b5fd9f2de7797941d499e3a88cd79e99cc72e42a15d3e02fcd1e31e024114da8ade82f325d1be2992b9 SHA512 e7087af641078b13fe9bddcfadd09c03bb521a1d2473ce5a29931c923efd58d11292e4e0c97fb1365dd32be699ab6317b6cbbf69742e0377ea41dbf09f5f8321
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
+EBUILD cucumber-3.1.0-r1.ebuild 2640 BLAKE2B 6153fd69023f41de353be99be0a2dd06f83b72da4b598e7c41af68a2613ed4a94886c9272256d5cf4191b37a9ff6228a0f4e51a49fd212e14c833f11a2af84ae SHA512 05c022ee6a27cc814aa7e2acdda3da8ec35b9f0e2ac50b9b9d2ad0f38effc43da82dcbffccce4d2e0f0c0d0516dee8ef3874644627549a71cf1e4607ccc4e781
 EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B 73ed0d1eef2e67fcac273f1c616af5666e5c06791b37690d01e59a79cea8bdc1536b7ba4eb29accba2d6966aa65dda500b8271f4f193b8b805fe2f2b0ce3ca6d SHA512 6317b921eb64ff878fadbb48dcccceae1fbbbd7867afa85839af7d3cf7031a210fbfbe1763530bdd00f3978722ef327d478b8fcf25bc9049c543693b9a206cd9
+EBUILD cucumber-3.1.1.ebuild 2648 BLAKE2B 7c10c2badb563b162ffb0ee8aecbf955fa149558895de9b2b2f18bb754726f0ede0acc851901aee3fcb70c5534d3ecf9d147b5df6254dccd0504ee6fbb65a1ef SHA512 f016d66bf8312c7712d8ec254433b5203f13635b536cf216c958e0a807b315c82ce5b125950fff7659678fc5583ba74a1c859d0a9dea6d440dbe49d7785bdf2f
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..efb1a9e5bd56
--- /dev/null
+++ b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
+		>=dev-ruby/json-1.7
+		>=dev-util/cucumber-3
+		>=dev-ruby/mime-types-2.99:2
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2:*
+	dev-util/cucumber-core:3.1
+	dev-util/cucumber-expressions:5.0
+	>=dev-util/cucumber-wire-0.0.1:0
+	>=dev-ruby/diff-lcs-1.3:0
+	dev-ruby/gherkin:5
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged cucumber-pro
+	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
+
+	# Avoid harmless failing spec
+	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
+		spec/cucumber/formatter/html_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
+		-e '/git ls-files/d' cucumber.gemspec || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	# Use the right interpreter
+	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cucumber/cucumber-3.1.1.ebuild b/dev-util/cucumber/cucumber-3.1.1.ebuild
new file mode 100644
index 000000000000..982b9518dfdf
--- /dev/null
+++ b/dev-util/cucumber/cucumber-3.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
+		>=dev-ruby/json-1.7
+		>=dev-util/cucumber-3
+		>=dev-ruby/mime-types-2.99:2
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2:*
+	dev-util/cucumber-core:3.1
+	dev-util/cucumber-expressions:6.0
+	>=dev-util/cucumber-wire-0.0.1:0
+	>=dev-ruby/diff-lcs-1.3:0
+	>=dev-ruby/gherkin-5.1.0:5
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged cucumber-pro
+	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
+
+	# Avoid harmless failing spec
+	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
+		spec/cucumber/formatter/html_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
+		-e '/git ls-files/d' cucumber.gemspec || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	# Use the right interpreter
+	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 3ba41de4d42f..1cca52e75a11 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_11.1.6.tar.xz 453020 BLAKE2B 79a62c37a8b14336516d877f0633d3231cfe57a0bdd19dd50233843d186bff619dd31155d9851d367748f70ffda2d94d138b06357c0dcadba0c99771777ea3af SHA512 8a9e5a98ccafe72f6fd2d3d6376c82cd2ba656b4a72936afb5e0564144a6dc495b8d74b7fc65dfe97aca6282118298f0c256f5433bbc01a5837306329d2c737c
 DIST debhelper_11.2.1.tar.xz 456036 BLAKE2B 31ed91d7546db6f81eb5c40ce8ea203e01281ce3b0ff0cc310a280338bb8138c01f78f0f74175c68dcc53e913aab4f8a2c808e5f4ecf3a8661a5b2d551758e2d SHA512 9ce70ba6c89c77ef6be6a67ac30e9b904235850b2d8671be1a138c681b356e6c48cfceccd49942ed297ef944f4d35eefc8727e06fe72e44a99cc7b542f2a1211
+DIST debhelper_11.3.2.tar.xz 463864 BLAKE2B cdfce5b74d8af2cedec4f4cdd2bd5dcd21a941c420d6be32a145a5ab83ff9ae9bef7e2061ff011e7ecf941e4d6e017f9bc1413865280f0efac9ae0b00478f142 SHA512 b2172638023540593d8dbf525417c8c07e803919d7c0d481f896cff6d562492d22859deab0522aca91f69bd4b8c3350cbbf508cce6859d5bc04596cee9fd4733
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.1.6.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-11.2.1.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
+EBUILD debhelper-11.3.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.1.6.ebuild b/dev-util/debhelper/debhelper-11.3.2.ebuild
index eb7e5fa626c2..eb7e5fa626c2 100644
--- a/dev-util/debhelper/debhelper-11.1.6.ebuild
+++ b/dev-util/debhelper/debhelper-11.3.2.ebuild
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 61b01ff6ed6c..48519dd4addf 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,8 @@
+DIST debootstrap_1.0.100.tar.gz 72269 BLAKE2B 76cb0268d3401463bd4ba72f0bab6b2d854b762df092c7fd6320b15d0de17d6a53ca1beb32df0cbe6beffe0a85909611a8b5ff8b9356fbf61501360cd2eeec98 SHA512 36bdf55207d73f9b5c259b1d9c19c36918778ca35478bf654a97d82d5e98fb6293fbf68adfa2e0a113e0d53ec48f19173232587fb1f727068b2516e9e51436d3
+DIST debootstrap_1.0.101.tar.gz 73074 BLAKE2B 293cd1016af3bb65229cc1fdf1a26a500eea099badd4d94db22d0013b878e6e054d38d2cadf7ddf87f32f1bea0c37a91718b6b20f0bee782c4e99a376ccdbe04 SHA512 692db9d6dcaa7e440e37b4c90e00c56933235f7462ebdfb640588c6cb1c08f7197997066529d2a03f1f3e857c390a693832c625a4de23dba1dd08801adfcfc9a
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
-DIST debootstrap_1.0.98.tar.gz 71819 BLAKE2B 4ac11484540407b8a4ebd1dac42ba99bc1d079989bcbe9b5a69ebb97f621e6beae34a2057726517a69a111087dbbe788e205b73a65a5330578aba3f63db9e34d SHA512 4ab6c6599f09c0d0d851d991cbe780ab6a74df4dd46df02d40e1e03682ea57680a69044a1524c75392e1e726aa538b4fca4fb26e42a140ac4cc00f86c0af29cd
-DIST debootstrap_1.0.99.tar.gz 71865 BLAKE2B 073c3c42133e2fa459cfc3e6a1737e8ceeb2f28986c139734c77a40fb57db293bf664493f6e10f4c1cfac83297b61e9e8fe1da267cc848a1e459fdd6af2ef157 SHA512 1eae4be2b50e98c1c867701affee8b4c63a54418af789bca78ff411c4c97a6284139850d71c118fddd6c62df9223f9ff960a21d45ccf8bdadc9bf0b11eb315fe
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
+EBUILD debootstrap-1.0.100.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.101.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
-EBUILD debootstrap-1.0.98.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.99.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.98.ebuild b/dev-util/debootstrap/debootstrap-1.0.100.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.98.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.100.ebuild
diff --git a/dev-util/debootstrap/debootstrap-1.0.99.ebuild b/dev-util/debootstrap/debootstrap-1.0.101.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.99.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.101.ebuild
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index e38f0059d313..f9ab1b2a4796 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,3 +1,3 @@
 DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
 EBUILD docker-ls-0.3.1.ebuild 1347 BLAKE2B 0f3795a9d68db30770000123e0bcfd24f695eea8642ee69ceed114636f1eb41befeab3916f41f7672f5f5eeb5f20b11b41240e7172c7faa87cbbe5290c899d39 SHA512 dc20c433d8696b0b111630d0bce4a976f841b116d06d89fef96e543ec5faf86ad5af3ee523f4592071c28ca8ada0efe540445501cfc5f5279aa7e6bb15907fea
-MISC metadata.xml 323 BLAKE2B 509388c3e74b1791db2db40b4386f905d811ed9a8e8b4ec374e78a7479e67b0f0b3c39c56d5070e9eee0070ef86c9dcef71c6668cacca6603416bf0792fb03de SHA512 bf430f00f6338c4790ca536314d722968a2325a46714212c122ac4ad56c401acc88bb593a19c4df4042d4477a9607c73af06e7d1d26fefbfaeeabbccbaeec14f
+MISC metadata.xml 245 BLAKE2B 6032e31aa98a3b51173eed0e5f5e110951fc7782dc921bd64369326613cdf94fbde87ec10c29f309fb4528790698ef105223ccfb5674e7cff05e5e72c10e1d63 SHA512 1808e8e5e1cc6bbb7f336471e940eb2b42489781d60cb302db6182b0ce7aa6a01148332f2d0ce32c32a57060e369c3a99330d7a02f292646acfd9dc40954709e
diff --git a/dev-util/docker-ls/metadata.xml b/dev-util/docker-ls/metadata.xml
index 1aca3044e224..06d6a6e291cb 100644
--- a/dev-util/docker-ls/metadata.xml
+++ b/dev-util/docker-ls/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">golang/crypto</remote-id>
 	</upstream>
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index e5460e005270..7d7263114d75 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,7 +1,5 @@
 DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
-DIST drone-cli-0.8.5.tar.gz 1381755 BLAKE2B 329a73490af7dced38e5a8ca7c8799e3cec5f8f2da396cf2c7e307cf65967c7688e1d9df3484a45da1906a187edfc3d4e45c48c7953549d61cf40903c334da07 SHA512 2e42b5aedf6b4b2666da84e457a161312c59a2e0d8785167ddc272f016d5ffaf4e5964e0da4135ad459a767b16259f8905fdd222e87247ad1915cdf2f85ed50f
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
 EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
-EBUILD drone-cli-0.8.5.ebuild 776 BLAKE2B ce07a12dae83ae7bfec997a93ac3793ea81cc0f0ea3d847130421dde6382c309c60171d3e4ff18cc76844f0978da4cf1f12eac42ecf2130e954b88acd32a98ba SHA512 bf5f47409a06868fe8224dc7b056bb516fab862ea56080d02f8735a41b240236e0e4d9bac8fee38b6c8ea7234beaf43e9027423f0858ac7c1aef8404affa5912
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.8.5.ebuild b/dev-util/drone-cli/drone-cli-0.8.5.ebuild
deleted file mode 100644
index 47b322c1a786..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="80e17b70e6323c282a02a764158b470f42704128"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 113661bfd2c1..38184e69e03b 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,6 +1,6 @@
 DIST dwdiff-2.1.0.tar.bz2 79224 BLAKE2B a201c300532757d293bbcdc61f91d81e3a2dcbc4847540bae278be561535b7ef2b6a191e2946b8af941f6550168893a17365e3020771a4468387567c4b3452f3 SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021
 DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
-EBUILD dwdiff-2.1.0-r1.ebuild 830 BLAKE2B fcfd491914f5e8c7586e540dc516cf808567581aae0ff2faaf6973b603bc2b9623083c6b06437ee4dc055cdbd2f27dc883be3f879aa5326c91f344d35b82fdc7 SHA512 6c77029c67d10eed55166c01ca5901b99d5e3c49582e24e4de26735db4eaf993a02a761ea04b8481bdb2d1a2265032a79076896a3763ce9b58421cd91647dcbe
-EBUILD dwdiff-2.1.0.ebuild 828 BLAKE2B 229755fba9410afb1d6980504185fbfebb0947acfaae77e5a5e8736a26423001dd47e4dda331e990e12b9c34e5a640c85e4dedcaf6dea43441febb43e80f2f23 SHA512 61bf26f338405963d71edc12ae2c853546bc558a1df425f2f97f6748fac2580ed81464de51f7583152a6767064475d411c2e1799836962dac62ccc39861cd4d1
-EBUILD dwdiff-2.1.1.ebuild 830 BLAKE2B 2f0fe82c945ceb64311e42778f76f99ae617951dbd3a5bd1a28827bea0735ec2bcd3232e07668eed365971d407c410995f5dd24106a0d30a291d54113611fd65 SHA512 b44dcc809a5bfd87d7c0a42895f9da30da6776ace15eea7382741e1694b47568d3a8c8a053abfd0475536c470e1b2bed6f90c5d280bbc21fe7f6c9523c1f461f
+EBUILD dwdiff-2.1.0-r1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
+EBUILD dwdiff-2.1.0.ebuild 830 BLAKE2B 0f80d0d578d0ad1d2fb0c565ddb384bda81878f94bacd5b398b983b48c8ed003411748e104b926dd03f6ef2d01bb7fa9fcb2f56816117f79cbcee638a42d56a9 SHA512 eff5be39b231c56c647f5823f9c3c897e21718ef1ddef5e5a85b0cab43c34d15f69b81ec64b6f694c2f4228435b9098192bfc666766d2cfa1acf3742ec1671de
+EBUILD dwdiff-2.1.1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
index 51b8e6bcee90..b549a993acad 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
+SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
index 5fd42d0959e4..acd2c98c7343 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
+SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/dwdiff/dwdiff-2.1.1.ebuild b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
index c8e8a440ba08..b549a993acad 100644
--- a/dev-util/dwdiff/dwdiff-2.1.1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
+HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
+SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 69e14a91e4ef..dfec8b299d66 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 2578 BLAKE2B 024f52506892d66d9ab10ebbd5ca30d6e9d0efcf697a38ee187ec83ece15d63301722b7c46123f5c9bc90df21e0b5634f09d47b92912c830e1d49d5692846425 SHA512 f5e4cd040ee03240b251593e4048d08b97f8f770fe3a9e6abd8dcdb36586ad7c97122eb6cb4a82cc257ef631d3cceb214b13290765ea2d901481847c79f8e46d
+EBUILD gtk-doc-1.25-r1.ebuild 2577 BLAKE2B 110bf184a66013282cfaa51032a161eb9ae5ccf19acf42024de136c20921475e6e439fa5c5ac0750e86b6b40d4ac0b70dc09a7b9a2a5bedcf7038a236c14734e SHA512 668b64a119f6895c8f03940155a01ce0fc95e1fc8c7504eb7b2b459b8b29dde8b2696ae619005214a0c29c5ce1dbb4a614cc7a5137553e37ff5d98e9e1ebbb43
 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 31a2782d08d2..155f1f6a02f9 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/idutils/Manifest b/dev-util/idutils/Manifest
index d3ba6a298974..5a1f97c3a545 100644
--- a/dev-util/idutils/Manifest
+++ b/dev-util/idutils/Manifest
@@ -1,9 +1,4 @@
 AUX idutils-4.6-glibc-2.16.patch 523 BLAKE2B 271c68c3ceb61a28330d33ff1e07beb9790cfddc51aa347a27303a06e58e1645d5e8d4ea5146f403d50947eba4999449e6252edce5919f95dec7cba0bee7770f SHA512 de4bcdaf2f871de5eeaa026ec578f80dcae73695c65fd5bc7d16a8f377a3e1781805937407fa6e9b50f8ea22a9d1a4575eeea789aa5d5fdfd05456cdbf75896b
-DIST id-utils_4.2-1.diff.gz 6178 BLAKE2B e6820490b546345c8a17d5bfeb2ccb55e91775fc045e1a604312c7937d77e9c2a393e9c81d270e11d759ceb4c2fb2a52e845c62be2effd0c56c7d81b7bf33d5f SHA512 ebeb2f3d35e21d0286d26ea6d703dea1ffbddc943c165ee6414484580a22e2883ace07b8e6670b0e90b6305f0e883fd22d8723c2c62dee664bdd8ab6a2a6106a
-DIST idutils-4.2.tar.gz 706193 BLAKE2B 88f83fbb7159ec7b36dacd539c805b749e2af81f37332a1b0a36ba4fc8cc8530aa4e64c5bd8b4f466592b7ff3d1f281c866e73f5820e25ac657867a5d8f61350 SHA512 319036d449baec65617670fa4ca17e89348f1ed5916731ef2376d96d15f3da032b25ae17234da409c6e439561ccb30056ea22ee37494fd9b196129a21607de3b
-DIST idutils-4.5.tar.gz 1476520 BLAKE2B a30db5ab96303c9ddd5d4b86c6cb2c5c5f280221150f4dc3aa8e22e32711edc003c8d055aab50b499a1c81459b6844026b9c35ee2564987f1f76bf8eb3f474ad SHA512 c5b50c15cdd92d6caf8748c3b35e9d6f2dafb41abab31d83ed0fe95cffc77e1170ac6512424d94a9a61033a99bda2961a9ab339b66078c417ea39c1bd8fe1e11
 DIST idutils-4.6.tar.xz 1001496 BLAKE2B bbb06fd0c1e585c8022ae46f2c721aef60becd512da91fc4191977cd46ecf2df86e7bc65481182881c434de6e9c740853b916e31dacedb75c1f14ae8d94967ea SHA512 830fe4a36693e9bcc8def25982c1a76decac2076165158c39858106f928c1b6ff2bb941fcce7244357c4205c2ecc945b772c9f5a083c4fedb1b75eea0af5445e
-EBUILD idutils-4.2.ebuild 1038 BLAKE2B fb15aa81e5a0dcef4bafca231425b9e12b2d9662e399c79ba10c763e1d775d2b8fa8b2a720e5cfb0370a06637206cf5b2dbe0f05c6fb6a76f73113ceadd73df9 SHA512 26a3c19299a761afe9ced2d245c2fcd0d1547bf8c260fe8b3ea9ecfa6a126c0a79353d29893b65275ca2b13503392fab44f360c32e667c10d69c1f19aa40da6f
-EBUILD idutils-4.5.ebuild 1076 BLAKE2B 44e547a6052a0fde0b590243e8fc05e662c15eef753bfff20d3edf47a8b636277700a8a7d9c79a795265f7ff0cb0ef752d14f9fab9c9916773d64a2a99c1bce4 SHA512 135ca56da2873a32d3b573a04c70a78f833e3273da746760046c48c468b5bec2ddcea7d067a1ca714320eba9d64a803273234bb17037b8d4a2f83effcd44dd4f
 EBUILD idutils-4.6.ebuild 720 BLAKE2B 51a9d40987fff4f15d50335b5c817b6b3097620a5cc8e95efff7efd93e5be1bbf23d550843eb748f13cae6d106f4094ac2d0d9ec01a3be69b94ae0f4cbc2e557 SHA512 0f35d7b81bc9b06df314b40666bc728316ad36f468f5d8cee602798beee5f960bafc1a8a151a67efa9ba50dbfd1b9b5a4ff1ad0a6786a6e9416b9eadce959072
 MISC metadata.xml 591 BLAKE2B 91443111daa5642e9fdac540aec9f5d406ddec96a3ba68b31c6f282018dd463cec8cf9a9c46c1a882bf6907780f7ac4703f088acfadd2162c845777150049967 SHA512 593591a9d4a0d3303f6b96f06a59bae0983abca6b9d0ad9e0df691d3c192cc442a39bd18bac3b87257057ebde50315dd5d6c1be74ebfaa7f21b5ee0c690e9f25
diff --git a/dev-util/idutils/idutils-4.2.ebuild b/dev-util/idutils/idutils-4.2.ebuild
deleted file mode 100644
index 4d8cd335bfb1..000000000000
--- a/dev-util/idutils/idutils-4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils elisp-common
-
-DESCRIPTION="Fast, high-capacity, identifier database tool"
-HOMEPAGE="https://www.gnu.org/software/idutils/"
-DEB_PN="id-utils" # old upstream name for it
-DEB_P="${DEB_PN}_${PV}"
-DEB_PR="1"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-		mirror://debian/pool/main/${PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="emacs nls"
-
-RDEPEND="emacs? ( virtual/emacs )
-		 nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-		nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
-	epatch "${S}"/debian/patches/*.dpatch
-}
-
-src_compile() {
-	use emacs || export EMACS=no
-	econf \
-		$(use_enable nls) \
-		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README* ChangeLog AUTHORS THANKS TODO
-}
diff --git a/dev-util/idutils/idutils-4.5.ebuild b/dev-util/idutils/idutils-4.5.ebuild
deleted file mode 100644
index 4f0eafd797c0..000000000000
--- a/dev-util/idutils/idutils-4.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils elisp-common
-
-DESCRIPTION="Fast, high-capacity, identifier database tool"
-HOMEPAGE="https://www.gnu.org/software/idutils/"
-#DEB_PN="id-utils" # old upstream name for it
-#DEB_P="${DEB_PN}_${PV}"
-#DEB_PR="1"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-#mirror://debian/pool/main/${PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs nls"
-
-RDEPEND="emacs? ( virtual/emacs )
-		 nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-		nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if [ -n "${DEB_PR}" ]; then
-		cd "${S}"
-		epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
-		epatch "${S}"/debian/patches/*.dpatch
-	fi
-}
-
-src_compile() {
-	use emacs || export EMACS=no
-	econf \
-		$(use_enable nls) \
-		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README* ChangeLog AUTHORS THANKS TODO
-}
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
index 55d1df9b004c..27c81b5f0fd6 100644
--- a/dev-util/jconfig/Manifest
+++ b/dev-util/jconfig/Manifest
@@ -1,7 +1,5 @@
 DIST jconfig-src-v2.8.5.tar.gz 1171848 BLAKE2B 579074196d538a6e5d38c777344d646c1ed9c9bb76554421cfe7f1772fcfbcc7343f0aa444dbb5dc4a07ad9056178990f337e7dd710549ede0450c136c74db59 SHA512 c6c1af63069ccaf7cfd2fe625318fec4ed3f82671754956f8d861c3254a748bbc8a7b8e63e36cf8abc436d4ced732d8ea04f770551428b04d3078293dc77d6ff
-DIST jconfig-src-v2.8.tar.gz 1155906 BLAKE2B 8aca47d02c026ff91e9d3bf845242c6687a745786c148d920942166f26c738545a411a3389f73ffbccfcc32bc62950679c4b6f51d83fed7ad4990ceebe7c6553 SHA512 ed84e3be2334caa9a7edf0308c6a2cc07c1462235ce27c39ec180c535f163447373f82a0c9f6ad144ec16cc013658e0f23e98e2f2089c7a680d1728a812d49c5
 DIST jconfig-src-v2.9.tar.gz 1202738 BLAKE2B 09e5f869ee671028e5044988a9a27af4d6eddb919fa777cb2b08980e33670359b43a87669f28cf59f421af4381df468bb49f52b3829000d4dbddf60bbf6342d4 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c
-EBUILD jconfig-2.8-r3.ebuild 860 BLAKE2B 29b91245544c5a94c513096536373de7bf1585e586a95f3eaf8d046006880e3d3907611d41166116b46ec05cef65d3ca5a593792207e0cd6ed4193fcd8882892 SHA512 25c7f813b0e0a1f6821f29102d6da7579bd0de38ecac102c63e03dd9a6d14e74f1bbd5ff52bf7cf4b5816d770b3756d2f0d578dbf225d1bd98fd2e535c3eaf41
 EBUILD jconfig-2.8.5.ebuild 860 BLAKE2B 29b91245544c5a94c513096536373de7bf1585e586a95f3eaf8d046006880e3d3907611d41166116b46ec05cef65d3ca5a593792207e0cd6ed4193fcd8882892 SHA512 25c7f813b0e0a1f6821f29102d6da7579bd0de38ecac102c63e03dd9a6d14e74f1bbd5ff52bf7cf4b5816d770b3756d2f0d578dbf225d1bd98fd2e535c3eaf41
 EBUILD jconfig-2.9.ebuild 842 BLAKE2B 904129fc6bcbd7bb550131c61ed91fbe5626616f7f8c8a879cde4c8c0d0b5e8cc61fe185f9ba73ab0367955aacaffecb324bb1177c6ab7f2ea75536981a340a7 SHA512 589751320dde2e2ee74acac1545a7afd3430f8808de2edf5a641dd25e78390630c66978e290cc61355aa9ad08514ce75254ded91be1933b38d9978a7c58c1067
 MISC metadata.xml 313 BLAKE2B 35d3e65273f55e25c70550785fc394e3e5df5de19e450db23d40253c2384cf67e23ce9431b34d51d34c604b0d60c8926289ce409d80ed81352e6f10abe496e99 SHA512 a763cadd5e639466f136912e6a1abad023e53576ccbfc5b6b82b9ce5e7f7b173000d51d0991332dd52bff2fc0ee77963ce2e77b58c3f9ecf9701344ee4c5f2ae
diff --git a/dev-util/jconfig/jconfig-2.8-r3.ebuild b/dev-util/jconfig/jconfig-2.8-r3.ebuild
deleted file mode 100644
index 1b86b444357a..000000000000
--- a/dev-util/jconfig/jconfig-2.8-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Utility that provides a simple API for the management of properties"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN/c/C}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v dist/*.jar || die
-	rm -v lib/*.jar || die
-
-	java-pkg_jar-from --into lib jmx
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-
-	dodoc README || die
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-
-}
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index ff7b5ac2b746..e0bd11c7766e 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -8,10 +8,10 @@ AUX kbuild-glibc-2.10.patch 756 BLAKE2B 50f0f90daad8f4b93cde4e1ca458ae79c6cfa876
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 BLAKE2B 51d68203d38a6cc86a32e6c66431739a87df738e920bfc9ff902433a46279fd62c704d9bcae02f0a1cb6a1f97cf68dab059c636ebd425d2b15c50c9c9cb4fcc6 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047
 DIST kbuild-0.1.9998.3127-src.tar.xz 2221336 BLAKE2B 12eb542553c2abe4419440d124ed9c6b3c485fc77ca20bc8b8d5265cf2d91003e3bee21ad7e247f1da43c88bd29fdc5d317e42bfca213cde1ac0c900cce03fcf SHA512 b4cfca917efdb19b015a70efc15fdb0f2f08a4b6e493c7ac121dada97866b2f57cb9be9db9dd9b337eda4d5772ab850bf0586e5bfdc370e1332659363374f78d
+DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 BLAKE2B 75d24ba49ee69a11b8e1d798ebee4470fa50ec4970299faaa67b0537d21729053fa24142d02e428cb56c429c6c17d581d147d659c3a3ad11693e2fa6ab4e6d72 SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0
-DIST kbuild-0.1.9998_pre20171020-src.tar.xz 2190856 BLAKE2B 3918170fdda00ab65136da0deacfe6a2e779a8bcca0b1a565f89f367ac4d73feb8566157b7cfdf2d38beb5864f9dde1010420cf4b03ff71b455f99744096c37b SHA512 53c55a520f3711d1141b10eaeb3bec5dc57bb8476c6b658826e05dbb525eda43a0007dd94dcdde31ea39ad0bb29223ef8ad2a72da1404e53919e444039794043
 EBUILD kbuild-0.1.9998.3127.ebuild 1723 BLAKE2B e4ca9b4b61807247d39cb7216f8eb2fbb17c45c18e241791403393474ec0e58774c7c8e03a50f03fc9dbf51beed9639b37a8646f356b1d34176dd7c05e599c16 SHA512 e0943bb0d315e6673332639031c4ed0e45e8ba3b94bb5de62918bf2de96bdb14c21b6f75012f18b2cab5d90ac10b3be5a38e40457e2012a08cc068f9a2d8bf7b
+EBUILD kbuild-0.1.9998.3149.ebuild 1797 BLAKE2B 77af90d7312b90240f3ff3f03a7c16bf181b6aabb0a19c87f7618f495c7b11cc0f9d10a308da81563e58e5f46176756c8dd6510319afba5826cb5ea354ac1074 SHA512 11add83b15c24aafb276617a596a6e329eab3aed0c35b32c6da9540cada1e89e2e64d3da2f042573a2058ba680c4d3bea99ad18da65f25d46710f5760b8a93f9
 EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1802 BLAKE2B ce3518b0ab413a1a4aa3150d6fa3f13050cf49cae8fab1603da6912beba290135574570acb25fd2d7dffcfe65e54d8c9122ec1071cd589e7d5c46ec0de369805 SHA512 39d21f6ac472c67c3f0aa9e1d160444f89bfdab05bef260eac07aeef9bd464a98f1fa8ce978a47ecd47af350c0484dffbc9c0b057f4d92a9bfdbbe95627fa92b
-EBUILD kbuild-0.1.9998_pre20171020.ebuild 1552 BLAKE2B a0e04657c5729563450407dcb355e1bc5283b1a505ae27b88b199dce130b65ecb6120539dfaa7088c7216c990d88baf29b68eb78747f7170040274b0f440ed73 SHA512 738255ee317a81d0d19b9613537381a10d624325291b356d7494748071f4a494f05f6fe0b075bd3cb39d0353110d00d1ea29df83560deaece8fa4d37f817e8bf
 EBUILD kbuild-9999.ebuild 866 BLAKE2B c14fc7ecf01de63d6812800b52cd61607826a5c52efd11387b818af1c88c2d88c72992fe49490c4cd549b06d75b3487167669bdcba382d32ef3cfda756b61965 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
index 612e8ebbab1d..457775ebe06b 100644
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils autotools toolchain-funcs
+inherit autotools toolchain-funcs
 
 MY_P="${P}-src"
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
@@ -37,7 +37,13 @@ src_prepare() {
 
 	default
 
-	mv src/kmk/configure.{in,ac} || die
+	# Add a file with the svn revision this package was pulled from
+	printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
+		> SvnInfo.kmk || die
+
+	# bootstrapping breaks because of missing po/Makefile.in.in (r3149)
+	sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \
+		-i src/kmk/configure.ac || die
 
 	cd "${S}/src/kmk" || die
 	eautoreconf
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 2b9a349adbc5..650834c0e45d 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 924 BLAKE2B a28ab9bc203e3c090b8504afb6e77cc7d1b3ea65068f99a011aec4f8855b3bfa587908b4da501f0ab1675c4f60b252188582166e8974bdfbfda98ee10c8c73cc SHA512 32859679d76f6e53ce6482058577d4f022c3e8966b519a3aa2614082720569c9449af18a4a3628a5c05bc67bfe41f9713a6abd16e09974eb55417959bdebb1c7
+EBUILD meson-0.46.1.ebuild 923 BLAKE2B 6d7723e1e6e15cc53032b367aaae44309cf0a5963478802db2d438d3673b0c07363ac552603594cd76be254e8b24905ccef4ee01eed0871e36c3d98c6af6dcc0 SHA512 358f2c36de1dd29ae5afe3cdef73260a1feb89afb2ded1634ca5764eaf7b924736b27ee923e452db27a037d3d9a4853c9f99107b2c7df89cd5bfc85bae14ae3a
 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 e359d174f2d7..239b7fce1856 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/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index f1ce0ee64896..719a5ab22485 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -5,10 +5,12 @@ DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4f
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
+DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
 EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
 EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 BLAKE2B bb1f549d41e64984e8b3ae629461f3bc616bb776324fd2d29e529a66453bb2304c8ad6d397e7c5b790d759455869b88f9796bf12f760a2816e651caa85226480 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa
 EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3802 BLAKE2B 721ae934544eec47b19fb1eaee6109fb9bd1ad8ee79a38ee4d9d28a6a00891badf8b2c24c11160c4803c0aa9ff375348fd897d3fb396355853013e03290b35c9 SHA512 ce2afcc297f62e9ef965ec0ad3344286a9df85ec84bc512872e5e7897c07993431ff21eb36e34aa2b5aed05f4a3f107f869e979bfa09cffda035de77c8d89983
 EBUILD nvidia-cuda-sdk-9.1.85.ebuild 3798 BLAKE2B c10c6cd7aaef1b99089f36d319f7f5375fb117c3f8840fc367c44368a7cac7366d54f377c9d775207dec61d0ca67885ef2ba61a70daee4d5326453dc7e831f71 SHA512 e5c37b2319ffd7d91b4d24721ffbd4617aec28924ebef86ffd44d7a3de2eeebf726a6bf518cad195261e485f7fc8d4850565ba83186026962ca9d49e49bfdddb
+EBUILD nvidia-cuda-sdk-9.2.88.ebuild 3791 BLAKE2B bd1fb4d0c9cc42767ac113097f768fc0e944eab1fa4ee8384bb5925abdad0d29b878abdf205c68216b3612451f6e627c40722013be4749c3ac9cc33314290860 SHA512 4ad0d53e6a7c33f578e5e5daef71f3bed147bf2083ee641f72baf62718655b54066088c2c371eb493924d996edbfd522feea3b8497adccdcef50a845c4c8b77a
 MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild
new file mode 100644
index 000000000000..c37d95782497
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="396.26"
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda debug +doc +examples opencl mpi"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew:0=
+		>=x11-drivers/nvidia-drivers-396.24[uvm]
+		mpi? ( virtual/mpi )
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_unpack() {
+	# We first need to unpack the cuda_${PV}_linux.run file
+	# which includes the cuda-samples*run file.
+	unpacker
+	unpacker run_files/cuda-samples*run
+}
+
+pkg_setup() {
+	if use cuda || use opencl; then
+		cuda_pkg_setup
+	fi
+}
+
+src_prepare() {
+	export RAWLDFLAGS="$(raw-ldflags)"
+#	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		sed \
+			-e 's:-O[23]::g' \
+			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+			-e "/CC/s:gcc:$(tc-getCC):g" \
+			-e "/GCC/s:g++:$(tc-getCXX):g" \
+			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+			-e 's:-Wimplicit::g' \
+			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-i "${file}" || die
+			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
+	done < <(find . -type f -name 'Makefile' -print0)
+
+	rm -rf common/inc/GL || die
+	find . -type f -name '*.a' -delete || die
+
+	eapply_user
+}
+
+src_compile() {
+	use examples || return
+	local myopts=("verbose=1")
+	use debug && myopts+=("dbg=1")
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		"${myopts[@]}"
+}
+
+src_test() {
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	local i
+	for i in {0..9}*/*; do
+		emake -C "${i}" run
+	done
+}
+
+src_install() {
+	local f t crap=( *.txt Samples.htm* )
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			while IFS="" read -d $'\0' -r f; do
+				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
+
+			while IFS="" read -d $'\0' -r f; do
+				docompress -x "${f#${ED%/}}"
+			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+		eend
+	fi
+
+	ebegin "Cleaning before installation..."
+		for f in "${crap[@]}"; do
+			rm -f "${f}" || die
+		done
+		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
+	eend
+
+	ebegin "Moving files..."
+		while IFS="" read -d $'\0' -r f; do
+			t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ -x ${f} ]]; then
+				exeinto /opt/cuda/sdk/"${t}"
+				doexe "${f}"
+			else
+				insinto /opt/cuda/sdk/"${t}"
+				doins "${f}"
+			fi
+		done < <(find . -type f -print0)
+	eend
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 1604b38184c3..1f82dad5e612 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -8,6 +8,7 @@ DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4f
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
+DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
@@ -15,4 +16,5 @@ EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3311 BLAKE2B f9dc70a5ed6c7ba920d07e4b32
 EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3361 BLAKE2B d43051ae9eed5138e952b22159035f8557e8b5cfe0b7c0bdc411b389e60a0db9ad1f890e5c8a0159689aaa1fa06abb7a8c843c6973cd2204a6fcbebd8a0f89f0 SHA512 b98d5b85eb4405ba749061b7d228f3e86057592283a36f189eda2f1d859b2e1e55c9c6c1444e9521ac699ab8bb7b6f87a8e2457a5fe5ca85cc13043e59cdeb33
 EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3368 BLAKE2B 8782b66dd08834300b4f3935544d9e3263725b3e04774bce75c55c174052d0203cef71a94df974b1cf0fa943da76137931d443e20d9f0a733db9cec18d6f3aeb SHA512 719b65770838e7497abcd39f318773d049339cd5e1335a58a7d873c4112edf85c670ddfd9544bbaa1a6f31501e1c0e699f88b9ad3d6f0409990ed7b7ce803c4c
 EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3345 BLAKE2B af1bdce7f452973e1addfd4881abf937dbb17e8ac946e496148805dd8407b3f3485ced3487334779d6d536fedb294a3eb9241f90920bce4529256bb94f4987ab SHA512 9adef55be28117a0875704cbffb4975ac99674b3dc608909e7c5978b53f558c21049454589a5e8624ca12d6ffe4308cdf1839380ad1569955902659d0ffab7a9
+EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3347 BLAKE2B 8b438d0b64b91ad20d293662e7fc1eea788155d7e90bec0746d4a4369cfb5311eb5692c2cf77c24f49d90a6d759ee8a0681635b5de385bfe7543724eb3ba203b SHA512 6a5f413ceee79a2d1a0fbe58bf697e6f6b27bc41608f66155462efc55e139cb5356c28894c7f24cb52c98b47161e8f023b713d32306183d3fcccc14452ec89e4
 MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
new file mode 100644
index 000000000000..de825e179c3c
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs cuda toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="396.26"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-8[cxx]
+	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses:5/5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="3500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight )
+		remove+=( extras/CUPTI )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	mv * "${ED%/}${cudadir}" || die
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b="${a[${#a[@]}-1]}"
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		! version_is_at_least gcc-version ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
new file mode 100644
index 000000000000..05157ac3dbe9
--- /dev/null
+++ b/dev-util/ostree/Manifest
@@ -0,0 +1,3 @@
+DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8
+EBUILD ostree-2018.5.ebuild 1183 BLAKE2B 749134dbf4e826fd6535cdd94ff66704d136404a1864d8dbbb7bf075cc42d89bd7091100d31fdc0a81b13aa452075c3ae3f4c6fe9d4931ada5e20a6a9d6cc65b SHA512 f1bb169d68fc6658b986b6d443537e6e1a7a05386588a966de08ef9c6da370524abb11ce6b8b95e94a7eeec7cefa4ced461526ffd8abbb1ee123457cc5de02f6
+MISC metadata.xml 1644 BLAKE2B 3085135779d4dbefb278b1b7ca4e80e4b892f38585aea5a71fde726d55b9975c0c097917940045a0770a5d8bc2c3732a371773a8cb6750dd272ca0b4a9488182 SHA512 5fb6f77a5068d1ff4aab1635ba41ed895f6b31cce39b571b4f3487c68242bb5634e7454bce318d0c585cb581533d1fe239344a9eb7f1485c4b75a5a24d78f5ad
diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml
new file mode 100644
index 000000000000..d31a82267686
--- /dev/null
+++ b/dev-util/ostree/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<longdescription lang="en">
+		This project is now known as "libostree", though it is
+		still appropriate to use the previous name: "OSTree" (or
+		"ostree"). The focus is on projects which use libostree's
+		shared library, rather than users directly invoking the command
+		line tools (except for build systems). However, in most of
+		the rest of the documentation, we will use the term "OSTree",
+		since it's slightly shorter, and changing all documentation
+		at once is impractical. We expect to transition to the new
+		name over time.
+
+		As implied above, libostree is both a shared library and suite
+		of command line tools that combines a "git-like" model for
+		committing and downloading bootable filesystem trees, along
+		with a layer for deploying them and managing the bootloader
+		configuration.
+
+		The core OSTree model is like git in that it checksums
+		individual files and has a content-addressed-object
+		store. It's unlike git in that it "checks out" the files
+		via hardlinks, and they thus need to be immutable to prevent
+		corruption. Therefore, another way to think of OSTree is that
+		it's just a more polished version of Linux VServer hardlinks.
+	</longdescription>
+	<use>
+		<flag name="grub">Enable grub configuration generator</flag>
+		<flag name="soup">Use libsoup for networking</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ostreedev/ostree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ostree/ostree-2018.5.ebuild b/dev-util/ostree/ostree-2018.5.ebuild
new file mode 100644
index 000000000000..3c2aec24a4af
--- /dev/null
+++ b/dev-util/ostree/ostree-2018.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/ostreedev/${PN}/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="grub selinux soup systemd zeroconf"
+RESTRICT="test"
+
+S="${WORKDIR}/lib${P}"
+COMMON_DEPEND="
+	app-arch/libarchive:=
+	app-arch/xz-utils:=
+	app-crypt/gpgme:=
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	dev-libs/openssl:=
+	net-misc/curl:=
+	sys-apps/util-linux:=
+	sys-fs/fuse:=
+	sys-libs/zlib:=
+
+	grub? ( sys-boot/grub:* )
+	selinux? ( sys-libs/libselinux:= )
+	soup? ( net-libs/libsoup:= )
+	systemd? ( sys-apps/systemd:= )
+	zeroconf? ( net-dns/avahi:* )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf \
+		--with-crypto=openssl \
+		--with-curl \
+		--with-openssl \
+		$(use_with soup) \
+		$(use_with selinux ) \
+		$(use_with zeroconf avahi)
+}
diff --git a/dev-util/peg/Manifest b/dev-util/peg/Manifest
index f313d297bec8..646d86969700 100644
--- a/dev-util/peg/Manifest
+++ b/dev-util/peg/Manifest
@@ -1,8 +1,5 @@
-DIST peg-0.1.13.tar.gz 55352 BLAKE2B 9b97304333d0386d7011a76638f33dcf5ce5753324a996163c5f66c770f1d67c50f96351e4947065af1e28e28300d8d26e8bc04b2d5b9e8562e6f3f3a82aa3a1 SHA512 fbec192daef2c72511cc17e6f7b301ac48d20746ac9843d61c05e8a069633c5fbc6d92155a94aad5094dc84a2f1bb92bc2b2aabaf6bc563d4401460f1047b3b0
 DIST peg-0.1.15.tar.gz 56522 BLAKE2B cfc13761d4f3de3e4906abefc04fb732e7f30e0a1eb70dcab79de6001434866329cb4263fba68a5c8aac9dd895805d0de43dafa5a9e382c4c2e12fe90189676e SHA512 70b67d57c866c24cc9ceaf029e95bacba56def7ccb289233e3816c1f6f1f210dd8a729446df94d0424b5946959dbf9a33f81a5a95f7563a9dca460d6e2320018
-DIST peg-0.1.9.tar.gz 38485 BLAKE2B 088520a98609fab2b3b419c6f7875daa20b7a3da65224301ee48b37494569f52dc1e574df503c6b53d63ebe250033e586fc91f615e1173a10b126c267bfe8816 SHA512 73d0776972243ca8cba348b63252dee837308df6d6b00d2a186396545b80cb798e3280a9af6a71d51d9ae8c381a518502f96cf3d0d651bcf0f2206276f29ed1e
-EBUILD peg-0.1.13.ebuild 803 BLAKE2B 24168f3527b851881bd0467f24ba4f388b9c2418b0badabda4c0668b0b8911c4ef75da407662e3e3d0ebe4454f09050687da051f6bf1b2d8a725c77c70270a78 SHA512 f96ccd15b32243ba527d3d803a898d416ae49b5f566415e13926c96b9e7724b24453eb839b9c1923f9f052c316ccb2ff476dd13dea78f5b3088236131ad58b0f
+DIST peg-0.1.18.tar.gz 57776 BLAKE2B 3266db2009073ee95a7fe65f3969b06001669dca095a8b77cbef3293557f9919872b44b348ff3de53cf8a132fd414c265bf0da3f77f0da0391d6d53cf4ab9217 SHA512 ca2fb9088bf87955adf6f883370ddb7d5f6f3cae3605a871094317205a124cce4f7b9f83cf4662cb470e2c5a6977608b456eb1fad98022d7e40fc384d1fec0f8
 EBUILD peg-0.1.15-r1.ebuild 896 BLAKE2B e286cf9cd51c9e14563528a27635b4fe4f0779aade712d782a2017f36de303866c0026a0f629e4bfa8185a640165938c0948f1406af94a9a60bf3a546f3d0a9b SHA512 21b10c4f565e3dd927f08e3e4a1aa70cdd572ce8777e74dc069dd830d813abb5080127d2789e91e86d5048217c94663090a4c548ad5efeab595f34200fabcaed
-EBUILD peg-0.1.15.ebuild 743 BLAKE2B 1dc373bc61b005c5ebc46b40c4d751073a2a34c7cd4a18154096a5095ccab51298c5e77917f000549782712840a1c23519de7eed0dc3e45f4e133fe98eaf4091 SHA512 f251edd6def3e93edd4e7e8a0c776e961ff49cd0d1b9062b72061379dcf83033c2b4b2be69c7bc041d951774e3a70a10faee31846b42e1d3eda01ddf27e73ef3
-EBUILD peg-0.1.9.ebuild 757 BLAKE2B 8f00cb6034c6690c9218b53d3857a364dbedb2bc04c6edc974320dcb87c1235e08aa2fefc222a8a3feb9f4ede6c330fc7bba4fb035c65da41b62cd438ded498b SHA512 eb565ee8b4a0d113dc4bdfbcbdc9f4473482b36eb80c811a7dcafd42aa60f12d6145bdd0b21d4a6e8a345e70eeae3d60f2b842b2f2470f68975ea9663e486f73
+EBUILD peg-0.1.18.ebuild 870 BLAKE2B 85683a921523c9b1c83d40f97da4d7b6cff4e152c87025f0bff948c751f3e5003436d5ce783ca636f3688178cfdcfc889642f56744f2f131d886ef17bb9e33fb SHA512 ef827b7ad368c5d0bce2de6731443366b47d6154ef0267581e668f5389940c84075b9a3f5e4da6b758694288a7a8631a841c206155ff8f94f47e7cab872fd2cc
 MISC metadata.xml 257 BLAKE2B c4675d1acb1e5dd4987811e68c4e4b23d7476dc5d5a1c90aea425f43e9f92261fea544c0fe3bb2907b43a47db5a340abce8b8b0e9b777e79a9811a7d5d96dc9f SHA512 7c68096d12fdee234074ad1256cb5075513b3a00795138a18a70003d8498c9418664d4f62772647e090796ea6b9bda9aeeac1e74c271773efa42568aeefde301
diff --git a/dev-util/peg/peg-0.1.13.ebuild b/dev-util/peg/peg-0.1.13.ebuild
deleted file mode 100644
index 9d17112ee19a..000000000000
--- a/dev-util/peg/peg-0.1.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin" || die "mkdir failed"
-	emake ROOT="${D}" PREFIX="/usr" install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/peg/peg-0.1.15.ebuild b/dev-util/peg/peg-0.1.15.ebuild
deleted file mode 100644
index 69f02c21d1e8..000000000000
--- a/dev-util/peg/peg-0.1.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	dodir "/usr/bin"
-	emake ROOT="${D}" PREFIX="/usr" install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/peg/peg-0.1.18.ebuild b/dev-util/peg/peg-0.1.18.ebuild
new file mode 100644
index 000000000000..3853be968a49
--- /dev/null
+++ b/dev-util/peg/peg-0.1.18.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recursive-descent parser generators for C"
+HOMEPAGE="http://piumarta.com/software/peg/"
+SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	eapply_user
+
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/$(CC) $(CFLAGS) -o/$(CC) $(CFLAGS) $(LDFLAGS) -o/g' \
+			Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dodir "/usr/bin"
+	emake \
+		ROOT="${D}" \
+		PREFIX="/usr" \
+		install
+	rm -rf "${D}/usr/man" || die "rm failed"
+	doman src/${PN}.1
+}
+
+src_test() {
+	emake check test \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-util/peg/peg-0.1.9.ebuild b/dev-util/peg/peg-0.1.9.ebuild
deleted file mode 100644
index 6f8f2b50b211..000000000000
--- a/dev-util/peg/peg-0.1.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin" || die "mkdir failed"
-	emake ROOT="${D}" PREFIX="/usr" install
-	doman ${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 8f64eae41896..6a49fc90d1a8 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -16,7 +16,7 @@ EBUILD perf-3.12.ebuild 5006 BLAKE2B 7eb7939628a49ca9dadf7c4a223184b5e4da478fef6
 EBUILD perf-3.13.1-r1.ebuild 5128 BLAKE2B e34cc28ba57866db83fcf9ab639e95306582c66fd7ce427543b19528d72fa78757721efc0ac1b23c6435973766fa4619e5f6448bfb21a6c50cc01cca2a2c3859 SHA512 f7ce04b5f4a4db657dfeb6b59d70c15cfb012ce661a62620773607ee93d5becfea56912dd9fae88db47a9f42ade6ce0ed0d0ba67a3fc37b086eda0e9e87118ab
 EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f02cf9201e78a5d6bcb4c18d645ae4bc8e584237ab738a1739f971a2ae62faf950d8bbe9845f02ad878aab84 SHA512 9a56717e87b9bf6bfa27f3d953e41af18c55e92020fbcc14fd01f43835e542bf1c7adb195387400c955706f5ca8a69090e41d6edfb728717910cd19b801d6dfc
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
-EBUILD perf-4.14.33.ebuild 4943 BLAKE2B 59e7d995374f472c9ad91ee43d4c792f193f81dafe14f6fa201115da9938cfb6f9d711b50f9b39e44b9f7a72c479b023b13ee1eabf5f1e932f4ab7140dcee976 SHA512 49832af181b35887504ca047ef7225444f85435e4f91b59f4cca5a982ca9c066e0226f49b99f13c578aae418e93a0ffc6087d20cd18c16062144dd8ab56817ff
+EBUILD perf-4.14.33.ebuild 4950 BLAKE2B f4b86b4fc45dbbaada34a9cbf463dd68675ea74ab93794891eba66e20869e931c653d5e20e6cbf41df035d49a2b5aa298eb08829f2819c0055221d134e2cd353 SHA512 a4a6323f62c46cfcf1141a41025609f8eb990978ca9a3f77be65f1c5913a84a733ad3c16d8e65fea8728064d15308a3d99f20a859364dcd3b3eef58747fec2ef
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
 EBUILD perf-4.9.13.ebuild 4925 BLAKE2B 919acbb8b5bc86a8cc0de41f963e87a85f16d7ba3fee026adab0c29ac5a46c8846fd102592576f0efdebb379080bf1580babfb0bc23729ea386ae3cc7ba3d634 SHA512 750501145fd525bf5e973edb7f4645cf0cd94c3449ae859ffcc33896e8963db8e573248893441de971248af2842fa18df9222704b5b92880a356e8656776a597
 MISC metadata.xml 1093 BLAKE2B c10db12ae6c05c68b06dba1112b3c899dd40d2d35f8ff8f2bc840c38e712571256b1ac49d90983b4df6af5806fc93b59bbb86e6d851d197539e776d60da0d7da SHA512 5c83c9c871c23eda63760d4b33b549849236d1f79edf4a69bbf2803987cd6db9c3f5dd8abdd216abacce91c93a589a9487e911d9ee1f57a9fec761f7e39beeef
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
index c7290b313e2a..609530402717 100644
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 9e2961af42cb..0d353b8d1bde 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,5 +2,5 @@ DIST pkgcheck-0.5.3.tar.gz 80896 BLAKE2B f396d14c95f8b9eb652fdc3073be942bc271f67
 DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
 EBUILD pkgcheck-0.5.3.ebuild 1208 BLAKE2B a9a4d89c04ec512be71d2adff1638f6d2daec7b929da8d2fc719fead0337b4e4a58e7b1a80544ec025af96edd8c05396fe4984db5c33ecc79b48f8763cf0e8cb SHA512 5f88cbd4c3162a3e6cb02e8710464c10384268564428b4dc713f9b9d122909e8cce9ed086648c5238a1b1c6092d78abbf248e72b764818b1bea687f3886706d5
 EBUILD pkgcheck-0.5.4.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
-EBUILD pkgcheck-9999.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
+EBUILD pkgcheck-9999.ebuild 1247 BLAKE2B 8da15077358e5e18dc8caf985d2e9930a7324512c82f52053cb4926789562d0624d7b393bd16fcb9d32e758b5f4b3573c98e070f2a2b3d5b369f84da00e5335b SHA512 8209da6dbc589c4e4be06678388cb9050fe00046381eb7d606a00249e17c6e549cd8347677216bce762c8092e769404dc04cc98937463b18b805e70befff5788
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 6a4fce0ea524..2b1a33742b3b 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -26,19 +26,14 @@ if [[ ${PV} == *9999 ]]; then
 		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.7.2[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.5[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
 fi
 RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 [[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
 python_compile_all() {
 	esetup.py build_man
 }
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index bce25fde51b6..b21efa52806b 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2017.3.3.tar.gz 279677180 BLAKE2B 373276332c918a325290e9ca0fa37ac7512025e0c0ee8149c3c08321b0477a0a5263fc24dece443c471f2a96a1b147153b0952466e374acf62389e1c49a1f114 SHA512 d4e9dffa7d2abef825fdbe7ce2665e2d249b18d81f7dab5051a0a2fda7896e5df7cce16e19518225dd23205c346df8fc5c5b3cb39280886004340cba60aeacd4
 DIST pycharm-community-2017.3.4.tar.gz 279847033 BLAKE2B 451540aae6434f39a94a664d4aa8747071c9c045793a7d445bf1acf4c0412309448b9e05b01c7e86d5b6915d144cb5175956981597d24064b2a7f934bd043bf3 SHA512 0478ca55a0dbd45b54c3d1af45a6cfdc562f0a863e3fe09922421ed121e22f5182c71fbc05b0e9fe7a8e92b197f6ad473da34b30b867297690d7bd9df5fda730
-DIST pycharm-community-2018.1.1.tar.gz 264905980 BLAKE2B d769c1038eb08ce50c93091a435138e30f0b1ff725c59a59e8bcf0c14825b46448856240841f017a24b1c32e501f1282c77716a59ef7841c87fa48d322f16d03 SHA512 c5b9b14b4ef887a242c018f1eab445d756ca96a894f193493c24819e36bc86a734b3a8bf8d540dce5b915a0157fd56acb1f1755bfe0846da218cf3c7f1a2b28b
-DIST pycharm-community-2018.1.tar.gz 264891672 BLAKE2B 4fc85276f1e214ac4f03c11593dfa4e9d50bdca043192816c5bd4f768df436c83ec723683315e8b3558a7129542e371c47945e531d977567e8d87f78b412add4 SHA512 41090a3973a19a53440b68625a1dd448e5c92b07813ab8497478867a06d0b847668db2e9bb179caa967fdaac914073a43fa6db5ec371cc17c491f9614a2ce600
-EBUILD pycharm-community-2017.3.3.ebuild 1046 BLAKE2B 91c20e6afe384e069c14f4650d2c8082a9994c55db770fb21b1ff5490da06a6c342ab4ab537c090689e76ba0e4d697a0cbf349e6fe6b2105fb5d197ccd5bd566 SHA512 44adaaf25bbde27c7170dc818bc7a8b93c597fa0d84b7edc48f53209771467afe1b3c73be60f3b118a2a10e434b790502cd837633efa3c4c5fef466094d2c06c
+DIST pycharm-community-2018.1.4.tar.gz 271284732 BLAKE2B 806fb3774f08cd94ea525a3e3a6de3b1a17f1340e093e897ab185b7e08a4f389b627b5f3b5233421ef6c1468f36ec205bfaac73f3b8f151f57c23f0ce44ad3ea SHA512 00040aa0f6d6cc60837277c1413b155b82ec580c6619d425aeb8c50521c11c17654549901a3c324d335d8818120e1e9e730ec03a03722058aa1064685e17cbce
 EBUILD pycharm-community-2017.3.4.ebuild 1046 BLAKE2B 91c20e6afe384e069c14f4650d2c8082a9994c55db770fb21b1ff5490da06a6c342ab4ab537c090689e76ba0e4d697a0cbf349e6fe6b2105fb5d197ccd5bd566 SHA512 44adaaf25bbde27c7170dc818bc7a8b93c597fa0d84b7edc48f53209771467afe1b3c73be60f3b118a2a10e434b790502cd837633efa3c4c5fef466094d2c06c
-EBUILD pycharm-community-2018.1.1.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
-EBUILD pycharm-community-2018.1.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
+EBUILD pycharm-community-2018.1.4.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
deleted file mode 100644
index 5afd45d5ad93..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild
index 4cba69da5984..c37c85ebc8eb 100644
--- a/dev-util/pycharm-community/pycharm-community-2018.1.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild
@@ -13,7 +13,8 @@ LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=virtual/jre-1.8"
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
 
 RESTRICT="mirror strip"
 
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
deleted file mode 100644
index 4cba69da5984..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 95ade0e271bc..1aa33e02d632 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2017.3.3.tar.gz 356063034 BLAKE2B afe45081582983c05590602ed10b66ee687bd3ef4995bb0ae0404dddefe795ff8e93af2ac384ffa37600f2eebc882fa1bc6de8b6831341957ea69bda4e4632c3 SHA512 1e6d9fc1de13ecea5f4a2cf5bd9f2d7116a40802c24cf21ac731183d4b20aab480e34e039f1ca2fa36b4d873c85204febea975392d73da5a32f239037c7bd59e
 DIST pycharm-professional-2017.3.4.tar.gz 356283723 BLAKE2B 3d2abed57f0459e49034a6b081c69008628ec8a16322ce90e15e0a42c670554ea4eca66b73279ea0f9aeac116dc86e8d52590861d712ccdf93d2be31c2d1211e SHA512 8adc3c46b50c4ed895d0d40b0c235a047fcac7e4ab5262aa88ba69deffa9402b652bc69ec1ee3d7682900698d14bb2ecb7f82a89f998979c009fcadb98ef4517
-DIST pycharm-professional-2018.1.1.tar.gz 343686899 BLAKE2B ac177856ea754bb30561d117925363b9f0dd435187500814e0879ff02c4410280ec6c1a19082e10ec02aff0c0779c7c39b8d95f5ba52631b82378c686bc9d6e9 SHA512 1fc149ac269ace8cdf2fd1154ec9603d740271f867c1934d2fe80bd13f903abdcc23c1b1190cebf8fc83ebbe10c5ba1f4c71d309f528d911ea499cdb1a1f4a5c
-DIST pycharm-professional-2018.1.tar.gz 343431274 BLAKE2B b88ccc821a2e7d35bc2d19582c69493f23bd766c338c2b2964cc0c4993d308783245daf9d6a09fae5206c0d0eee7e1048fb265968b51f614ca4dc9c55c58a2c7 SHA512 a32069fd846e328caa1c0acae3821f73ce98f5268ad934e276adca5ff39371b017f2ce1246e808692fdce8d174f8191fd7c12ef893d0976262059df25e58f3c6
-EBUILD pycharm-professional-2017.3.3.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
+DIST pycharm-professional-2018.1.4.tar.gz 348483306 BLAKE2B d03950a8d91c726f175c51fe512fdedef32a26fc39881ff4651ff09f277e9b7b3c053754e391c760856507b64b0a57128092a9fef5b7d2ab5fbfaac47f3216d2 SHA512 e45623fc0127a5f919015937853a4364344b01f586d5a63cf3605f0eac773228f02326c0714e2c25eb490431716f2b794e191aa01149a07ab87c067f1ff3ce3b
 EBUILD pycharm-professional-2017.3.4.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
-EBUILD pycharm-professional-2018.1.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
-EBUILD pycharm-professional-2018.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
+EBUILD pycharm-professional-2018.1.4.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
deleted file mode 100644
index 71fdc968f972..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild
index 5dc7e67e051f..5dc7e67e051f 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2018.1.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
deleted file mode 100644
index 5dc7e67e051f..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
index b356f5c3d4a1..6094ad80bb9a 100644
--- a/dev-util/reswrap/Manifest
+++ b/dev-util/reswrap/Manifest
@@ -1,5 +1,3 @@
-DIST fox-1.4.12.tar.gz 3922769 BLAKE2B 6a38a79d821928d5ec860f9684e998581b9a03855245c860b6d05014c1a7ad6d0399aa3e128151c402e720fbf16c5538a429c4c20b90edf49f281bd1b10d3ff6 SHA512 aa2accc25fc740c4959dec5ebb87b86afb035e65636986a220e3d43582da3aabaa2ee8ce9acc2c043fb530c12fc0f0806c06ff75155afc47e7dc783bef44d8f7
 DIST fox-1.6.40.tar.gz 4353981 BLAKE2B f024341d12a9ab0e69284513e0500a0448a66f112a656cfbaa700720a4823f8a13fa81752ed90b843eb27f72bd948ea3fd7ab106e9fb57fc43c728aefcfc88f5 SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b
-EBUILD reswrap-3.2.0.ebuild 595 BLAKE2B 79f49c63d55bdd4adb9cbac9c14d104f660c14065c87c19a64080afbf6ccaf81b39db903fd487d02f1d0b53565a366287cf11706f9ee33bd52ade724de93fb8f SHA512 80dacf4b971136d3015ecb4478887a13d548981ac6c9a01807138d26bb22718fc97931ca148d5ac182da3866dd35cf3a2f620fae0472feb42526c0d63a6d0977
 EBUILD reswrap-4.0.0.ebuild 592 BLAKE2B 464b2ad09bfb917f5b86d6c88331c6b50e332c45e30698b44b7eaa35596a56deba85bcb32a068bc2add3fc2e4829d44e585458a72c6172366ca9035750d6b322 SHA512 c8c18bad64210a5e94deb89421737683d442b55780a3ac29aa6beed25601f70298d58790a287e6cfd6f35443441c6c3178656f653a247fc54f4322fdc4dfe4dc
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/reswrap/reswrap-3.2.0.ebuild b/dev-util/reswrap/reswrap-3.2.0.ebuild
deleted file mode 100644
index aad5b12ff0f3..000000000000
--- a/dev-util/reswrap/reswrap-3.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-FOX_COMPONENT="utils"
-FOX_PV="1.4.12"
-
-inherit fox
-
-DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-
-FOXCONF="--disable-bz2lib \
-	--disable-cups \
-	--disable-jpeg \
-	--without-opengl \
-	--disable-png \
-	--without-shape \
-	--disable-tiff \
-	--without-x \
-	--without-xcursor \
-	--without-xrandr \
-	--without-xshm \
-	--without-xft \
-	--disable-zlib"
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 77394d1034ed..8a8d5463d2aa 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,9 +1,7 @@
 AUX schroot-1.6.10-cmake-add-additional-regex-tests.patch 2283 BLAKE2B bbdf631d09fa45c0befdc31c33b821fc5cfb1cc282bee28913a3fb7cc7f48908199e2c16793b3611c0c1287979f78b0d90c03fc1baa22e221d2a57ecb828eb81 SHA512 e68698dbace2e79c9e89525f22314fb75a42568cbeeac570334956b14051ed8dddbdffb3bdd769f77a6609159377a64df7de5041aff7512d100bbdd72aa6d4c0
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
-DIST schroot_1.6.10-1.debian.tar.xz 27108 BLAKE2B ee4f35767975f2713053c6aae9c1ccb472ef541a3a6d9c335a8a8cd923dc90b78eb45bf1fa1ece590cee94e0d629e0365cc592ec8e966bbdd7f0c4414f55b80b SHA512 2b989054485f397c7de4f9d5e625f2bb2d4738ecb087ff83903a247696a2c98dea611e9743d4ae6bee401b122c21aac4f5e220b5e544f9968f94d6f326fadfa6
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10-r3.ebuild 2930 BLAKE2B 2d5d19a149d394f3a773189d0464ea9f7446b1668957559f71403fe0178b03cb9bcf026eb9ee41d093a9fddba8316bc0f2a9a5129899d3d8a9470603e89e6171 SHA512 cbec9893b42377c72674632b4bc4774c4def3ee0834d863c82ea27435822805b5d52c07f845bf27946377f23e3f79471321ad2258c61fb932ea8d24ae493157f
-EBUILD schroot-1.6.10-r4.ebuild 3762 BLAKE2B fd4c3cde279d5a40278a4de2ebb5facbd5c4f5a58d95056331c91705ed07b57d7079ae18679c812c55df4f5c9c1302c1c85bab730633e43ebcfa26db401858e8 SHA512 0bf878ab01c421189efcada441fac7aa815f9e729e080355fac5f5bbb35f939b4452bbea09c933583758b3206264c51d9a67d53e616e27785b357ec7654ea408
+EBUILD schroot-1.6.10-r4.ebuild 3759 BLAKE2B f389b68a46ca5edb2054ecaff03d28873d689b3d6f8a8a0cce45e65a5be7cec4e78fc5346c2e4f33572d41b0b6934fb607a201bc294a47ba595211c062c171b9 SHA512 a9dd8c9c35e5d64bc0e686cfedce9295cd24589758d966dd15b9046f588973822c4f97c2cb288f9e98654e6167c4786109d7c859e47c3836d6286d35c4d1401a
 MISC metadata.xml 451 BLAKE2B c37cf286c387974fb9d4d9145724da0340d8846ee772548915fbfc24530567b7fda09fdb845a6918ff70e55c6d33621d586da51a8ed222de820035a1eea71eb1 SHA512 372b1bc77d13fde4eff8f5e45bab2a3c75152d05c7fbc272e5bb119e2edf9f8931acb426ca06b413cbcd7b4476424fdbc9eec49b865dd9cd2990bed88201d40a
diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild
deleted file mode 100644
index 003cb75a0647..000000000000
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils pam versionator bash-completion-r1
-
-MY_P=${PN}_${PV}
-DEB_REL=1
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
-	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.42.0
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/groff
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? (
-		>=app-text/po4a-0.40
-		sys-devel/gettext
-	)
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.10-cmake-add-additional-regex-tests.patch"
-)
-
-src_unpack() {
-	unpack ${MY_P}.orig.tar.xz
-	cd "${S}"
-	unpack ${MY_P}-${DEB_REL}.debian.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
-	sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use btrfs btrfs-snapshot)
-		$(cmake-utils_use dchroot dchroot)
-		$(cmake-utils_use dchroot dchroot-dsa)
-		$(cmake-utils_use debug debug)
-		$(cmake-utils_use doc doxygen)
-		$(cmake-utils_use lvm lvm-snapshot)
-		$(cmake-utils_use nls nls)
-		$(cmake-utils_use pam pam)
-		$(cmake-utils_use test test)
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-	)
-	if ! use nls; then
-		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usev doc)
-}
-
-src_test() {
-	if [[ $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are not root"
-		return 0
-	fi
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newdoc debian/schroot.NEWS NEWS.debian
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml "${BUILD_DIR}"/doc/sbuild/html/*
-		docinto html/schroot
-		dohtml "${BUILD_DIR}"/doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
-		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
-		elog "upgrade information."
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 280d789e5202..432388f071b4 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit cmake-utils eutils pam versionator bash-completion-r1
 
@@ -9,13 +9,13 @@ MY_P=${PN}_${PV}
 DEB_REL=2
 
 DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
+HOMEPAGE="https://packages.debian.org/source/sid/schroot"
 SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
 	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="
diff --git a/dev-util/sel/Manifest b/dev-util/sel/Manifest
index a931632c867a..1735151dff2c 100644
--- a/dev-util/sel/Manifest
+++ b/dev-util/sel/Manifest
@@ -1,5 +1,3 @@
 DIST sel-0.08.4.tar.gz 22188 BLAKE2B ff965c1e6296482d14e09109932165524f666486d37239edc2c30f268080750de2b20e40fe5dfc65eeb1c52009db139e2b7a47c9f8011b70eb5ae561466c19a3 SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52
-EBUILD sel-0.08.4-r1.ebuild 724 BLAKE2B 50930e9e18dfaede634eac8266a93d018f8fcc367ed90dd1ec29a8169ab2123fdbcf0ce4bc2c3e2544ef13f514ce815c60c987c09ce78761acbba028a98b0c0a SHA512 9978eed79f8494738b544c1fa2e122e532a62151db28cf30b6de726db970a88f86897d04bd1f68ea51062042835e28277a42551d1662f85955bb54148465c285
-EBUILD sel-0.08.4-r2.ebuild 716 BLAKE2B 79df43f934e424ca4e229d33edc650ce0255e854d307f7d6e364ff6d1b5a14390073afbdd9af75572d0543dfb945ff86229d6ada0733f9ed1ba3287fa41b8d4e SHA512 8f693c3bbac5c520fa817af1558de234014ba2ec1f0f2b2baf02288964d44f6b6b25ec80381d560b640f013d9c98ddfba3901d1304c304a93b1def71e54093f7
-EBUILD sel-0.08.4.ebuild 848 BLAKE2B 149631b23e51f873a73576a89e9200b1b1119e60964b34c52c3e16845854e0cb21262c810177e78db8307d0bd49e08492018c5330ca8e3cb3288f4d9d41d1e72 SHA512 cc97b987328b3e661b1e5b2c608d154f00fb01b06689f03df3847fbb21b52c6202372e03dd9a2a9dac4ff82f6cb3efd0e81ab5b7dfda330a184282a3b0782232
+EBUILD sel-0.08.4-r2.ebuild 715 BLAKE2B 41e13a713d79512edc37c48b1d105a8a0a81a2cf6de07104dc4e0f4d368ebd741450b691dbf086af5a8fc191a2f5d9435e99a3709fc207cf418a0269e6dd59a3 SHA512 00b466c888d325f1168ad94d9e85ba96aeeba29045fd5545af56a5e42a9b9c54cdae3bab980e61492cd0858be5c0fcca9d856540e5930fbd1ee055e8635ad0b8
 MISC metadata.xml 357 BLAKE2B 350bd3f9b854f7cceb8d9281c73891ef21077ae5e15a51c4a93bc96ac438bde4d687bdbdfaa15b4e8e227c023ac6dc2b560c31033501b9d4b6f7690853fe54dc SHA512 3d3239c312742d66faf8633c15e799b93c48e42c23dc555e7de2df2d773f5b5383a37208f6f11eb37db18d0c9a51cfa3504c5ffb5122a9e62e14192a6e051bfe
diff --git a/dev-util/sel/sel-0.08.4-r1.ebuild b/dev-util/sel/sel-0.08.4-r1.ebuild
deleted file mode 100644
index 2faa3e43c54f..000000000000
--- a/dev-util/sel/sel-0.08.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="A filemanager for shell scripts"
-SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
-HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.1"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	sed -i -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
-		sel.c || die 'sed failed'
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="-lncurses"
-}
-
-src_install () {
-	dobin sel
-	doman sel.1
-	insinto /usr/share/sel
-	doins help.txt
-	dodoc README.GER
-}
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
index ed76a82daa42..62715868b15a 100644
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ b/dev-util/sel/sel-0.08.4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~s390 sparc x86"
+KEYWORDS="amd64 ppc s390 sparc x86"
 
 RDEPEND="sys-libs/ncurses:0="
 
diff --git a/dev-util/sel/sel-0.08.4.ebuild b/dev-util/sel/sel-0.08.4.ebuild
deleted file mode 100644
index 631244e988a5..000000000000
--- a/dev-util/sel/sel-0.08.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="A filemanager for shell scripts"
-SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz"
-HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.1"
-DEPEND="${RDEPEND}"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \
-		sel.c || die 'sed failed'
-}
-
-doecho() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	doecho $(tc-getCC) -o ${PN} \
-		${CFLAGS} ${LDFLAGS} \
-		${PN}.c -lncurses \
-		|| die "build failed"
-}
-
-src_install () {
-	dobin sel || die
-	doman sel.1 || die
-	insinto /usr/share/sel
-	doins help.txt || die
-	dodoc README.GER || die
-}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 0d55a99a0a45..fd3b730576ec 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,13 +1,5 @@
-DIST shards-0.6.1.tar.gz 26505 BLAKE2B 2d2f2e6b78c2736b8f42719a005b32e86702351e13b0115473b65f3fd568771d81ce3709f82cad13cb15f9aad5743b4245175d4f12b18a37ae6a963ccedc99e4 SHA512 fc1e32cf459a5c448ef780601b9515cd331fc40d3f6f0666e71e218a62e202e0d4f642f5e82660529d24145a5ed5f5cbf2fdc6fc251421850d9c7ac1ebcf4d07
-DIST shards-0.6.2.tar.gz 26589 BLAKE2B aa0c90c1acac8cbfed4c909007e2ef3abd168a315b8b94a0c807c5ebbd67869ca3080d742b34816ade883971f9e0a3cab292a4aa28fa3be445cadc6b2298e304 SHA512 baeebe496ea52c93313e9a550a8f1dda225674ca49e9e2b2660b059a8e7cd6a148085d33d5c70a46d2d4c7db9260f841a634c079cc590576a6d98c9308fb1100
-DIST shards-0.6.3.tar.gz 26826 BLAKE2B 846e591159f10e418a464ced9078ef21dc8ae11c4ea2fccf619ce7a2ea38a7fff52f1c2be59a3c29e10d0d579fb589963865ec0c62e6fb546f21cb6ddc2668bc SHA512 c9ef7f41dc1feb223fbaa22bc60546a6152eae44ecead6afc3ca5ed68ffb8640444efdf7817dc77f6507200993b6213293e24e006ebb483e804342b877d81c78
-DIST shards-0.6.4.tar.gz 26916 BLAKE2B d8ea6dd7796964220ff24d413a8e3af5379b52a4ad857537c2f9147ff16b1d389e07af3402a2b4d3e15b07021d6087ec9b76dc18f2de12e4585e9b896974bb0b SHA512 56475ab8287f469ec0b97d9ad7fcc36e75da8a4cd3fbddadfaf0156b6b0ede25331634bb3b41fa3e4b3c46adcd881838fe56c56de6e5bbf30d03e3106458e820
-DIST shards-0.7.1.tar.gz 29722 BLAKE2B 60b09254aa9ba6fae558665b669571038f5a841394e9d6fb54d0c6e7d8447d028c5bd66c849cd8dde902579f17a718aae2c718bb4057144c8d7851f30a90e024 SHA512 9371df40a5c5f0f809c5febcbdede6c743e2a0f1898d648ecb8c2be69ed746bdb879eb3653cd2c7aacd43148ac8536c401b119fcf63039b866e284e8003e73ee
 DIST shards-0.7.2.tar.gz 30398 BLAKE2B bf89f978cf9d4687902a8de4222f2c2121a52574c7f1ce46130a97c5770889693efc5d3fcc35208d6b1f23930f83fb98ba8f10391920ff0418c6d28eb810d6a8 SHA512 a99648ae292095278578e47971b556a0da90743db62689a76aae9eab986ad2185ad7adc13c4340f12fce835c5383d8aac93e35258d01fa658e521314eafaf942
-EBUILD shards-0.6.1.ebuild 472 BLAKE2B aad020d221a1b1dd1744c655afe01346ee75f6418356fb61540073428bc8e75ac5fd1ada12f7f686ee411d841c0d0b52a71f83ee4d5762da8a9575840e66aa3c SHA512 22b05fcebaca1a1c0d4cbf599a38da15d9c608472ded6dbdb7b4350373a075e93c77426f5444af83a32c6d4572f8a0b4dbd2bcb9955060ca656c09e9fbcc86d4
-EBUILD shards-0.6.2.ebuild 476 BLAKE2B 656439ab358a95235afbe52ca4eaf91bd8010e41ce371dc7fcf3d8915fae5b8801e30f9dc31ec8fea386749d021a5c7dbc4359d5ae54af70552dc05e3a3204ed SHA512 a64966d302b3b49b18658cbe7a8498d6a1840d1306784860327a688fd4ddebfa9509bebf28d3f12b308b6354157b01ed7c4e97da757a42bd8a63739cae507970
-EBUILD shards-0.6.3.ebuild 476 BLAKE2B 656439ab358a95235afbe52ca4eaf91bd8010e41ce371dc7fcf3d8915fae5b8801e30f9dc31ec8fea386749d021a5c7dbc4359d5ae54af70552dc05e3a3204ed SHA512 a64966d302b3b49b18658cbe7a8498d6a1840d1306784860327a688fd4ddebfa9509bebf28d3f12b308b6354157b01ed7c4e97da757a42bd8a63739cae507970
-EBUILD shards-0.6.4.ebuild 476 BLAKE2B 656439ab358a95235afbe52ca4eaf91bd8010e41ce371dc7fcf3d8915fae5b8801e30f9dc31ec8fea386749d021a5c7dbc4359d5ae54af70552dc05e3a3204ed SHA512 a64966d302b3b49b18658cbe7a8498d6a1840d1306784860327a688fd4ddebfa9509bebf28d3f12b308b6354157b01ed7c4e97da757a42bd8a63739cae507970
-EBUILD shards-0.7.1.ebuild 518 BLAKE2B c47273f3f735198a11d6d6342ccf67fc823e90e2c9a3ba79752b0a1ac5afc23625791ebcd3f32f6180dd39ebaea76a720f5e9bd2cf5fd122730f1da8ad785912 SHA512 0a65554b57b4e7b95f339bcd3c4eb2757a71db034e9224947f16037439c710a4584ed9c42201baaa9d2bc13cf268bc7e6347b28d055a64f07390792bbc1e7201
+DIST shards-0.8.0.tar.gz 30813 BLAKE2B 1a5ce7d2cea896dd8576ab5a6387138627140a0e40ec85ad0c77cf6f6187c34bdc69d7e7403779dcbbad36f2d28b8d3942f5c917919e80ce557e946e9ef26eab SHA512 c366dec216676975cadfd8210a89c407ddc6335859b323736da8e950cf70b78456b3802d2b65d1f6d71a196946a06264b97f60bdc057b6f376e191559a78584d
 EBUILD shards-0.7.2.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
+EBUILD shards-0.8.0.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
 MISC metadata.xml 429 BLAKE2B 4c4fe0bb93f3fbcbdbdac215ed36c90a1c3706409f62e4d1d5398976bdb2bb15a178c050f616b908c2cfe87ca0b3b63697620c3ad3ba95e0f836048263ccaf41 SHA512 c5ef30550acdb2b7e8d3179e42db4f0c3c7b7ab6cc5475992c21b6b8c79ac7949cccc2070c278a04c13c62fac2e63c34a39d8c607809731567927ed306905e95
diff --git a/dev-util/shards/shards-0.6.1.ebuild b/dev-util/shards/shards-0.6.1.ebuild
deleted file mode 100644
index 313c82834ab9..000000000000
--- a/dev-util/shards/shards-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/ysbaddaden/shards"
-SRC_URI="https://github.com/ysbaddaden/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.6.2.ebuild b/dev-util/shards/shards-0.6.2.ebuild
deleted file mode 100644
index 6a29317bdb13..000000000000
--- a/dev-util/shards/shards-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.6.3.ebuild b/dev-util/shards/shards-0.6.3.ebuild
deleted file mode 100644
index 6a29317bdb13..000000000000
--- a/dev-util/shards/shards-0.6.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.6.4.ebuild b/dev-util/shards/shards-0.6.4.ebuild
deleted file mode 100644
index 6a29317bdb13..000000000000
--- a/dev-util/shards/shards-0.6.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.7.1.ebuild b/dev-util/shards/shards-0.8.0.ebuild
index 38b42f417a5c..43d89d4cedbf 100644
--- a/dev-util/shards/shards-0.7.1.ebuild
+++ b/dev-util/shards/shards-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index b2f37051c851..58d4b78d8056 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,5 +1,7 @@
 DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b311e3701301da1df02add4c6f7446d275a1b132d6d7e1da0e4eb49205138fffce8d8cb0a2b91045f72cc7f006ca99 SHA512 b053a7f581d73f1e5be51046f2fd77f6e7452acecf841321ef363156a5f72d98c13a723885d1888ab366550625e05396ca207925539fec1d70a00212af920ca5
 DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
+DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
+EBUILD shellcheck-0.5.0.ebuild 911 BLAKE2B 6ae6f5c785950da968eb253db682789f44ba50f62c578226af0526f209a67c22f1ee8b8be027c684437ebaaef3b7bc4d1fed5e10a82c075015c105276c1227ce SHA512 69fc399a74442149185b6f7612f6ddd4cb78dca576cb8d579dce7fdda4f79589a2cab9d2382e42078e57f9c852f86078d9d2753b96cc2fdd36137d0d3fc01a8f
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.5.0.ebuild b/dev-util/shellcheck/shellcheck-0.5.0.ebuild
new file mode 100644
index 000000000000..1bd29432c618
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	>=dev-haskell/parsec-3.0:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest
deleted file mode 100644
index 08faefd3de46..000000000000
--- a/dev-util/valkyrie/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX valkyrie-2.0.0-gcc47.patch 963 BLAKE2B f59186ccad8e4b568fad06bc63f735d87ac67e5ebf9cb2fd47cfc7080ff845c6dc85d72c997f6a00ed24ffbb20b78feb0bf2884e64197add2df9b6b5add8015c SHA512 fac2ad08f7726ce448568e6d6f705e85140d2e4846ff150e7b7a3b2a64bc328fd885e17d62c2a5fac70049bb946e3013471bde35cf2e76b0a55155fc50cf5362
-AUX valkyrie-2.0.0-prefix.patch 329 BLAKE2B 20baef5d99b4c4eaf892309914e55c65aeb100973a4e16625c620760b6d9d4ddc460474d1142a47024ef4532b536ab37b169c3db81910f5c80ab59778e590f7a SHA512 67e98f5251d5d4d7831fca702eef4e639e4909af790387d018af2511e9151d4be0e827035d3f1ac6eb61b1115216943a811b32ada3cb5b45573ae089d5571ca6
-DIST valkyrie-2.0.0.tar.bz2 260690 BLAKE2B 842761f7ad2dfd135e1407d3d13bf3ae81db7f9d2fd6c362c378a65d9476fc2d955be8be56e0701e4b8ccbcd7234236b0752799d8afc46e9c46536ffef925d46 SHA512 435abb17ecad114c3e492fa193e508bad7ca61884bd09bf1bf0b8398c63151d33e571fea927b84f05bc2b647183af441da1550161a6f766db9e9a15d00cfc888
-EBUILD valkyrie-2.0.0-r1.ebuild 528 BLAKE2B 70d999d96c0d90eb63df756281ca3b855b970f1a54f9a73f509ab08560eae00d1a91a41572319f2af04e36c00be880c39e5c14c908994ca936eb0629bedff889 SHA512 855533f7deebae542b955daeb82c41fbeca984486fcc59180536e9bae58e35a500468d13836803f9dc41a280d21bd3e386f2b3ab499e86a089ee67ef9440ab84
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
deleted file mode 100644
index d2d33166a85c..000000000000
--- a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix building with gcc-4.7
-
-https://bugs.gentoo.org/show_bug.cgi?id=421867
-
-Patch written by LE GARREC Vincent <legarrec.vincent@gmail.com>
---- a/src/objects/tool_object.cpp
-+++ b/src/objects/tool_object.cpp
-@@ -50,6 +50,7 @@ stopProcess()
- #include <QKeySequence>
- #include <QString>
- #include <QStringList>
-+#include <unistd.h>              // usleep
- 
- 
- #if 1
---- a/src/utils/vk_config.cpp
-+++ b/src/utils/vk_config.cpp
-@@ -25,6 +25,8 @@
- #include "utils/vk_utils.h"
- 
- #include <pwd.h>     // getpwuid
-+#include <sys/types.h>         // getuid
-+#include <unistd.h>            // getuid
- 
- #include <QColor>
- #include <QDir>
---- a/src/utils/vk_utils.cpp
-+++ b/src/utils/vk_utils.cpp
-@@ -22,6 +22,8 @@
- #include "utils/vk_config.h"        // vkname()
- 
- #include <cstdlib>                  // exit, mkstemp, free/malloc, etc
-+#include <sys/types.h>              // getpid
-+#include <unistd.h>                 // getpid
- 
- #include <QDateTime>
- #include <QFile>
diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
deleted file mode 100644
index 2f18491e8f81..000000000000
--- a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- valkyrie-2.0.0/vk_config.pri
-+++ valkyrie-2.0.0/vk_config.pri
-@@ -14,7 +14,7 @@
- # Set a default value for PREFIX (etc) in the generated makefiles
- # Note: ignore INSTALL_ROOT: it's a qt special, can't be set from here
- isEmpty(PREFIX) {
--  PREFIX = /usr/local
-+  PREFIX = /usr
- }
- isEmpty(BINDIR) {
-   BINDIR = $$PREFIX/bin
diff --git a/dev-util/valkyrie/metadata.xml b/dev-util/valkyrie/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/dev-util/valkyrie/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild b/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
deleted file mode 100644
index 76a94a36b00f..000000000000
--- a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
-HOMEPAGE="http://www.valgrind.org/"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-util/valgrind-3.6.0
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-PATCHES=(
-	"${FILESDIR}"/${P}-prefix.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 4940726e140e..b43aed57a5fd 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,8 +1,5 @@
 AUX visualvm-r1.conf 786 BLAKE2B 863af1d373f3e8633a630c6a1cdbc8ada09b1a9b5f35704db044e12614c997e9648ae9c087caaed89c2632dde7a09a1eb3b158d4227a1e2cd94214ba25d61eef SHA512 243ab8ac4472492edf796582dea5164f53261f654168cde9ccf863e0f265ec5c50442c1c44de89ca759c8d0dee6c00c10a3f807ad45d039976ff4d91c89d8397
 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
+EBUILD visualvm-1.4.1.ebuild 1667 BLAKE2B 92813bb7a920d1f2a83af817d9fdd821be79661331c29b6c4a7f8f945c190a9dfd4a89a8cae04ae347be3fbb68bf6a8f9b02a80310780f7fea29f3522dec0fbf SHA512 b38ac4aae3d549e8f7c749436f885cc538c5844b81af6ba2adbed503ffc5ec297ffc1dec3a4f5e3c96ac7f53dd8f508e25c18e3a11f7a3b9108b05ce0d51d542
 MISC metadata.xml 452 BLAKE2B a1a04fcf6da524fc4bc9d68c415c429dbf43813e594797eaf24f6590e47dd6466d9ec5bae1909011976ab9a47cedb07bbbff29f254f60371aa50ed88a3d9a50a SHA512 cfb0070326f1fc73f96016a138bdba35b6799333a625c38c84fb486134e1446f71bcfe2f170cdbe9ff86befe66905ba79caebd68f811547ec638e69821a5a739
diff --git a/dev-util/visualvm/visualvm-1.3.9.ebuild b/dev-util/visualvm/visualvm-1.3.9.ebuild
deleted file mode 100644
index 7fe5e09f1733..000000000000
--- a/dev-util/visualvm/visualvm-1.3.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NBV=802
-NBT=02102016
-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/"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip"
-
-S=${WORKDIR}/${P}/${PN}
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	unpack ${NBZ}
-}
-
-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/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
index b29eb860b654..a33b5289f774 100644
--- a/dev-util/visualvm/visualvm-1.4.1.ebuild
+++ b/dev-util/visualvm/visualvm-1.4.1.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,34 +33,34 @@ 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
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	# unpack ${NBZ}
+	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
 }
 
 src_prepare() {
-    default
+	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
+	# 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}
+	# 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
+	# 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}
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
 
-    # makes visualvm entry
-    make_desktop_entry ${PN} VisualVM java "Development;Java;"
+	# 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 ced5774f73f6..42390ee9687a 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
-DIST vulkan-headers-0_p20180601.tar.gz 451276 BLAKE2B 7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c SHA512 a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
-EBUILD vulkan-headers-0_p20180601.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
+DIST vulkan-headers-0_pre20180601.tar.gz 454023 BLAKE2B ac1eafcf4ef84023f5f9445028b03c6e2638652d3a5b9e999b527a636fd1cd8fb6a2d23b47af71ddf3ef29210ab1d4f3bd4c13a86bec6f72174aff98c7e4828d SHA512 427f5ebb248aa0cb2e79ac2ddb5c1977d3b9bb92a4198bd562d4e89e773a8219e4c7923ca3544e4303af7f53c746fe5d754e508c9e83854f02dca7bee3c2e935
+EBUILD vulkan-headers-0_pre20180601.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_p20180601.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_pre20180601.ebuild
index d6e2cd6c4876..d6e2cd6c4876 100644
--- a/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-0_pre20180601.ebuild
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 8245a479840b..536d4fbc016c 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,5 +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
+EBUILD vulkan-tools-0_pre20180601.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f
+EBUILD vulkan-tools-9999.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f
 MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668
diff --git a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
index 38d11f8da2a8..42876e8f5904 100644
--- a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
@@ -29,7 +29,7 @@ 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}]
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 38d11f8da2a8..42876e8f5904 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -29,7 +29,7 @@ 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}]
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
commit	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree	047fc92023c520d07f13ec5ac96e094d1b312a7a /dev-util
parent	7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)