gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /dev-util
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
70 files changed, 749 insertions, 513 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0c180f642b93..7ea4a84db30a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
index 8e3e0552514a..f3c73764721e 100644
--- a/dev-util/btyacc/Manifest
+++ b/dev-util/btyacc/Manifest
@@ -1,5 +1,6 @@
-AUX btyacc-3.0-includes.patch 171 BLAKE2B 5c5679252d0ab3bcccfabef53dd5d77e5112c39337d4a9bda8113728d49c91aa0227e883f54bd46a44b2756b0db3f1e1bd47f1b79be980d16e113e3ca9efcc8d SHA512 09af4417c660653b3dbb0bfabfc82bcf9a5741165f86047328fab5a410d71e5c11b7d4018b4e62339ccc08a96b2e81a1a0200596a82e5a76bb48a2392351a689
-AUX btyacc-3.0-makefile.patch 536 BLAKE2B 24d42d2e324a5911da162fcd7ba167480dbb1bbed75f6e18ce36aa370b375804c789a5f3081298b9c4b293f04a30d6f76f278d1c8b7ddd2ecac266983a1c0c53 SHA512 55e0a54fbb38b4a2dcf95295f3b7f5dd92af767f77641551d74ab9a81197b2d9a1694f2999248b1f6d6492e109fb0c6d1c3ffce87e8dc258d5d16f18fd1adc73
+AUX btyacc-3.0-includes.patch 175 BLAKE2B a0da73e29099239e97d8fd67edf2743720fc3e97946834319c249e9bb0dd1949c70b492d3ec3fffed32d992dddc7ed2cadbf7cb2280b7cc24c26b1f00854b46f SHA512 c0ba2cf5ca3575862a6c683cf5a9461cc7008e7c8662732ef64ba68f041e810aceb8f0f1b75becc8cd910c87c60dc830e8823b15986fedf345319bedb50e3dd4
+AUX btyacc-3.0-makefile.patch 535 BLAKE2B f5c7f893dcbe98c17dc74efc6310924518447ea4d719af3dc700daea72d0106e5217d69cfb82b498a81392c8f0a447c92afcfa10954f4b7418efa76de3382dc9 SHA512 54df54a45147a7ca5c76d0c6665a46210af170671ba04762e8de80c0269b0a1aa947c1be049aa8660f8b96d4ec204e639f2a810130676d69fc54fb28c929a190
 DIST btyacc-3-0.tar.gz 74770 BLAKE2B 298d6ba020a47a8d894044c464c12efd3ed94b878cd152f4287a35fc0a8ec490186b7603909691cbf036f425fa96316c6cda8b8270b07e3c5c0cd11777d5e62b SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4
 EBUILD btyacc-3.0-r2.ebuild 914 BLAKE2B 54dcf06df457c361e1f6189bc922c7f4ca1a73ebd065ba3cb187712d2e469e8a5c575d1bba7683d5ac1c8f919c671c7f8686819da5b6866a449bc114b9d383de SHA512 402ed5b5c405b7dc1daf609fd2c34a5d2e384f37557b86d64493d523d2a16c05e015d5cc7956696abf906ac59f03fd8dbfb26171d619f5cadcfb155876212256
+EBUILD btyacc-3.0-r3.ebuild 928 BLAKE2B d3f7855ba2de20e9b8ae0990dac3faea827e83ad4defdb48a002a47c8d2a6e6d2df480ee1b36a9b4be3d7fd7ed8627e165802339324a9ac4638d5c3324d6e933 SHA512 c998dd46a55d4311dc082ba140a778da81f05070afdb6fded5d9df49f692951762016d44c4cd3fdc79bc072a4d3cbd521a87e1923c516303e78f458022c95469
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/btyacc/btyacc-3.0-r3.ebuild b/dev-util/btyacc/btyacc-3.0-r3.ebuild
new file mode 100644
index 000000000000..2de9c25574c0
--- /dev/null
+++ b/dev-util/btyacc/btyacc-3.0-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}-3-0"
+DESCRIPTION="Backtracking YACC - modified from Berkeley YACC"
+HOMEPAGE="http://www.siber.com/btyacc"
+SRC_URI="http://www.siber.com/btyacc/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-includes.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+	cp -av Makefile{,.orig} || die
+	default
+	# fix memory issue/glibc corruption
+	sed -i -e "s|len + 13|len + 14|" main.c || die "Could not fix main.c"
+	# Darwin doesn't do static binaries
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i -e 's/-static//' Makefile || die
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin btyacc
+	dodoc README README.BYACC
+	newman manpage btyacc.1
+}
diff --git a/dev-util/btyacc/files/btyacc-3.0-includes.patch b/dev-util/btyacc/files/btyacc-3.0-includes.patch
index a03f58fa3865..e415574213eb 100644
--- a/dev-util/btyacc/files/btyacc-3.0-includes.patch
+++ b/dev-util/btyacc/files/btyacc-3.0-includes.patch
@@ -1,5 +1,5 @@
---- mstring.c
-+++ mstring.c
+--- a/mstring.c
++++ b/mstring.c
 @@ -1,6 +1,7 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/dev-util/btyacc/files/btyacc-3.0-makefile.patch b/dev-util/btyacc/files/btyacc-3.0-makefile.patch
index 884b49f46b9d..60187256d1a0 100644
--- a/dev-util/btyacc/files/btyacc-3.0-makefile.patch
+++ b/dev-util/btyacc/files/btyacc-3.0-makefile.patch
@@ -1,7 +1,7 @@
 Respect CC, append to CFLAGS (but not -g), append to LDFLAGS, use system LD -jer
 
---- Makefile.orig	1999-07-15 19:40:12.000000000 +0200
-+++ Makefile	2009-09-04 15:27:15.000000000 +0200
+--- a/Makefile	1999-07-15 19:40:12.000000000 +0200
++++ b/Makefile	2009-09-04 15:27:15.000000000 +0200
 @@ -8,14 +8,13 @@
  
  HDRS	      = defs.h mstring.h
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index be1af02e5643..3a1b66a73381 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,11 +1,9 @@
 AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe
-AUX buildbot-0.9.15_p1-buildbotworkerdocker.py.patch 947 BLAKE2B d0e4e1e97ac30d63d1167c64e6505b18573abb3183b970e24dd7cbd22db06094cb7a14be97f3fd3a4ac9ef6bb6bc37050613e83ddb4bb6dd2d61e88769336069 SHA512 1b92cde0a585521d4ce33fa4cc19b9322c64e004f58a4c8570a6ce34a551d77431dd761f59ac41553968a89459c9cb5ea49212e2ce7b2838adbd51b922edee81
 AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
 AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
-AUX disable-test_userpass_wait.patch 891 BLAKE2B e88d77dc41a6b5e6e7dd925433a1fdcd459cd4baa457207f0922ff640cd12533f435ba4abc9f5ccdeee5402a28bd7171212e227f1d70250f077c37d1c3e91608 SHA512 33701567ee7cba18e05ccf55400fccfdd64e54ed1f79c8d7ebe3781999f709b47246bf01b49ea0056f4a33996c6e9818ca84f222c611a9e386291e802d4d2488
 DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556ab1c0fa1433bbe76475513a7482619b05c28038e956e8724b99a806aec371961302914567fd36caccfe342daa6aaa SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645
 DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
 DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815
diff --git a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
deleted file mode 100644
index db08d7a45dd3..000000000000
--- a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7051ebdac8c8a9054e8a37ab7dd8fb6f0ac1affb Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 15 Jan 2018 13:50:36 -0800
-Subject: [PATCH] master/buildbot/worker/docker.py: Fix test fail when docker
- is not installed
-
-This fixes numerous tracebacks (note, only partial traceback):
-
-  File "/usr/lib64/python3.6/site-packages/buildbot/worker/docker.py", line 259, in _thd_start_instance
-    if docker_py_version >= 2.2:
-builtins.NameError: name 'docker_py_version' is not defined
-
-With this patch, the tests pass.
----
- master/buildbot/worker/docker.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/buildbot/worker/docker.py b/master/buildbot/worker/docker.py
-index 62e30785f..e558d69ff 100644
---- a/buildbot/worker/docker.py
-+++ b/buildbot/worker/docker.py
-@@ -41,6 +41,7 @@ try:
- except ImportError:
-     docker = None
-     client = None
-+    docker_py_version = 0.0
- 
- 
- def _handle_stream_line(line):
--- 
-2.15.1
-
diff --git a/dev-util/buildbot/files/disable-test_userpass_wait.patch b/dev-util/buildbot/files/disable-test_userpass_wait.patch
deleted file mode 100644
index e7b9d0a59e36..000000000000
--- a/dev-util/buildbot/files/disable-test_userpass_wait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e24640e1043fe8914a2b86842645604a3d9e9698 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <brian.dolbec@sony.com>
-Date: Tue, 13 Mar 2018 19:59:13 +0000
-Subject: [PATCH] disable test-userpass-wait
-
----
- master/buildbot/test/integration/test_try_client.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/buildbot/test/integration/test_try_client.py b/buildbot/test/integration/test_try_client.py
-index 9bdc7a63a..48fcb1573 100644
---- a/buildbot/test/integration/test_try_client.py
-+++ b/buildbot/test/integration/test_try_client.py
-@@ -142,6 +142,8 @@ class Schedulers(RunMasterBase, www.RequiresWwwMixin):
- 
-     @defer.inlineCallbacks
-     def test_userpass_wait(self):
-+        if os.environ.get("DISABLE_TEST", False):
-+            return
-         yield self.startMaster(
-             trysched.Try_Userpass('try', ['a'], 0, [('u', b'p')]))
-         yield self.runClient({
--- 
-2.13.6
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 9a4384164384..c3c592ebc929 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,7 +1,5 @@
 AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9
-DIST cdiff-0.9.8.tar.gz 34861 BLAKE2B 2b9637c924cb6d2cf436386163af35a0931a1999caa9e63b3a350aef4db32f3c4be82cb1608adb0100d3e96b0b969ae5ca7e870be0fc03055a17f7118a26931d SHA512 303126c51b4c5cfafd800da7f4ffd56655f28f8b525c7d83c7417e1e0013b2186b178697aca41af18f5397ac860cc0159d359e2b23eaa8111e8f77184dc9d4f3
 DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
-EBUILD cdiff-0.9.8.ebuild 783 BLAKE2B fc5c4f5c595940e8a36823349a7a5513fb80a59ceff26a88e34e04e7295b8a709abebb65fc068f13a82a517aa8bf0391e66791efb28457f827aceaecd6aa1c90 SHA512 ac5a69cd3dd6804219f77720d045945ed866d43815445581e39adf0d05ca294600000df3e7aadf887203b555749e3fdf6cc1bf4c6fb599049ff5db745f774a13
-EBUILD cdiff-1.0.ebuild 712 BLAKE2B b44804886c63bb5aa739199f28b9ff03f42a4a0442ef5d8a2d4539e7769a10930b50a2ce3cbdd9d9d49071ed67d5439541c18d674e9c658538b613ba36ec335d SHA512 e0157c81572d4a0d385706ea63d2cd5b79b9a1d35fe7f9ffb6763f99c22dbf51b0d182fa3ce9c0e44196cc70376377bc2552b8727fe3e9f35be1ade736f72ad2
+EBUILD cdiff-1.0.ebuild 711 BLAKE2B 7877ede0ba03803d4527dde659f5312bea4c3126c82447d36e3527a46a8cf981d86da6b1dd7a0dac880a2236af1747fc76c918c692b7e7bc92c6c10edab64d47 SHA512 5444aad617de87c0bd6234db67705f6be50f984591b259fa4f6a3d01f54c3363a4cf5a0fba860d010a8da60625d0a7fd45b09d7610a31babd16792a35f02fb7a
 EBUILD cdiff-9999.ebuild 752 BLAKE2B dab28fae8a7d15a2b630ab794b3c388fbe6caf5fc011c8f3dea1451f5f388bd19ce5692e01699dee07df1c3c2c86e31ba392c4df2d3eca95ecf8b05a881c949c SHA512 68046d783fd8421ae93bb2094a6b46728b60955ac2d1e74c89657ef7e7740785db7eb8f5ded27fe99ca229545de49ecce09dbdc62e624a5f63f66d28545ae4b2
 MISC metadata.xml 383 BLAKE2B c2fba0c9ed05af593bf10ae733401d7de8a1396c22094ba912418a796783e069243506edfa72cfb1a706f63c0bcbc5cfb0321b21a5d699a726901ccae682a32f SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f
diff --git a/dev-util/cdiff/cdiff-0.9.8.ebuild b/dev-util/cdiff/cdiff-0.9.8.ebuild
deleted file mode 100644
index a38fa1a360dd..000000000000
--- a/dev-util/cdiff/cdiff-0.9.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/cdiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
-
-DOCS=( CHANGES.rst README.rst )
-
-python_test() {
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index e30bb906a508..44e8bc31bed3 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	!<app-misc/colordiff-1.0.13-r1
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
index 5c0a1aadb7ec..62c9ae78c342 100644
--- a/dev-util/cflow/Manifest
+++ b/dev-util/cflow/Manifest
@@ -1,5 +1,5 @@
 AUX 50cflow-gentoo.el 177 BLAKE2B d43229ed9ebeea653f91ceadd84f641eff4bf1168cf6e94524c228c943ff973e2cf99216bf7be10dc766014d607f9edf1ab74230e963fbe62561c66914665b15 SHA512 1edbe2c330206fdb9ad3844a2278dc71d13a0ce7c46c73030192de3f05634fe08012c04e7c94883b1f6fde21483aba29e16f7a1466719c975e9c60d59507c5e3
 AUX cflow-1.4-info-direntry.patch 356 BLAKE2B 5edd13456dc90461927c0b2ecbb7c66987ef935e54d7d89010bdddac6193a9eee852fde601543149a3aeef1fc5e3447d43d2e076673e9ebd3b6e5bb978477008 SHA512 6bcfd0ec801b3c487d817d2fd1a0f030a1e3fccffb03f5343eb335c807fd763a8c00d8f98654ce3f8574e756a9c1d5769da71b9fb70acee0ecdace6395a3a624
-DIST cflow-1.4.tar.bz2 634862 BLAKE2B ac8d31b2af7c11bc09f440f0f044f67a538a2a2d574146216b11239097553c41d4982594cc919fc6cc3b861a9b1bf1bd200a0c1f14ee8ab437b724bf6d84c6c7 SHA512 b8f8bd0e75e9ad0ba112313c576766b7cf72ef1e29ad0b0a2ce233f43b4196e311077be2134ff6e0fa0bb18375469ca6a969307fa7565a63ab60dec20400ee03
-EBUILD cflow-1.4.ebuild 1062 BLAKE2B 7859e1bf77201114ebc9731efc12c0b406252f27bda699419f9d6569e08710d64eab4510e66d574ac5a741c929a867333579a841c6fe149ff014a00f40fdca34 SHA512 98d316fb2cef72bcf601a744604bda6bbc3bf28673d4879264993f79cb0c4468bee5ca65317d05924459f609ccb116e1745c10aa324608b7df02a2af4705de8d
+DIST cflow-1.6.tar.bz2 836405 BLAKE2B 6cfbfa9f4bb503616cb0bf465e70d9951eb52e65addff16ef2a1ee79b1a115e46ac4747510dd1edf5ec1d96c29540152a6fb2227715cef9e19acbb895f5cda2e SHA512 eb26695b479205ea391623d78ee537cac084a168a52c2bf4f2e4206d7a3f813e6e3f92684903673af905172c3b1df3f8ab1ccb7986bd61ed53feee34fb3fd7c6
+EBUILD cflow-1.6.ebuild 1044 BLAKE2B 992ad3f48621273d2d536bbe2333b47457bae8bfb302dc6f5e47a6b0e538b2778fc621aa15b1473320244f0ed4cdb46432ad10a21fa0a3bbe48743dfd0aa4a0c SHA512 f11c1c2c380a5e169084dfaec75646544149e29b4d969b1de2731ad749df389c666851904edaba93ae8954c1bd7ef067f76518b3e14755c90c0c15b1631dd02b
 MISC metadata.xml 588 BLAKE2B a5466656ce4c3a761b64b1ade2fef0363065450ddc10d590a0f52f5b8fd4df057cdc99a84c056925bdfcbabbb63ed2eb4e646d04b0adde4378adac56c290757f SHA512 cc702fd85f1e907a364f9e79e4b183bd4ff2317750bf917acbef7d326abded9c1adbd66bd21a46df7b394e9d4990c8c056c7173a4fa758217519f3def7c789a2
diff --git a/dev-util/cflow/cflow-1.4.ebuild b/dev-util/cflow/cflow-1.6.ebuild
index d34006c749eb..a7aa5e876cbf 100644
--- a/dev-util/cflow/cflow-1.4.ebuild
+++ b/dev-util/cflow/cflow-1.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit elisp-common eutils
+inherit elisp-common
 
 DESCRIPTION="C function call hierarchy analyzer"
 HOMEPAGE="https://www.gnu.org/software/cflow/"
-SRC_URI="ftp://download.gnu.org.ua/pub/release/cflow/${P}.tar.bz2"
+SRC_URI="http://ftp.gnu.org/gnu/cflow/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -16,14 +16,12 @@ IUSE="debug emacs nls"
 
 RDEPEND="emacs? ( virtual/emacs )
 	nls? ( virtual/libintl virtual/libiconv )"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
+	sys-devel/flex
 	nls? ( sys-devel/gettext )"
 
 SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-info-direntry.patch"
-}
+PATCHES=( "${FILESDIR}/cflow-1.4-info-direntry.patch" )
 
 src_configure() {
 	econf \
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 4d9ab831efd9..7f608a78b901 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,6 +1,6 @@
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
 DIST devscripts_2.18.11.tar.xz 793112 BLAKE2B 8c1d40a13f6ce1bd804d7fb1300721485aea88b3ea2ad35c59c87f8fd85057cd26b1f40ea73d1919d45b8f0765610724fd3018c05d09e287554725f4425e146c SHA512 4c6c4b0e08115accaebed89fd5362842e6b8daaf9e1725684d0af1ad8cada7bd7aadce8640b766cfdd3a5784bb32ea177019781b2f13bb5da6b55389579ff07e
-DIST devscripts_2.19.2.tar.xz 797224 BLAKE2B d72990f8ec45da693d63398be39dbafe3422360215af1682ff23415b043a76a2a3bf1ce477406dee073d29c61f428d61ca62acf78ded89335a6aa2129188f477 SHA512 61a101e468b9d6d01936e62b43cbbac2c6eb209e90f7bb6553caea81cda919a4f531293ce40652ec5015fa651661b345df0428692e13dcccebd55332c7eb65c6
+DIST devscripts_2.19.3.tar.xz 810356 BLAKE2B af3f3e44d2f206226667bf6d3a0d1275ff2cc88e890817f2982c1c47bd8cbf8ca6a75357a4fa1dd2958be9ec97b870a2ee612c478a75bb23256c8aa5bae1f2fc SHA512 c5745e7aaa7ddac1be2f1da68b6c03c35e6b2ecde824a7c951ecf0fd0132315ebf40f62013de6da51f79ed473e3462634fd4057704236f5a1abd479b734c959b
 EBUILD checkbashisms-2.18.11.ebuild 890 BLAKE2B 56e8be2ace145d6c7ef7d97a641cc2e5d51f508fe8ce015218df3e3311b6aca7de1488c4e1391ea5f267d56e970e94f3d9c6c271f13e175df0f5438268043520 SHA512 e1d82322e345aeb319842158ad409f62d6f5cc8489e6fb7079e92aab70e5d0eaa447fb89b067cc3dd4bb3b4b0ff9ec86ba377c458bd5f9f73cb9eeae39ace448
-EBUILD checkbashisms-2.19.2.ebuild 892 BLAKE2B eaa6bf69f04f49b27840c4c8ef3bdf514e62b135a628dc55a2bb76a9245d1d30327854fa1355ddb7535bfb26af1cbb9f6c1bdf5cea3acfe887d07cda3fd43ec0 SHA512 5a7247ffd1d196cce9fcd36e4279d1d052cee6edc14d259b1c3d118e7504ab4a5f7a7d1e515450c77e281d6d62327e5d4d69562268385a102b928a9489916fdb
+EBUILD checkbashisms-2.19.3.ebuild 892 BLAKE2B eaa6bf69f04f49b27840c4c8ef3bdf514e62b135a628dc55a2bb76a9245d1d30327854fa1355ddb7535bfb26af1cbb9f6c1bdf5cea3acfe887d07cda3fd43ec0 SHA512 5a7247ffd1d196cce9fcd36e4279d1d052cee6edc14d259b1c3d118e7504ab4a5f7a7d1e515450c77e281d6d62327e5d4d69562268385a102b928a9489916fdb
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
index 326e6817dffd..326e6817dffd 100644
--- a/dev-util/checkbashisms/checkbashisms-2.19.2.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index b03820a2a784..257da31cd486 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,7 +1,7 @@
 DIST cloc-1.72.tar.gz 347245 BLAKE2B 8ce6915322c6cb4682994034525b7c1e3dfa674832c24dd3d3998f3472f83739764aa61beb80ccda51147b663d4555f060b0098fbf307b81418d58ca72b4f14b SHA512 e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021
-DIST cloc-1.74.tar.gz 396192 BLAKE2B 632d2e4764a7bec9b6bb45edaac80da65f5ea23ec682c3246beb2add011fa5ac6860671b45981e9eec374872c691e66467bc0d4709b725fa53ec88efc7ce3a05 SHA512 456ff10c50673326e0b80d2e0b5965fba19c5c868e880108647d5182e048e62bdd734ce485386a561163d8dab81551101cbc5dcc13088400fe0a14ad500e1cbf
 DIST cloc-1.76.tar.gz 419678 BLAKE2B bb9ddee89a3efe6d7ea913ddf04a28e4120da82df93ef611f7b19bc9662664787b54a2b063139f8d17db3c69a27f74ff4d2c6263100d68b8d2b92c50ddd2f360 SHA512 3f16f084be1828557e4120a8e41b276336ac240c5de4dc765066277d848ce9af20f31b36ec4beb863066d8b3e9287ea0e0b2a8f1abd15532957f53d2d3935ecd
+DIST cloc-1.80.tar.gz 453965 BLAKE2B 63032d0ebff7536a4c0cb07ab7791177310b8544cd878093cc89b753997707768198ed59ff451e6de72bbdd4a9ffd3bf84b113243534c466f6a91befc4593014 SHA512 3f41a0e2bd4becbb393e24834c45d9998217443d5c6d0478be5ce4f9506bb8dcb44088ce4a2c75c06cb6af47b4432f3dc58db9009f9a350a00dd80802109117f
 EBUILD cloc-1.72.ebuild 652 BLAKE2B 0247613d5209f906c9848d8874d18662cdb103992ece7462434fa2e19a5f12a8bde97b873093eac75ef21132dfe04f5a7fd2f6c22f5893dfa1bd187c2ea85412 SHA512 804fdbb749ec15ff4e68bf4841c8888b8466fedcf88a82d8b82d8968eecde91ccc83582100a4261f9c4731fb01737e828ce3b80a707b6d9410593ea17cd03a00
-EBUILD cloc-1.74.ebuild 655 BLAKE2B b85899b7f270abe0cf86868425e038b47b91ef168d022ab2147a8ccc3b3deb87c93940cc7f0b4a7f184996b2c3651505e37a843b7193f594b780d9d8c38cf09a SHA512 23d7b861f2feecd2e9ae4dbeb7592d039787ec7fb8cb89ca22922275b1e0c46e1fa5d347a91b7d7ebfd47b1023968d593027d26d11569a39e6cbf33a6d827ea9
-EBUILD cloc-1.76-r1.ebuild 675 BLAKE2B a09be83f8551a02a7dfd802b24369b7639f26fa0e4d004a586e8402b37e2e352b3faef463ef328e37979ef0232012f2fd2e4b9057589f4984043898e36fc1aa3 SHA512 c1308b6e3c7e9469e38c10a80848f95eb7f9c802c6751e143202a82b1ae5d543fd403f82126f2bd72f7df5f45e1e5307f4a59bedd1a4587b8af20f982c3514ba
+EBUILD cloc-1.76-r1.ebuild 670 BLAKE2B 07b5b75a44cf04a48e55a58165c52489de369960c7cc41c40b8b04427d74146c7317d78c209978f4e719744d43ad56cf8f01bcdc5de234fe4785054d886a88fe SHA512 f212b6a3c49ddc5b7c5e7828f6c22a64f861313a7c18b141a8b76c832941d547ada1c3c193a34d957be4ffcbdc624818af9cfc40e8eab1a324d491dff685b8ca
+EBUILD cloc-1.80.ebuild 671 BLAKE2B c4cf393c0a33ca34659f2044521c89e7d338139c69b8673d8ae215559a6c494af3c92171dcbce1a874aade14276e3b53c5a3ed757a1239443a64df7f2596d795 SHA512 1f74029feafe432f2ebc286b8381df052ff41f3151dca37389c1432b2ef79fa817434784e916125d309ef8c482b7433cfb101a2730d3a9d54cd8ac0e7fe4ff76
 MISC metadata.xml 435 BLAKE2B 5658cf3e41d5dac9b2acab8075357492429742f12fee07bedec393e3a068d9c57464d7434e044eeacff38bc7a043ecb4b3b6d42d57c0441d27a8f645c599fe0d SHA512 c747ba0f0014099be6572197e6aa9aa520cdfd6bae63fc3e0f92b723554a56180d52e1cb40422a063f56a4003d07b3cd09337b4413471668e62d51a6deace02a
diff --git a/dev-util/cloc/cloc-1.76-r1.ebuild b/dev-util/cloc/cloc-1.76-r1.ebuild
index 70dda680961e..157bd9ba48e2 100644
--- a/dev-util/cloc/cloc-1.76-r1.ebuild
+++ b/dev-util/cloc/cloc-1.76-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
diff --git a/dev-util/cloc/cloc-1.74.ebuild b/dev-util/cloc/cloc-1.80.ebuild
index d227ea30905b..19fd2288e575 100644
--- a/dev-util/cloc/cloc-1.74.ebuild
+++ b/dev-util/cloc/cloc-1.80.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Count Lines of Code"
 HOMEPAGE="https://github.com/AlDanial/cloc"
@@ -9,16 +9,17 @@ SRC_URI="https://github.com/AlDanial/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	dev-perl/Algorithm-Diff
+	dev-perl/Parallel-ForkManager
 	dev-perl/Regexp-Common
 	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
 	virtual/perl-File-Spec
-	virtual/perl-File-Temp"
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long"
 
 src_compile() {
 	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 729497e7a44a..bf7639576c3e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,7 +9,7 @@ AUX cmake-3.11.4-libuv-1.21.patch 1333 BLAKE2B 685edbc90e59ddf3f5d430d50edba0407
 AUX cmake-3.13.4-prefix-dirs.patch 4239 BLAKE2B 470de3626a9f6edf65e5ec597b1de36697e6c2038ec5f435dd5a89ec69ac32227663f0eb5f86c9d5d89a1c809e1092b5e901c52dcab9f2a7d3bc8f7bdca110a7 SHA512 b1801d0f0ec8963181460a8b939a26e791295d6a45fb78135dce5684507689cb44cab7a536d5f85c26f51deda19e95b40500aba026f43920fa7eee686ad3869c
 AUX cmake-3.14.0_rc1-FindBLAS.patch 1247 BLAKE2B ca3b9e1515569b1dcf4692480233aa149c4846f0767c872a25ab0f9fe411ab09348b441f17319abf1c06fd3275e3db7d8bb8f25eba83bab7fb800fff115d06a0 SHA512 425dffe59dc7ec6383579d2ad5bb7a7607e4446804ceb6c698c34ad4615fffd552051dbe6ab21450fa769cb7b25a0184ce9204841e2ab98a738b786c93bb90ae
 AUX cmake-3.14.0_rc1-FindLAPACK.patch 1798 BLAKE2B f372fd920abaf85ab3106385d45e193c2c0fba1ca9fb5c14cf53bdee9a29602b7db0078676c90f65f3f3eccddfbb1f6b9964d26f90aef38cbc0c197a4b243ac5 SHA512 dcc970561f54d862f2124512bfc28ab25e66b1fa5e6a7a6138faae7f1e3a4136320ad4d4942153ac9505035b74f3e8442dddb62af6fb1486fcfec08fcf3e3743
-AUX cmake-3.14.0_rc2-prefix-dirs.patch 4609 BLAKE2B f90da7c47e2539047ab9c27c4e62f53634541690db171bf4f92e4e8b122d1ee1d856babf4b6e3650f892fb430a0a7f7cbdedf3d01fbdacd7c9d4a2f60d21a181 SHA512 bc47ac442f09f8717db3123bdc176bc9c4c53c54dca2d34f86032576c7f43ceaf8431c64629110003cce9531b31241060399a2455c93e58367193e7e376c0907
+AUX cmake-3.14.0_rc3-prefix-dirs.patch 4688 BLAKE2B ec197f40246ff9b47f6515cec92f0ef497de2e96756cd7c12ea3fe7c71d5e2220c637210f663194c63e72924d89dbce7afe92fed01bca8947bdd76af6f5365b0 SHA512 9da6be335e5615b2e14fdcccbadd50a0e2df6e19476818358216501b657350c73fa6bdc1dcaedec1fa50e3e18e39544e2d2815d6f54dd5b4aa5860bdf35e8d52
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.8.0_rc2-FindBoost-python.patch 6575 BLAKE2B 4a169862e81b053ea8077ed61001434ba2619230ab4a4d75a11e2ea2c18ad704792d6d37a3cfa78cb54a6bf6cd71bc9b0d6a7a1bba004a92212746001874f385 SHA512 bb156cc2b47f9928f2e6bae909e90866f4442e42d7357744aa2b00903a02a27cf8af4a788a74858bc51874c442c40788717c86e77690b91def80abaa38b90163
@@ -21,12 +21,12 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc2.tar.gz 8846165 BLAKE2B 8b36ec26167e4bd83f0bf9b58a4ca2f0f9ee9994eeb3593279a03faae03c2fe6097fb0a7b6e8a83902afd5833c3f7bbd7602e78f052fb5c5d75f5b7a4db8aafe SHA512 941d6c562e620dcabd7d821a0eb96c05674d877c196a68cc9cb870a21de7c486f7ce848722892d9764c3826b7276f7fbe7afc36e3b8f784fccff2a8feda9de30
+DIST cmake-3.14.0-rc3.tar.gz 8845905 BLAKE2B 496f478586b8db220364079e5e96cc27dc703879a9f28cc425047bcf6b62d09bda1077cdca5759793995d84258448ce2195cce6b41c0ad2ca401eeb5b20590d0 SHA512 2a783a21428c2e86ff081e35c0a3737b4594904cf560a14b84de11da9d85bd7ad0e1c03a2acbcd26c1e84cbbfbf6b5b273987f0196a121bfdbb94bbfcabd13ca
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
 EBUILD cmake-3.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
 EBUILD cmake-3.13.4.ebuild 6207 BLAKE2B a2a7aaac70aa184f7da025954664f2a6a688a6f90bedbce965187953c3b8fedf984dcc7bf467171170857f1d1e6d350fb3a5dff2a53c90904ba262bb0c38ec6f SHA512 748e7e64d4a3dd96afe5ffe2981a79e5d4f380559fc9ef48a232360989a5cb01bde48aa014888a176042474c9d53c0eab9bd35adb03c04e28bfc990736de86b8
-EBUILD cmake-3.14.0_rc2.ebuild 6268 BLAKE2B bd2c0fdbb4b73c132e52a0d049653d98293be703c72e940bfbb8836393a2b8854451b15e14f8aa4450953b80e808a287346a42801135652fe23130f5f341d6f1 SHA512 7284d9bc63545ffafafd77390e2467ad92f53a9c63984e287f5210057dd936320228ca80c7adb7106cb402a265cb7429af3fc79b1d3ac61375d103d58d0b895b
+EBUILD cmake-3.14.0_rc3.ebuild 6268 BLAKE2B 53bb585b3e89f1e1ca2d05cb1fd19799673a25b9bb8bafcbcd14869d0f9392f969d5fd4908bef5ba3d2fdb9054c40e17cc7d763d0fb64ef8d00cef375e9ea2d0 SHA512 b6c76a13362723a4155c2a46ac56492f0fe6f26fb3567dad4c71134423508b653e813fe683239ada1cf96bffe983fae62ba9d00a709d0c0af75e50d3dbb4ae67
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.14.0_rc2.ebuild b/dev-util/cmake/cmake-3.14.0_rc3.ebuild
index 75999dc18497..ce96349c2144 100644
--- a/dev-util/cmake/cmake-3.14.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.14.0_rc3.ebuild
@@ -50,7 +50,7 @@ SITEFILE="50${PN}-gentoo.el"
 PATCHES=(
 	# prefix
 	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc2-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
 	# Next patch requires new work from prefix people
 	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index 8b539bf5babb..d03b17551f0b 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -1,6 +1,6 @@
-From 3c7467e2e841b9dcff7546c2b140a7e9f57525a6 Mon Sep 17 00:00:00 2001
+From 8ab270bf43f038bba4f992031508b065fa83f390 Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 18 Feb 2019 10:13:45 +0100
+Date: Fri, 1 Mar 2019 23:11:41 +0100
 Subject: [PATCH] Set some proper paths to make cmake find our tools.
 
 The ebuild now adds an extra / at the end of $EPREFIX so that it is
@@ -17,6 +17,7 @@ Updated by Lars Wendler (cmake-3.9.0_rc2)
 Updated by Benda Xu (cmake-3.13.4)
 Updated by Lars Wendler (cmake-3.14.0_rc1)
 Updated by Lars Wendler (cmake-3.14.0_rc2)
+Updated by Lars Wendler (cmake-3.14.0_rc3
 ---
  Modules/Platform/Darwin.cmake    | 12 +++++++----
  Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
@@ -66,7 +67,7 @@ index 5590433a3b..b04383e51d 100644
    "/Applications"
    "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
 diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 46c24bbf9b..54210f6599 100644
+index 97f744d521..8d11827371 100644
 --- a/Modules/Platform/UnixPaths.cmake
 +++ b/Modules/Platform/UnixPaths.cmake
 @@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
@@ -79,7 +80,7 @@ index 46c24bbf9b..54210f6599 100644
  
    # CMake install location
    "${_CMAKE_INSTALL_DIR}"
-@@ -50,28 +51,46 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+@@ -50,17 +51,33 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
  
  # List common include file locations not under the common prefixes.
  list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
@@ -117,22 +118,23 @@ index 46c24bbf9b..54210f6599 100644
 +  @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
    )
  
- # Default per-language values.  These may be later replaced after
+ if(CMAKE_SYSROOT_COMPILE)
+@@ -73,11 +90,13 @@ endif()
  # parsing the implicit directory information from compiler output.
  set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
    ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}
--  /usr/include
+-  "${_cmake_sysroot_compile}/usr/include"
 +  @GENTOO_PORTAGE_EPREFIX@usr/include
 +  @GENTOO_HOST@/usr/include
    )
  set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT
    ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}
--  /usr/include
+-  "${_cmake_sysroot_compile}/usr/include"
 +  @GENTOO_PORTAGE_EPREFIX@usr/include
 +  @GENTOO_HOST@/usr/include
    )
  set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
    ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
 -- 
-2.21.0.rc1
+2.21.0
 
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 4577721d38aa..edbed48eb962 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,5 @@
 DIST d-feet-0.3.13.tar.xz 174700 BLAKE2B 66d2a8735011c64985889edf1acbb37e1547d6af52fc6499124ffae09d8cfd876051e12f231c26a1af848939b9a3e9c36d1083e8afb240575d4f580ea92fde65 SHA512 b5a4eb995e883406a13e8a4137b1ed751cfbfd0fd80fa26eb81cf6f8b69bca63f3a4ad940b1aeaed0a57d48d81c582b62f6c3880e7038136f2b40a1eef25328f
+DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
 EBUILD d-feet-0.3.13.ebuild 1368 BLAKE2B 43a9223eb66494160921db5862d447dbcb603db332fa8743ec0dd3d4675cb2e43e148983ea7b177ece40e38d40f74c69ab350e9c39f87db2e77442c259c45c06 SHA512 52eadfecd0e20f4b7870b6330226a694028270e7c860c98bbbfb33efad8c853a7ba5709ed2a8cff16b08091e1dfe45da0440f40f87d37bd8e3e93eeea7f3c955
+EBUILD d-feet-0.3.14.ebuild 1048 BLAKE2B 57a89fbbed48db602dfad03515929b3856c0faedfdb5758dfdca3f50e264ee4266f9861e04079deb0a50be15aeeefdc6eb38e4e538ddd1da6a6ef057004ddd98 SHA512 d706ddf3371439a2938ecd85310627df86ece0f169daa0448c7bba03d5899ea9fc68461c93e3c3e9a69f4a8f53cff4d20d8ccd274a21dd623b7fc41a704dd892
 MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
diff --git a/dev-util/d-feet/d-feet-0.3.14.ebuild b/dev-util/d-feet/d-feet-0.3.14.ebuild
new file mode 100644
index 000000000000..af1ae4c4c6d0
--- /dev/null
+++ b/dev-util/d-feet/d-feet-0.3.14.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="D-Feet is a powerful D-Bus debugger"
+HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test +X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.9.4:3[introspection]
+	>=dev-libs/gobject-introspection-0.9.6:=
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/glib-2.34:2
+	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
+	>=sys-apps/dbus-1
+	X? ( x11-libs/libwnck:3[introspection] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/itstool
+	>=dev-util/intltool-0.40.0
+	test? ( dev-python/pycodestyle )
+" # eautoreconf needs yelp-tools
+
+src_configure() {
+	# Tests are only python pep8 whitespace checking and intltool checks - checking python whitespate style is not useful for us
+	gnome2_src_configure \
+		$(use_enable test tests)
+}
+
+src_test() {
+	virtx default
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 72f866352b23..49b3e3f9ac4e 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
+DIST debhelper_12.1.1.tar.xz 483732 BLAKE2B 39938f9ec0793154da6405c1b0ef2a8a10a10753475b09f8fbc6e7411457713eb7bc035dfc21f9b7b9f82ec276674802c0cd7599252956cf455cc8d203070a9c SHA512 ab006450258c6c3d5c89bddb8bc5a87d61d80e8232cbbd2f15a32d1045d1fa9f1858df536d8cf813048f4e755a8e5bca765f1da7800ebf8f1237096e659d9ddd
 DIST debhelper_12.1.tar.xz 483568 BLAKE2B 3ffefced2759224fbc9f00c05be03379bf34f8f954be871700b0467629f2437c890ea5f334fc1cdb47baf9ec0e19c886cbbc881cbda39733374a4e09bba3e413 SHA512 557db22d6aac8953cdc41fb6fcb0c06566154ac30aeade4df6c100534505c79d9c34d1f8cc3b41e83740cbe90eb2bf18b21fc0fe49cdbee6d709949c7689ebfb
-DIST debhelper_12.tar.xz 478104 BLAKE2B 3d3e766a5cd7a37d538605a1cdd12e0bd4062a97c7f510c04dc13b8c8d0a9cec21149fdb291650d0c914d003296b3428d234aa315f5f8bf4c8a197d6a0de0422 SHA512 18ca6b310cb777875605a0800880eda706e59c39f8ed37966c41cdc68c2c03d8a249ba78ac61a998a8b86bcd8619f79c1e3c3a104f8bbfae68cafb05839b863a
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
+EBUILD debhelper-12.1.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-12.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
-EBUILD debhelper-12.ebuild 1507 BLAKE2B 16b7f89886d274239047aaa9887f368a9451b3a7ef77de7527859aa6d76a4a586f4b6bad9006937fe32d38258d812fc789b547428173841d091be13f11a2e606 SHA512 f6699e202068bab231ef4f7d6419aafb7174e37405ba3cbf8421a16c2102c4a3a86aa24e9bf2897d409293faec481c8df9bc774550838f05ce6dcb2f22457e42
 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-12.ebuild b/dev-util/debhelper/debhelper-12.1.1.ebuild
index 49deff4eb2c9..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.ebuild
+++ b/dev-util/debhelper/debhelper-12.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index e5976dadf2ed..b1446368376f 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,9 +1,7 @@
-DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
-DIST drone-cli-1.0.4.tar.gz 2623767 BLAKE2B 8822e93a354342393c333aa5240af04bb177991aa667e532c02488c2e351bcfaed8d349d114044c39ac980e620ed0661440b7006de5dcd63309899d40bbb2453 SHA512 241c2c9c8b449a8a29deffe6c537916f6698d0e0ac9b4287d5c441c7f09675b2fb717f0e8c846e0c71fb07609c32a1904579938f82d6c6b712c4b66d9484e2e5
 DIST drone-cli-1.0.5.tar.gz 2627659 BLAKE2B 20d2db2faab26210659811bdd8f576775856dad618348a9b1f2a7cc3c37bf07176a7d4a72ca48f7cf32be4f9359c82e7521c9f6559f7637cd75bd0d671f16f6f SHA512 292e53079b15401364396fd61de481c6c47f426335713c5eb19a9231d11841636e26ae37fd32735f54e3143247489a8ea858ed8082874cef999aae334b9a98c7
-EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
+DIST drone-cli-1.0.7.tar.gz 2719694 BLAKE2B a5032a8bde86b196e1e0a2406e8c3f4789c22809e44eb47212eb41a8d2a31c5dac26a8fe264f09d503f1f3637434f6329dfb19d44448dc3ff01447a947a033ac SHA512 1d7145854eca418d977ac4507ddc52af2ca03efed2177bef5061f4d4e2a6ce8793e867b58ec9beedcaabec973e1b7a006a4490ecc0158db7206c6dff325be040
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
-EBUILD drone-cli-1.0.4.ebuild 699 BLAKE2B fb11a4d7748e8b55d99995982eb36ed66c5ae976a6c75915c4328d25f629c43e56924d22fb14b33cce934a6be410863b7d116ff3cd1a7015a81be6168305ee4f SHA512 e716f601b6c055be9bc251b855738dd6ca856154a79e2cc71f5127f95129751b3e15e4d71b0bbf0dc3c8bc312f5ce7831ecbd619c05587a0f839f1f30105a08e
 EBUILD drone-cli-1.0.5.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
+EBUILD drone-cli-1.0.7.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.7.0_p20170717.ebuild b/dev-util/drone-cli/drone-cli-0.7.0_p20170717.ebuild
deleted file mode 100644
index 9133bfec3093..000000000000
--- a/dev-util/drone-cli/drone-cli-0.7.0_p20170717.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="4a5e8a2acb2c82c5a4e6b96b6849f59962dfb668"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.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/drone-cli/drone-cli-1.0.4.ebuild b/dev-util/drone-cli/drone-cli-1.0.7.ebuild
index 76b00a393dc2..ca7f0b0fdc7f 100644
--- a/dev-util/drone-cli/drone-cli-1.0.4.ebuild
+++ b/dev-util/drone-cli/drone-cli-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index 43a2d9ad0eca..35e51d87063d 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -4,13 +4,10 @@ AUX drone-server.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e456
 AUX drone-server.initd 455 BLAKE2B 73d173c4fb2c53826d6f0f9395a18dfc9802c01f23c28517ed784fc0713e342f6684b13995a8f4404f51b7504f7515c8a652621f6884b9e0fe36ae6b9ed1269e SHA512 969a7a1947c791bb8788b1fa4d36df1ead66c1312c8f4188970178ef7cbca3b9a108bce955a012285330155be15eb270a1675aee7d317c2cff4cb4554d461a38
 AUX drone.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
 AUX drone.initd 472 BLAKE2B ad8966d5703fe092d3fb3b7e34344c092bf3a221945405f34329d936052c435d4f68537c1f6ec889e35d1b989dc5b395dc77bcdcf224d8159eabdb12d327782f SHA512 54b4ef6943a018c0d194658c267bda50c51b2594aaab1d25350d512e50ec5136eb5bc6249f22d1b3e055574848bd50025a6158b1e02bd89da8213611ac41a16d
-DIST drone-0.7.3.tar.gz 4133041 BLAKE2B 819976f11e37c4f2484b00648191f64818ab254a326f31c594917c5ba02122a4e061168344148c113a32e0d14791e59e95a71bb224cd04bef7d1586703fd77fd SHA512 4c85e964f43ce3076996cd1cbcfc3675d74b254278d046d1e7d4b7f04ee5fcc55a6de04947c3f8102be474e0ef3fbd5d0006ac2b39aae04fe2bc6b466b513c66
 DIST drone-0.8.5.tar.gz 4766128 BLAKE2B 11c60896a8aced0aa6303ec049755192e473f742af45fcb6fe1509a3085cbdfd0c016e875a1822cedff9040abf08d238490430ac8f6b2136b31491207de1748a SHA512 a2be1082b6b923d432f4addaa12ec45a76f7edce0ac955c1d3eb812b3541c140919e6195bcee9ed218b92045a63b303759702ffb63831757177f44b2307be164
 DIST drone-0.8.6.tar.gz 4767466 BLAKE2B 708fbe2fb4e6a647e8fc370c39c71fdbdbd67abd28a18348985831c3bc8dee2880c64a2be01ce50c3dbe56d27ee89605ee2fef00e643a66c641a57f664867cf8 SHA512 2227bad9a0067e9c235c3a30677032b4b54488727e44c9caa6bd7dcd804338ed62d8f76879310499e7063d7e84d2b23a6b389f6a60a43f138ed2c83d8df07435
 DIST drone-0.8.7.tar.gz 4770079 BLAKE2B bc2a71c09fa7d1086899175bc7042e8bf57833088ec7d1edccf26385f4a6c16335d8ba56af471697c86d0e19a2ff838e69eaa9e082d64cb5b6029d7c84c6e425 SHA512 1451de48a9397b877a7ef668d15092ed1d0ee7c899bc025ff16fbbf9d78c2807d6989685a39bca03070f9b1188cd9ea23640dc2b7f2389d13228d178923dc7ed
-DIST drone-0.8.8.tar.gz 4766250 BLAKE2B 27f99b2f6889cb9ea89b87b9a435595d73180ae0897710f4345a1816875023af343dc6948327b0c327b5a7f37db07d55fca766c1374951b273a3f872497f2e53 SHA512 db85df0974737ce31f72243b2269fe7cce8d39a3e7bd7779841e398b85ccd97a512fa50cd9f60be36bd81eb7c081d282fccc4b35e2527ae65283ff56c27b111d
 DIST drone-0.8.9.tar.gz 4767398 BLAKE2B 7c32f01a692e1a29e8b2e602a804bea3997efe01257f2fe5aa39f8d7f321f42f714b909a470f2ec7ee6d69bfdc2f06f75cb990e98769502b68725adc43ebd579 SHA512 97b773356bb770a8ca060e4696ba0d288a7204d0cffd966d1124a71ec1110981ac7cdce9ce4df04b8ce33faa745f853d59502b0bce5fc708435379924e3850ac
-DIST github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz 167172 BLAKE2B 26d5aadcaee776c073bc5b4514f5c7b2925a7dab25a22162c10464f16a18e14cb564012b2b13ca929d7c5156dc5790d0d0659ccef8d8424ee82be2410ce0d211 SHA512 d4c6fbeba9ae5c55533a76fdcf6c251516aa4f8c650f49add7e9392d22a131438bd829670df801495d361417ec12cce07e9d9c28aacd1ce1adc0024408cf3cca
 DIST github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz 229886 BLAKE2B 3681f8fc5f380da3c7ab6dd5f34903f44fbe1ee5b309f5d1db25cd72347690249943814bd9e1ea3f4eaf04b14247bbf53e9a817dcfa5ad0e0bbc7d5d1585d2ea SHA512 4bd9909b82b31ed0b872d39da79fea161fdd1408d9da262b8a92c8cb884caf3dceb953ab522daaf8c96747cf4b22724e8e1d6234d80f2859a9ddd436fb513345
 DIST github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz 230464 BLAKE2B 23641867938e85a716a8628209892861578d519e49b9e3aa70e08d9099b4628a744e5bb8bb3f622640ef1438eac50df21b5c32064328165c4aafc2496ca54361 SHA512 6f997ec14fa59859436ed995d52cce2105abab5aceca21c6740869c651078f1ffdcaff8b5a117d624d624cf47382f89824f7868dd8e8df3598d6e632db341212
 DIST github.com-golang-net-3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd.tar.gz 964447 BLAKE2B 8d912b7c34494e9f05fb1ee1ba11699c028ceaa138015b2139fbeec1cfc5784d48e4369ff32cba2f13ba0d1b987111633c0805dc5af45e918bf7c240360d22d4 SHA512 0605a3d42233cbb228e432520c2ef6c96cf6b4a0a59795bf0eca0f8251eb84120c9e3c4831a24308d2bb648984d2152b11e03e51bfb7e9adde7a3e8e34830054
@@ -19,10 +16,8 @@ DIST github.com-golang-net-9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz 96808
 DIST github.com-golang-protobuf-93b26e6a70e37abb14f2f88194949312b0592a84.tar.gz 331818 BLAKE2B d00007a32b48ce04652edf7f7379f11dd381640ac2a22373a3b29bed54be050bb54dc35e0a76e095e0240a2e3b063aa35667d051c3933afc664dabbc94ee950e SHA512 2befd6db79c07c8f2c10a18364da51e4f292b26fdd7e42a7d533972c1289c91d1186c626177fda0fdea1982e9af06bf449d73d1be1a7239eb4dd926f8a2df920
 DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
 DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
-EBUILD drone-0.7.3.ebuild 1406 BLAKE2B 857aef910f1354aed8dfec202e7c404da7eea3f9048df6086853a062436a5a6463b24664ab556a9d3f3bb3297a0ae9c76d21895475e3c29e9257ce3543a17c70 SHA512 26edd24f0e66e13a3f397cac24b14c0ee0237ead70fa8204f7b2a76aa0495670a9783b7dddc7d363c778f2d973fb5bc6c75dcb61c8fc9359ee168a2d3356b0df
 EBUILD drone-0.8.5.ebuild 1812 BLAKE2B d6eae0a8fd1522bcca6c7ad08e4305d6812f86bfe89d4ccf438bb1e2cef2eeb4e8a70b308ce5be7300ff2ab67df48f490dd5e995eee148d373ffa41c0dc479ce SHA512 077808dda006067faecd74149b1c7c01d08b32ce9cf96209e6d375c170b758309dcc6cf46e50a0a9ad94bef025c7ce1efcb348d5c04696114db5f06d48df1ec9
 EBUILD drone-0.8.6.ebuild 1812 BLAKE2B ea120485a659e5df726968281662c78acf84f104648244ee42d4919221e650b3a695dde6a8e5d8fdb82a10c14317b6bcae018d0c72c7c23bdaa7e7718875e35f SHA512 1e9ef7bfa863aa0b445fc5494ff43a097a81d52fa77cbdabf89e15495af8fd1016c57eaea7e83beaf5826b0bd6e3f4335205e0754f12aceb24cda94f8067c0dc
 EBUILD drone-0.8.7.ebuild 1809 BLAKE2B 8b0c91566f97633d96c3eefdf0f536890ba9748b9a871b7bed0c72793343e8fccc0657ff44607124effdb8b85ec498f69d466dded67212876638922f50d4042e SHA512 7648888b1089bc9372c53c84a507eeabf8e00a6c06e0e8088cb6d237307cb83d3f781f06d1e100d547a505ab9116adfb628cb1f51be78e0775b4ba6146e43f89
-EBUILD drone-0.8.8.ebuild 1809 BLAKE2B 44fc709e5e849a02d54ffa11d9b9a9d32870a73a8c442f030d2b1bbc70177c840f5ba6c8d55324eb1134eeff003965945b9ad5b53cc475aae506f834d185434f SHA512 3ed68fd9b7b98e7d125883afc8308970e2a2bb4a82f23e29a41cc02dfd5fa9ec4e8f33892d31d41d92a749edd965c25084de831a3d8b91f7c28e4879d7da29a6
 EBUILD drone-0.8.9.ebuild 1809 BLAKE2B eb267d27e338c193b4649232750b9e871c4eb67bd3e4c793e31b34902b63b46896b187742701884793bdda3b2c8ab49f4ea9013356186725c6d1f942d954801e SHA512 07f35547e83859460abeb9a091bc1a71510194abe25a279f8ae0da9306e43e5a7c6b46bae0d83ec19e3ad991cff426e98e090720f19ac1df292ee26e77ca474a
 MISC metadata.xml 321 BLAKE2B 7e3819d8553451b8b4938040d4e25afd6a1b456c16ad7366b648274cb84a5a694f9a8d88f125023298d5e7e8f098de3c233d397cad44682813fca82329f55e5a SHA512 01b1dd14592873025099119b28c840eefa31d098e77de1e8e26ecc6894dad73778e4eb8d4df6232a2a444bc906057e8d7f853ecdc1f3091cdd27a43c19d8b950
diff --git a/dev-util/drone/drone-0.7.3.ebuild b/dev-util/drone/drone-0.7.3.ebuild
deleted file mode 100644
index e6bf0d86c01d..000000000000
--- a/dev-util/drone/drone-0.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="f604d592bc356fcade4aec67eba9b7fba8eed655"
-EGO_VENDOR=( "github.com/drone/drone-ui 2910d0ee662816a2463d31f0988b1ecccd0410b5" )
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"\
-		go install -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	newbin bin/drone drone-server
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone.initd drone
-	newconfd "${FILESDIR}"/drone.confd drone
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/drone-0.8.8.ebuild b/dev-util/drone/drone-0.8.8.ebuild
deleted file mode 100644
index bfd3bc8970c3..000000000000
--- a/dev-util/drone/drone-0.8.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="bc22e226d0089b7d575a26f0e7755541aebbc09d"
-EGO_VENDOR=( "github.com/drone/drone-ui e7597b5234814a2c2f2a7f489b631a76649c335a"
-	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-	"golang.org/x/net 9b4f9f5ad5197c79fd623a3638e70d8b26cef344 github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/ftnchek/Manifest b/dev-util/ftnchek/Manifest
index b3dd1fe652a8..6f6afe144625 100644
--- a/dev-util/ftnchek/Manifest
+++ b/dev-util/ftnchek/Manifest
@@ -1,3 +1,4 @@
 DIST ftnchek-3.3.1.tar.gz 1048638 BLAKE2B 4d9e49a826a192ac8ce9ad443fcff3aba03173915130d1e197c4e78cc5c874b509c1772c28e4a3e5c4a911e77d562ae07fa44c728a94c9ac0c16b5e7d0bc174d SHA512 14c698a6d936ffcd1966822f3b307fc2a70ffd5d58dcff27e10a9491562cff12ef75d98c0e67a7053e106df4f6b4d920e8164950778c5e13e7c15543fa2ecc41
-EBUILD ftnchek-3.3.1-r1.ebuild 864 BLAKE2B 4ec242a6c5f435b3dc47773f2be2f7d9dea4823d81cb7fda6f93c538de739420f01d936b6cd563855469d5b60eb746b08418f398024a5fc7f4edd3fa65a73cba SHA512 a08994f17f3dae52992f706aff405ae38ff98f23220dae493400c5e8b7af03d1841876ac55d2311588c3eab68cc63e748735415145970f8eb67400bb5ff2d3fc
+EBUILD ftnchek-3.3.1-r1.ebuild 863 BLAKE2B 15ce7f950bafc528c4c80e44c4a4c69311e643b8c9110b1f0f5c7414552810dd3582b98f7119e50b8fbef7924444db61d432a8879c2724eef8da8d55f5a0dc55 SHA512 dfa049b79d60e81dc38bf8e695a5f36b96d4bc48d7f7f9c9cc763ba3c1c3a712d29de6a9a9f839aaaf307e79787dc0e91070eed3d893ad6ab277b2387128bc95
+EBUILD ftnchek-3.3.1-r2.ebuild 966 BLAKE2B 2fae737d96da25f6619434d74deac675c69a26dbadfa238716f201306f908df0318322e2b3b9c137b5a7fca9bd2000319d97aac52f3b1a3b71c06d56b0b9dded SHA512 ab7ee510a061a91cb6cd47ba0cc677f6f862e193890f04427dd4bddf20c189a8726dae1e6dcf471f4ca7bf2da138c9533a9a78ef61fcaa746ebab3ab7ab0b94d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild b/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
index 10f581a6233e..9ef2be707e2d 100644
--- a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
+++ b/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -6,8 +6,8 @@ EAPI="2"
 inherit autotools
 
 DESCRIPTION="Static analyzer a la 'lint' for Fortran 77"
-HOMEPAGE="http://www.dsm.fordham.edu/~ftnchek/"
-SRC_URI="http://www.dsm.fordham.edu/~${PN}/download/${P}.tar.gz"
+HOMEPAGE="https://www.dsm.fordham.edu/~ftnchek/"
+SRC_URI="https://www.dsm.fordham.edu/~${PN}/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild b/dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild
new file mode 100644
index 000000000000..8543e828e991
--- /dev/null
+++ b/dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Static analyzer a la 'lint' for Fortran 77"
+HOMEPAGE="https://www.dsm.fordham.edu/~ftnchek/"
+SRC_URI="https://www.dsm.fordham.edu/~${PN}/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	mv dcl2inc.{man,1} || die
+
+	#1 Do not strip
+	#2 CFLAGS is used internally, so append to it
+	sed -i Makefile.in \
+		-e '/-$(STRIP)/d' \
+		-e 's|CFLAGS\([[:space:]]*\)=|CFLAGS\1+=|' \
+		|| die "sed Makefile.in"
+
+	#1 Respect CFLAGS
+	#2 Respect LDFLAGS
+	sed -i configure.ac \
+		-e 's|OPT=".*"|OPT=""|g' \
+		-e '/^LDFLAGS=/d' \
+		|| die "sed configure.ac"
+
+	eautoreconf
+}
+
+src_install() {
+	dobin ${PN} dcl2inc
+	doman ${PN}.1 dcl2inc.1
+	insinto /usr/share/${PN}
+	doins dcl2inc.awk
+	doins -r test
+	dodoc FAQ PATCHES README ToDo
+	docinto html
+	dodoc -r html/*
+}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 5434d8b9a8c7..47611f8224c2 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,5 @@
 DIST goland-2018.2.tar.gz 236750402 BLAKE2B 54df8b09f4ae59323c4b8aa06d41a23753399d36fbdf34a0ecbb159d00fb5a6cf29fd4aeeaee9d853b54d2ceaa8f99ad5560128b4e50b4ad2720a2db81df7dc3 SHA512 f1c7ddb94bb918b9668d444e285f4ff82b45c9aa1e24e848f32bc219b2dd48a939d52f6c5c749fc76bfdd3f58e2f2a72ca2275a9291a7a5a5a3c6a30c4780420
+DIST goland-2018.3.4.tar.gz 298506989 BLAKE2B 9fd4db8c178c0a749c685b5e77da22717923f1da2371e92246eec3422e8041c3d8c975ffc562e92dcfdd0580297f4ffc0569e82ffea231cc3688b5570b4af7cd SHA512 ce7efbea9b531079dfae241f4817f04bb3969a65b1b8d6128b28d82b0262dfe3881ae1b6ceeff4fd3a084743d2ad512dd948f231a66f3b6a4347c522409cc81d
 EBUILD goland-2018.2.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
+EBUILD goland-2018.3.4.ebuild 1037 BLAKE2B ac2928910ecd153c1408e23bea8f428c21cd4d6bf7ff07839371d357fa8e0749571edf2b22dc804f4782f30f3d460bc7726272922b1770149d171492ba6f33cb SHA512 28ef739f655709535288f66783b0c6b0fb9bfcd3dec2e95ecb1472c774ab82b589b34b9182c292c664cafa212b43a79cfe61ecc36fbcd43777aff0ca6a117f47
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/goland/goland-2018.3.4.ebuild b/dev-util/goland/goland-2018.3.4.ebuild
new file mode 100644
index 000000000000..824cf5bfe3d6
--- /dev/null
+++ b/dev-util/goland/goland-2018.3.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 59131c88afd1..ba08689b5457 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,5 @@
 DIST howdoi-1.1.12.tar.gz 8196 BLAKE2B de3b7560dac360102246c10e6076658fe6fdfbedd378f02e65928d2b83a3f05357b8a9aafd6ad22e402448dfcf96b72faaf5755774b83ed1656ae7cb81554c72 SHA512 c4f66941d608a3f1c2a441b81ec5b64d9ac4e53b70bf4bda08fd8fc68b1c34022abdddfa47e3812cdce063e5b3c440aa4b9ad39ea95bfad2f285b5ffa89d711b
 DIST howdoi-1.1.14.tar.gz 8421 BLAKE2B 40689f3ca1ce487fd5278406115b70e51d82ce2ff2f8b1e60c02fad6f92adfcb532c3ce73c4126027a0812e21b599bf5f9d20e8d3c23d6dc4e541a877e1ba52d SHA512 348125e666d42b657ee493a405207238aab12cb4815da52de2bc3d0635a85476e942ed73b6eb75e7ac51e744f01ebe987dd45ecc69b1774f264a6bd9c4a2826e
 EBUILD howdoi-1.1.12.ebuild 585 BLAKE2B 72315818c287c651e9f2d5e01aaa5f5e8631a755f0af650c3dfa7acbd1f7a466c1efeb34efd25d834a27c952a50b565f50bdcb740f6664bab7f7154a00ba53a9 SHA512 6ceb5ccbca17eda545787e77b1d2dacea24923102283837a2acc0c067e02e949940acfaa893bc1621e73ff96825a89eac1f5c93c267ac67ca0942e05cb0e3ac2
-EBUILD howdoi-1.1.14.ebuild 588 BLAKE2B 6cf26d1895ee3aaa5dda00c34d2044fbbe6f24d1021c162bfb46ada9aba3e26e4743020a02435ac7924966ac29f2eb93211e5e62467337b360d55d0ba34239a9 SHA512 4c0edbbcc37d410914b6ecc37d870ac472297bdd65438163743399c6b019cc133c119bdf79d9c6b16c685d6e342e959970d164ef96af77d9223f9a0252486052
+EBUILD howdoi-1.1.14.ebuild 589 BLAKE2B d304dc8d4d818cd9f732a3d0eada2781d6ab53f0636f4af5e2efa0f03e953165f301526daac4c5266be009ab9ccdc4f50baf00905b7c272fa7bda4b2e9ec9901 SHA512 a98ffad3407c6646c3e17700f34c012300e29911c4abbaa35b06ce79b8b818f5885ce0d41bbbdb9ae66dff485e607757c54a843a4f945a328e71aac747e73177
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-1.1.14.ebuild b/dev-util/howdoi/howdoi-1.1.14.ebuild
index 3d513af56bac..c9a1c1aa4a2e 100644
--- a/dev-util/howdoi/howdoi-1.1.14.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyquery-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 9aefec0495df..fde45618793a 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,10 +1,13 @@
 DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc807cd84271f8be35a06437e718fb40a0f5090f213e203ffb746b254583f59e912d00300635e78f43aeb75a8dc4048 SHA512 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
 DIST lldb-8.0.0rc2.src.tar.xz 19603496 BLAKE2B e13ae6c20a34e0b77729abfd1c6108b213fcfbd31674b52e42d21ee3b9db334a1c4e772e787cb7ac3f3695078d3ea37b7d6f464bf575460dada59356131c8460 SHA512 5cc3687999356c6b17fe8eaea9187e2b7e275a641aefa3e94a45d6016df67fdfd2c25a77e225516496503074284be2ccfbca0d43912e8b5a9f5f72d231f85261
+DIST lldb-8.0.0rc3.src.tar.xz 19605220 BLAKE2B 20cc9bf0680162628d7d09d3589151255fac74eac5be0b99bad2b6a810bc77f12403a7d9b7ae420c918643966271aaa49a13435e5668b6ce5be7525356361bd8 SHA512 abda094092fc40d83ea98a2cb19aeb3f5a51ffbeb810e8aaebf3eac9c7be84f0123bf5397d7ac74109b8aa45d589e4e38646efe1817bdb6272bd957ba7a92cd2
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
 DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
+DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
 EBUILD lldb-7.0.1.ebuild 3010 BLAKE2B 9d82e23d83a5726a5c966d14e4660e7199e03716597c2be0bf2adf33037c1fb4cd459fda2ab44230e18efc681690f16e25753de7b3bca2932b1081e6feff887a SHA512 92a937daf00ab27650045dad8fae9e7a1e9e2b014b37ee9e13c8452f25fa58a78196711b0e5a41a65f12947a1a9fd85ddbf9c360c4036478a699417501c2c02f
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
 EBUILD lldb-8.0.0_rc2.ebuild 3016 BLAKE2B a54f8a425a716ab94b9d97441cbee297e93297fc632e9f658c89b0d9df62d25a5bd13ff0062850f78f0de13c4ff010e3d2c4e8648aeed764e622eba9dd4db6ae SHA512 6b852c966bd6a1b4c6789fb2f0a79e79ba68d1884d97af78b452c6388017b72bc9a6139e4f487da85b8569787097eb6416ff6856ce21e362064e4da230723f84
+EBUILD lldb-8.0.0_rc3.ebuild 3016 BLAKE2B a54f8a425a716ab94b9d97441cbee297e93297fc632e9f658c89b0d9df62d25a5bd13ff0062850f78f0de13c4ff010e3d2c4e8648aeed764e622eba9dd4db6ae SHA512 6b852c966bd6a1b4c6789fb2f0a79e79ba68d1884d97af78b452c6388017b72bc9a6139e4f487da85b8569787097eb6416ff6856ce21e362064e4da230723f84
 EBUILD lldb-8.0.9999.ebuild 2960 BLAKE2B 39990504c70cab7761ae1e465bf257558488f3c90b5e07fcaa72e9b4c6e874e62e4d15ddadcb0fdb3924af3aaecec8f14b1747e1e3cf837c0b77b77b1b44f906 SHA512 68d1ff044126076e1962eb1a09eb0621a313ed92a7ba2fff6a9959f00f39b219ac6478113c641f0c55f3b687ea9ce7cf23ac7c6ebaad51788f162f639598fc94
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-8.0.0_rc3.ebuild b/dev-util/lldb/lldb-8.0.0_rc3.ebuild
new file mode 100644
index 000000000000..cab280bed822
--- /dev/null
+++ b/dev-util/lldb/lldb-8.0.0_rc3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libedit ncurses python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 342284f17b0b..e2120adeef39 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,10 +1,6 @@
 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
-DIST meson-0.49.0.tar.gz 1338576 BLAKE2B 6ae3152af337591928232c5dea8331185c8aa7f712019ed3635269544e4506fc0d9195d3d59128c5e5a286aff8ad1e3a0edf3afe28ab469989753c3c988ddae3 SHA512 6aba2a1c1dbf247fc30526215dd499b7c918c19f7f16a7216f5762e95cde39b7cfae2a1ebca1e2ea5323f2f855ed98c99af1b9048aa00bd1ffbe8da20ef2121b
-DIST meson-0.49.1.tar.gz 1340585 BLAKE2B 7df52f68948c74d4d713d57406a7b496e33740e43ea069b5cb6474a80b94800f8af7983413f3154eb2e6b7f0ea8df51e7359b8b7c6661f454dbb9a21ccf9bdc6 SHA512 cc955509d2c82b12d347f7a670a0e2abf5f6a4455dda3d53ec4abb0930b5f1c4a0ff996223ba5a5333bfec66e5d3fb3448a8187d4640e4b65397fc3e0e43dc72
 DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
 EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167
-EBUILD meson-0.49.0.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
-EBUILD meson-0.49.1.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
-EBUILD meson-0.49.2.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
-EBUILD meson-9999.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
+EBUILD meson-0.49.2.ebuild 1547 BLAKE2B 6ae191ddfba8fff7af35c718370f707213279e022a9c781f26061bbd57bb426601a18e97a3b22b732e81e3c37a859211ed65185d1b88d3f488537be0bfc1e492 SHA512 f4b8f1698ad7f89cba39a622538339ed4f7d7d04f95374c23494eb7a39aea656f12682b0c912bb8fca3703fd05b305c1d0245816fd00d7736af7841d4d2e02e0
+EBUILD meson-9999.ebuild 1547 BLAKE2B 6ae191ddfba8fff7af35c718370f707213279e022a9c781f26061bbd57bb426601a18e97a3b22b732e81e3c37a859211ed65185d1b88d3f488537be0bfc1e492 SHA512 f4b8f1698ad7f89cba39a622538339ed4f7d7d04f95374c23494eb7a39aea656f12682b0c912bb8fca3703fd05b305c1d0245816fd00d7736af7841d4d2e02e0
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.49.0.ebuild b/dev-util/meson/meson-0.49.0.ebuild
deleted file mode 100644
index 6149ebc1ee51..000000000000
--- a/dev-util/meson/meson-0.49.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	if tc-is-gcc; then
-		# LTO fails for static libs because the bfd plugin in missing.
-		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
-		# https://bugs.gentoo.org/672706
-		tc-getPROG AR gcc-ar >/dev/null
-	fi
-	distutils-r1_src_test
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.49.1.ebuild b/dev-util/meson/meson-0.49.1.ebuild
deleted file mode 100644
index 6149ebc1ee51..000000000000
--- a/dev-util/meson/meson-0.49.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	if tc-is-gcc; then
-		# LTO fails for static libs because the bfd plugin in missing.
-		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
-		# https://bugs.gentoo.org/672706
-		tc-getPROG AR gcc-ar >/dev/null
-	fi
-	distutils-r1_src_test
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
index 6149ebc1ee51..c7cd92e8d1f5 100644
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ b/dev-util/meson/meson-0.49.2.ebuild
@@ -42,12 +42,6 @@ python_prepare_all() {
 }
 
 src_test() {
-	if tc-is-gcc; then
-		# LTO fails for static libs because the bfd plugin in missing.
-		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
-		# https://bugs.gentoo.org/672706
-		tc-getPROG AR gcc-ar >/dev/null
-	fi
 	distutils-r1_src_test
 }
 
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 6149ebc1ee51..c7cd92e8d1f5 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -42,12 +42,6 @@ python_prepare_all() {
 }
 
 src_test() {
-	if tc-is-gcc; then
-		# LTO fails for static libs because the bfd plugin in missing.
-		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
-		# https://bugs.gentoo.org/672706
-		tc-getPROG AR gcc-ar >/dev/null
-	fi
 	distutils-r1_src_test
 }
 
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 632d201d62bf..58e903db0e98 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,7 +1,5 @@
-DIST promu-0.1.0.tar.gz 1065003 BLAKE2B f56dfda69dae632b1946182b1a92c059cac52867c677d415c2f321f95800d3902f8f0fbd4d4b670870f3dce34603b0c1a50df9311be70404f27e9f5afbaf4699 SHA512 18ad54b1ec9fe8975a0048b5c85609858cd500a2d3aa34e51e5c2c3d07a0df4337bac9648562e2007d5c8572e07c814c6bba7522b94836c258cde457df5815e2
-DIST promu-0.1.0_p20180227.tar.gz 1068386 BLAKE2B b850c1dfa51f86099bd7e32c131ef99a05d4f4caab441a945fddc9a2895e72b74ed3456f18ab69493fc2283902c570e78f99ea303f32998416fdfbf91c3d0cd8 SHA512 6fbe5fe92602437aee90a442028cd846d9d72179b32e601b6167420dab0a3aed22cd9d1c527320ca54a3cfce7b79167753ad9cbeb000762e845056c692212a74
 DIST promu-0.2.0.tar.gz 1072026 BLAKE2B 2b68d992b37421d6b9a08cc9a9134f9ae52643d4c2844c8e1f6f6724f015582c99a8724ab6b8d1ee69437c660e3b972af85949e3221d8d8c709fd8c1a45e1256 SHA512 4da4716a9d4fb96b6016c9bd452fed0403721ab15f95e6955db2ab6e8e482f3bbb35cb4c1c94f690af9520729a93c100015ee48cb69627e129004ae0b15257ae
-EBUILD promu-0.1.0.ebuild 852 BLAKE2B 9233be82753b67b6396d85a6df6f49a7ea34857ee751c3b56dab70a47ce0eb7032d1abedf1d4c36ab83317050468b10598f09bfb2adefbbb43b2c15a5a4f474e SHA512 4bc962ebfd3c78d9e8190fa1c11262e8303d76c6ba95760c1dd1aa4a7d9cb8fbb2e4a8048a22737255e56927e0b09798237252b6cb4548afd97be4dbad1a3877
-EBUILD promu-0.1.0_p20180227.ebuild 898 BLAKE2B 8dff410ec5b0c1b8049f6b5b704076c7a3d190b5f545606f296f95e742d7cf2589d8a972ff4f9875d70c7f6fed7cbd98bafb3421f8f69f15ca297d6a158c340d SHA512 c5679affaaffa1d9bab60d3f0b965381161e94f24e88bfab6f6f19fe3b476ccdcbe7b60e6248235359b85f2f2ff0fa6992af1e13fc3d6112b4049128c6bd4d5c
-EBUILD promu-0.2.0.ebuild 761 BLAKE2B 4b7fe9bdae893d106ae4cd8056f8c08b9b08ecf0483811c2f94ef491664e17af4f43d859b36bd9c1956885adeea81a8fe6cf471fcb44981a15e73d2e90f0fc01 SHA512 032754a16e5b9bcb6ec81fbcdaf959702f25c1004ac58490609442ca42151fe830464dff1f81704bbd6e8646275e22e9db9cc2502c6277fdccfeb8caeb5ecfb2
+DIST promu-0.3.0.tar.gz 366019 BLAKE2B 0e6e93bb573da0ef20947b72989d8a68a7d6d1490efc802acaee58c9f546e9b46162054172d445e4dcb5cbc33c152529f006edf3acc594b92927df0ab489f86a SHA512 543cb514fcab9700bc45cb1b4a9f056720af4acf8ed949e03445c2f4e52d89f6fb8eda3ee538bc92feb2dc06db31026bebad9bf6c86a6e37a0be294d17e4b518
+EBUILD promu-0.2.0.ebuild 760 BLAKE2B 2630eaaef487fc9edf249c7ec4f61bc6d8d3245e6225c26cee3af0736b1d13549bfafd4be026646e29f29b1e9a5305a4b79c012cd2a03117fbe364091abb614c SHA512 b4ba612c32787b1d85398dc1cefa49e6dd35be60790c5029d4d8a8ed697154b116e2f1cd8b0dfa648df742c7455eeeac2b79113a070b3fec9af8f16ac0e14aae
+EBUILD promu-0.3.0.ebuild 838 BLAKE2B 1da81a88a2ef2a94bc4ff5d0f0e0884348dd9827e38d71b098e9e7f8ec6143c6778ea9ffcd94531779dce1b99633c0894f29e0e9c886635bbb19fcbb6eb90750 SHA512 9baa5ba3573c4edc7e08d1744964d0d514347960cf9ac96edde825d4914cb66df72690b7005d5ca5270630f7281b08cf881bcb5e2ff77dc592530638a6ec7dbe
 MISC metadata.xml 326 BLAKE2B 84a14632c102d52e02ac2c9a8e7f8e2edfabb3401ab04d5fe94eab4c83ef053f27260aff0ad2b04769653665325afa6db028c8ee281835b925456b432d593eb1 SHA512 2870183c141e5d9ec65aba01e7ab02443f42d13d0f39c4ba51af7adacabdf360cb2308cb898c4bf4f0a8c3e20b35d511af2b978fafcb4de47177de77819f6853
diff --git a/dev-util/promu/promu-0.1.0_p20180227.ebuild b/dev-util/promu/promu-0.1.0_p20180227.ebuild
deleted file mode 100644
index 94c084e7161a..000000000000
--- a/dev-util/promu/promu-0.1.0_p20180227.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="5a3cc08574c63bb853a21c570d719a0fb548dae0"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus Utility Tool"
-HOMEPAGE="https://github.com/prometheus/promu"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	LDFLAGS="-X github.com/prometheus/vendor/github.com/prometheus/common/version.Version=$(cat src/${EGO_PN}/VERSION)
-	-X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT:0:7}
-	-extldflags \"-static\""
-	GOPATH="${S}" go build -ldflags "${LDFLAGS}" -o bin/promu src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{doc,{README,CONTRIBUTING}.md}
-}
diff --git a/dev-util/promu/promu-0.2.0.ebuild b/dev-util/promu/promu-0.2.0.ebuild
index b00d33f73cfa..df89ca92f81f 100644
--- a/dev-util/promu/promu-0.2.0.ebuild
+++ b/dev-util/promu/promu-0.2.0.ebuild
@@ -7,7 +7,7 @@ inherit golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/promu"
 EGIT_COMMIT="264dc36af9ea3103255063497636bd5713e3e9c1"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
diff --git a/dev-util/promu/promu-0.1.0.ebuild b/dev-util/promu/promu-0.3.0.ebuild
index 027fda9afb03..ea822459f7d3 100644
--- a/dev-util/promu/promu-0.1.0.ebuild
+++ b/dev-util/promu/promu-0.3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="5e82f2f"
+EGIT_COMMIT="295a70a7f580b886572861b19545b28accfd4491"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
@@ -15,11 +15,17 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
+DEPEND=">=dev-lang/go-1.11"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
 src_compile() {
-	LDFLAGS="-X github.com/prometheus/vendor/github.com/prometheus/common/version.Version=$(cat src/${EGO_PN}/VERSION)
-	-X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT}
-	-extldflags \"-static\""
-	GOPATH="${S}" go build -ldflags "${LDFLAGS}" -o bin/promu src/${EGO_PN}/main.go || die
+	pushd src/${EGO_PN} || die
+	GO111MODULES=on GOCACHE="${T}/go-cache" GOPATH="${S}" go install -v github.com/prometheus/promu || die
+	popd || die
 }
 
 src_install() {
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 69983011a40a..c597147482ae 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -4,11 +4,13 @@ DIST pycharm-community-2018.3.1.tar.gz 310702122 BLAKE2B c54153b9529bf03a09d92eb
 DIST pycharm-community-2018.3.2.tar.gz 310664794 BLAKE2B 2dd7e59514909da3e319b1d8eb8b3e24e8dc7d67868ffea621b1c3273b6daa32459f09fb2d2e5b94d8044d9c2a0ea55d5940551bfd945e3ed8dabc200bcc2927 SHA512 613c1556dcf86f448cb496cf492ee76636dfef22cc4eb55f57ca1ed91a53f8a78da6455cc6f49becaa6250e136d786c92014e23a4333fbf0a6477a2f1e67a21c
 DIST pycharm-community-2018.3.3.tar.gz 310740450 BLAKE2B 53552c228c81b17833d02a18f21838e768fdce3de8595a32fa832938208520306c1858d1e3ca509671e0412f2ec3b70acdf802a8af38816d91970f0c08b93147 SHA512 f1e774633718361fa623cb9810cd23be5da98f1bdc6cdfb01ef0980aa1163e0dea1e6c4ebbd1496ff903d81fec744f022a7c7854e29302c19d503541565dd1a0
 DIST pycharm-community-2018.3.4.tar.gz 310736836 BLAKE2B 2d43955b4d4299026c3fccd00c42e71b98c314d33857b1f81a84f365efde4b89d29b8c20826a3f89b6dc36fb293d867874edc75d68f5070516a27ccb68034cd2 SHA512 35b133b0db3b7fdbc4f08d0070de5aec8b3f170657c932e5c5c0af2e8c4be8b9e408558a0595794acd73e2ef5085295929b2a11013e6e72b852fead4ce572f60
+DIST pycharm-community-2018.3.5.tar.gz 311914955 BLAKE2B d4e1e2cc19a416d7f5ecc1ee181c0b6a4e29ee3577800f2426ec84a7a16f53992526b1df8e3ccd43ccbdeeb7f6521d579fad41d145ecfd24408d2d18b9b577d6 SHA512 a81c95397388b243a5b548e2b4bc54f1be3fdedd191c33a90f57a53002d90eb462d5fbc69b2fa88ccb35d8521cd1224e4491928e4c1810a2e7429a6ba6050d36
 DIST pycharm-community-2018.3.tar.gz 310642963 BLAKE2B b32f3c9a3c28bc1ee4658c1ef60cbbe2c4775b310512b3a7fd1b28839bf1c69a566198808b128d18cbbe2d987f61d80bcbcc590177b25d8e9c8fce5fb1754d49 SHA512 00121b4ee9daae92d5c389913f4dd9efcd634f9888b21f6bcae10a3a67cc4bc36a5012590e6836224168053521edf5ba848080f4fc1060df04dc4c58cfdd9fff
 EBUILD pycharm-community-2018.2.4.ebuild 1060 BLAKE2B 4f7fcf4d1ee8cffadac3b12f443783e65409292b46da396d9e7ed5de664c4e6af8275c9091e8c141b42e19d761ebac97adb7ae0fe3a76985164e4625bc67ece0 SHA512 b93caf199b4ba30b5cf1c3dd090acb8239dc75e4a9e449a1a7558ec503bbd31b573872dcf84e37ff54650f43f0e93c09939ddd29141e92857414a2760c804868
 EBUILD pycharm-community-2018.3.1.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 EBUILD pycharm-community-2018.3.2.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 EBUILD pycharm-community-2018.3.3.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
 EBUILD pycharm-community-2018.3.4.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
+EBUILD pycharm-community-2018.3.5.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
 EBUILD pycharm-community-2018.3.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2018.3.5.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.5.ebuild
new file mode 100644
index 000000000000..476b12dea206
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	 dev-python/pip"
+
+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 bc426f63a985..668ce7910a26 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -4,11 +4,13 @@ DIST pycharm-professional-2018.3.1.tar.gz 397871775 BLAKE2B e9f950125c5c1f355e48
 DIST pycharm-professional-2018.3.2.tar.gz 398099987 BLAKE2B 68ec7f409335b5f9f35f623fd962c2f975c6e1fa844b8f142ab3d4604e1e0a1f10c361d95281a414b1e15e60f6dfc0d1b061c1512533d5ce171f0ee34872f538 SHA512 69dd521a44a971f6a5620d879234a7f788ec44a94fd2793df41b8765c5e239ff1d04364172b53750cdc248a945f2f6df02e1b5687c61156286797441ba7fc9e7
 DIST pycharm-professional-2018.3.3.tar.gz 398193313 BLAKE2B 14445d3c3cbd7be865569971d37943caff56a14198c9e81708d692110e4abafdaf10700c842f72f54fe252b2e211b46aa4336f583ae548e0d65ee3ceed4ce95f SHA512 ba8807491a78c0da2e772724c15c9aab6e48383f5407adb98a34d5196e2a1015f52f3eef9fb20c0da9115e3d283ed115663a732fc930cbc2bfc8f63d4ce0af5a
 DIST pycharm-professional-2018.3.4.tar.gz 398325518 BLAKE2B 27ff339d2e8e3db0c94f7a1d8d9e1c740380f62d4b132dc37afb2e1cb4b6ccacdaf29e6caaf25aebd25e650c7a4d1a089b74b3cf1ee8d492722604b11644467a SHA512 34f2461e0af1c18364e7414fe4f92fc34b1c82e17dd2db0c46b812909febb30e9aff26c1c363072f36facb6bbd6d186497fc02b6a7916c808dded63fc7350696
+DIST pycharm-professional-2018.3.5.tar.gz 398296895 BLAKE2B 281fb2c28e556a98e90be37e82fc39d5ed3d50416f1bb519b1a9273880e952faa5a3a85eb1b90928ccb4ad45684fa9be715788ae412b74b4ac287b45bf5458a4 SHA512 2d84368d3058856024f289084d506d92711a369b79d582b9c53b6941514e3089604bac8dc9c5be0a7d15b483bd74e4e1cf2d60cb5f61e3c9755a98091003f42d
 DIST pycharm-professional-2018.3.tar.gz 397608153 BLAKE2B 7130533fb3721d1f573105dec2289091cab23b6438acadda0c62f945e7a9b2a0a55b4d55260e1f472ec77d1fd8dbc9ac9e7f7220ef26424ffbe918874049071e SHA512 0e83fa9117d46a503a3afd790fe2512cf04abc327ff7efdf46e40a24bcd028d6d2033ce56cdb1c4cfd1a8552d7d31af6e97a203c6273a5fd1b79263575fd2ee7
 EBUILD pycharm-professional-2018.2.4.ebuild 1203 BLAKE2B b87a534b51b301a4bce7b3e954daf3637f83708029dd94e2383349e5af411d61fbf6ecbe894b2711a1198e957f7ea8ee4f5fdbd8d61b0ed8df999eb74db7ed3a SHA512 fa3a1e8dc8b969f3b84365200fc6176c6813fa825c692ca6b28743e8b4b653e6efc456013de78463f026099060c74a576d44fe71fff9c6aa57e17410d9577f82
 EBUILD pycharm-professional-2018.3.1.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 EBUILD pycharm-professional-2018.3.2.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 EBUILD pycharm-professional-2018.3.3.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
 EBUILD pycharm-professional-2018.3.4.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
+EBUILD pycharm-professional-2018.3.5.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
 EBUILD pycharm-professional-2018.3.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.3.5.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.5.ebuild
new file mode 100644
index 000000000000..4b028da13f8f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/radare2/Manifest b/dev-util/radare2/Manifest
index d4011249d879..a115dd037cfa 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,8 +1,10 @@
 DIST radare2-3.1.3.tar.gz 6662694 BLAKE2B bb4cec7fd05e4d43473ef2e67e8284c4b6a856ca1ef312153fbb236b800ed3e369ac9833d87e00e2aa5a560c7d8f7f9433d4b8aa9a3f01e7fabe3c26c3f3d60e SHA512 75b4966e8d64ffd341c50b22d12653e4ead23352d25a7a1f923ee6cb177bd0a9a16e7c02cbd5b58cf3da03f415168606cd67ed19f594dca75c66114e9c35903f
 DIST radare2-3.2.0.tar.gz 6690470 BLAKE2B edfa7d03d72ab3b7ebda6a2c860165c0c53836f4141674581c0f5f5cc1d6dc7a4ea48530d4825342268e057aeca458a0883f6fd70fb4a2d5d052634f32555442 SHA512 9773068568cf71797b0c86837188604130ef9d63e7b7fd115820d8979dde37d259aaea45002c9984e8c3599e9bade53720d3bb1b3635bdad5a2dc73aff54f048
 DIST radare2-3.2.1.tar.gz 6690320 BLAKE2B b0c7db6741d463055d054add112a67378f9f2fae34fabd2848bfffebd44308d0e6fefefa6dd7383ad1b508daed8f388a1538debbf0ae4289130b9c06bfd3f3ae SHA512 4f8c64eb02a80ae5e7adce1322d16f08a250be21c674a8f6f0271bfdc8dc41a6f4ef50fef36e012733db5008cffb356489beef9e9b82300372350bef81e13afa
+DIST radare2-3.3.0.tar.gz 6730482 BLAKE2B c6e5ad73d9e34986ba86b73e8410d45c3f99f89a567de85ae22314fd120f358db39a5f8ac9d64af027eb5c7223564d003865f2c8be6ee0a331936e46d02145d8 SHA512 4db9d547b72b952babfd67c8cef2b94fdac9d6fd1194fb50b2ebab538d5bbda0bab4b704d5af64ef684ce9311634c8e04465906a1e7e706b211427054fe0721a
 EBUILD radare2-3.1.3.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
 EBUILD radare2-3.2.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-3.2.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.3.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-3.3.0.ebuild b/dev-util/radare2/radare2-3.3.0.ebuild
new file mode 100644
index 000000000000..0b3f4cfb432b
--- /dev/null
+++ b/dev-util/radare2/radare2-3.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
index 6094ad80bb9a..077a6e588c71 100644
--- a/dev-util/reswrap/Manifest
+++ b/dev-util/reswrap/Manifest
@@ -1,3 +1,3 @@
 DIST fox-1.6.40.tar.gz 4353981 BLAKE2B f024341d12a9ab0e69284513e0500a0448a66f112a656cfbaa700720a4823f8a13fa81752ed90b843eb27f72bd948ea3fd7ab106e9fb57fc43c728aefcfc88f5 SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b
-EBUILD reswrap-4.0.0.ebuild 592 BLAKE2B 464b2ad09bfb917f5b86d6c88331c6b50e332c45e30698b44b7eaa35596a56deba85bcb32a068bc2add3fc2e4829d44e585458a72c6172366ca9035750d6b322 SHA512 c8c18bad64210a5e94deb89421737683d442b55780a3ac29aa6beed25601f70298d58790a287e6cfd6f35443441c6c3178656f653a247fc54f4322fdc4dfe4dc
+EBUILD reswrap-4.0.0.ebuild 596 BLAKE2B b1c0737764d8d9c003c2bbc01fa2d6de73ef7a9ef99daefbbb61fbbf463b470c6f0826fc4ce1706f33ede10c87e8d1031b6d9f791fbea08350c75087c1d690e6 SHA512 e8ddd6f5719265854f033dc1b5e3069927b712b3337b000c72bb8138ba6d696203eaad12076b6b6b2b7807276452362cf6be555f392daa27c6db5be777a8eafe
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/reswrap/reswrap-4.0.0.ebuild b/dev-util/reswrap/reswrap-4.0.0.ebuild
index 35ff5ad583ad..162fda399fdb 100644
--- a/dev-util/reswrap/reswrap-4.0.0.ebuild
+++ b/dev-util/reswrap/reswrap-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -12,7 +12,7 @@ DESCRIPTION="Utility to wrap icon resources into C++ code, from the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 1752ace1c349..b7c48a4f176d 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,9 +1,11 @@
 AUX spirv-headers-Get-rid-of-custom-target.patch 765 BLAKE2B 83faa69afb1a9b60cd7166fdc9d80c207a8f086ac086ddef03c2697025215a1497d07dad28ac9cd7b9c269c4a8e74d684d10550b1f9858afafa3212a08261a52 SHA512 9386f1e5535df5eb1f30dbc053bf047a52f39b5a79c0a8c7c65add87128665e718a97b796f5ca8cdf1fcbeb51f713acb9d63d3ba7015619b20d15b7cddb48822
 DIST spirv-headers-1.3.1_pre20180710.tar.gz 281382 BLAKE2B 9e38c7779af97cae27c595f816d1e1cc99eb29e086dd4b6cb76cb4696f73f1e05f92f022b77639f5a80f517df75996fdbd10d7bb11cc6eccad8144a7b8b776d5 SHA512 5f0c174ea07dccefdd10242f5122e10b11f8975d2fb36f77975497050b10841fcb4a7f19d90c9ef5853a81dabc8d93b91621d07175a1cf3ab8ba7f6c16fe51fe
 DIST spirv-headers-1.3.4_pre20180917.tar.gz 283733 BLAKE2B 6bf0f5c00ae827f8a4b560dcbbe4c42d810cebefe0beecd3e7a022dc1f04bc2ed77f03ec2c0d0e6bf141ab1e4f058362f307c672cf92d83a8d1ceac2a200e659 SHA512 1fab471d07c9e85e75a3de08dccdd4ff7296ffd2cb265cb6cf7038e654c9d2afd8a2ee923eacfd2c47e02c5b139ab49271e489ce1b94f719b063be8910274598
+DIST spirv-headers-1.3.4_pre20190302.tar.gz 333676 BLAKE2B 7ac46ed9d369164d187564e12438001ebc77c912385b4ef8a5de4ff26942f27ce88486f980b69111e804c6aad5a7f4724913833f0dfd6246bf070dc5023df7df SHA512 d1e6ce59764ad03228cc12fedb1e16fca8c3ab5827882e1f3dec9c3d735125dddbd06fa4955ac3358bec2de8211164511e2d16205f175484e070b2bd87262c51
 DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
 EBUILD spirv-headers-1.3.1_pre20180710.ebuild 498 BLAKE2B 991fb177a5dfc150428d0dbaa50ef27a41aebbf445dc9aa9702b9976377f7ee40437999f1786561414c2b8c2a1436348cb1e82d7a6ae05bb371a35255a711af6 SHA512 e43a9fc792aff6fa5a1f07fff4c940d7829d31d80b3a9447a2da3e6a47157dd8d4777a51afbc8dd060c9b76e426fe4154cdf49d19e5a634935ac6ba7f6494d4f
 EBUILD spirv-headers-1.3.4_pre20180917.ebuild 494 BLAKE2B 5eb9e3ae23acbf4a9f3ab2564b383e0178129db9a0c96f20373e39aae677f11c3a52fc9aa0569c29cdfa3a335ce8c47fd9b2a4696371648c058cc29f23674cbd SHA512 b3dfe8c08c5de84569d3fc7f4b8855202f92168edca11a7aa3dbc825f61d25137875464eb0fa5763471f90dfff3bd9e5466198b60c31704ea38a668d57e9713b
+EBUILD spirv-headers-1.3.4_pre20190302.ebuild 495 BLAKE2B d2ad9fdffe7fe4e63cd975c682429c55275ec8205f7872e1d5776ad5088ae3b7ad6a12cecb8d338a0087eb51c8ff1c47650a558e88f96471ffcdeef57aa024a2 SHA512 f662832b9bce3afaeeac7aa11d523f1d518c8cd6da56f9a83cda3565ad67945b666b94d62bdc3de9735c4d4260eea359cea9887a64f4e8b76c4c5357931b3700
 EBUILD spirv-headers-1.3.ebuild 562 BLAKE2B b304f69a8b7445e00fb41e162b84256601db218f3a7efd1ea1938d3ee39738a011de48d5fb099b5b8bbabf05cebab6248f3ac33064535da32520d321b8eab8a1 SHA512 0239f7a19a7b9040c33f9b1d4641f7c2fa866c2e5673da98ed20981a8b79b8af3c061c21c2e127a83a58367b2b487d0ad968352c93686df92d1a1c1c6aba8421
 EBUILD spirv-headers-9999.ebuild 358 BLAKE2B 0121eaa0ea8a1706435efeb1e29f81f471774582c4fe3879b3e2cc0e7e36ddaed830e37526660e976bab9710307e57454d460c8fcac1c4e8b19c91ceaffd00db SHA512 c7f16a3613efcd0c34208e7016696c87c7a6ee7761bf4c153e2ef3c0e8ffae98e4f044edc780b24c387eb8521703e2f9900d17c584b4078bd0e84bf119cd6de4
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild
new file mode 100644
index 000000000000..d87068f988d7
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="d3752ea20886d2fceb6cecda3c2b146a8f22d214"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index eab590bfa86d..7d0244b53377 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,8 @@
 DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
 DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
+DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
 EBUILD spirv-tools-2018.4.ebuild 1034 BLAKE2B 891188fa617878fd86b7847dc32cefeb69801fa89594763b212891018bd0e251fb64401fed9a4520ab82685843916f3b1f4f94017937fc1adaad4bf8bd847bc5 SHA512 78784487fe26c9a5562d8d7aff69b45e40c13b3850319b1f45b48ab84bfdb1ce90ebab3edcc112935bc3a64b63603e8505c2fc3ee7393d5541c2bc2587c51b0d
 EBUILD spirv-tools-2018.5.ebuild 1033 BLAKE2B 43041e0dcf349d1626cf0e247d9078870291527663cf5a689e2a77cf0b5d1b02007534a1a56f7d13fcb39c11c81ad10b92aac7e69db0105f85fae9675c316219 SHA512 06c008fcaf213eddabcd0a507a97219a711c2cc9d0c0b6994a2b8f096894266229732c18625b8d14e5b3f885b5078a1348f496321d08faccfc7ee1cfb3929344
-EBUILD spirv-tools-9999.ebuild 989 BLAKE2B 7eef54cb0af6249e2d86ace4ed2eb5cde0b23f46987c08b04bbf032363f3cdaeda5daf231bc3457282dcd4c3731b9a2190396de481bc492bed8427ac065d8625 SHA512 7c30383d141631e25430f6148d0bc6c816447de8c6b202279b0fb0a276621dae12c0fbfd227d83d2d2b28c33c8eb4ceb83e37fada15165cabc2b640974c5cab9
+EBUILD spirv-tools-2019.1.ebuild 1034 BLAKE2B 05deb016aade08af27d23eaa13f07557294cc8dc51bd287224216f251911dc1c4c38943a2ce99439c5c4530815500edf570e15c4a810fd15978d36a388be9e19 SHA512 8f5fb33de2e5e6585a52f00d2d21ea22646a4a633547d08160bd5fb836035865452709445ff0adcafa9e2e9fa11b747fbc4ae6bb4531622caa4e128110e3b720
+EBUILD spirv-tools-9999.ebuild 989 BLAKE2B 339235087f10627cde2be63c6183ccd4c8466f495f2027e84be6970a88356aa9da65276969abf792d1adfc201935542e6d96a73dbaefc0e07f190ccd1ad2d00b SHA512 9e54b8ddf9a38a6e5dc6d5250be45cd5fedd80c3035cc71cbbd07d26bf737a36128eadbd644bb6e7bf8331e1ad73b9e6adf5b56cc6702138c8e6bbff8ce47356
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2019.1.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1.ebuild
new file mode 100644
index 000000000000..d59ad889f8bd
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2019.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib cmake-utils
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
+EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3"
+S="${WORKDIR}/SPIRV-Tools-${PV}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
+	insinto /usr/include/"${PN}"
+	doins  "${PN}-commit.h"
+}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 20c4b28437af..1df290d2083c 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="0"
 RESTRICT="test"
 
 RDEPEND=""
-DEPEND=">=dev-util/spirv-headers-1.3.4_pre20180917"
+DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 331e634fbb07..3c0ab28493b6 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,5 +1,7 @@
+DIST vulkan-headers-1.1.101.tar.gz 556510 BLAKE2B 12cde0e5fe17e4119ceb87d5e58c0147f128af0a435d8be1c0a9fe862c68c59df6ec1ff77b62b07bba4792c3f70c30f172678e60707dc46a53c4037fbdf40dc3 SHA512 36fc1059a50c8f1f66f2f79c1e8058d26a30a2083b1cb431536b476f8e4a6edbcac56a99a35accd20a6e19471f86940d9dd3dfc9f0940be212b36400bd0ed394
 DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
 DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
+EBUILD vulkan-headers-1.1.101.ebuild 720 BLAKE2B 911e969cd21ba62b1f60c308577fa59dbd8640a4f3f592f6fc7c82e510d6776e923baced37b8f435378f3384356da51bb83ce6bc70a1133874279770c9e39c58 SHA512 6420dc1b7fb3af12ef08cf5cbe463da81d0e0226fda809f6505048298abb776557fb07ee7153d802976610dd356f3df750d8e2177b745ec901b239bab0a292d5
 EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
 EBUILD vulkan-headers-1.1.92.0.ebuild 719 BLAKE2B 96be71fd80089081a6b2f8b1bf2de8a470029654125df7655fbdbd66ac824d411b57f5deca3196b5d18e19b322f3b92227f5bc2a6f99dcda26376b46cbbafd90 SHA512 bd1a2273d4191b60a46811f74073310618933339305aa81bbcce08d9a54880c85fdd18e44ed4f68042fdf76b5455e9bfe27976abaf58c077bf0df671daaa37c2
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
new file mode 100644
index 000000000000..04a94c22d5d3
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="8e2c4cd554b644592a6d904f2c8000ebbd4aa77f"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 8f51ef57f841..f457c3f2c283 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,8 @@
+DIST vulkan-tools-1.1.101.tar.gz 351619 BLAKE2B d00a8adc687c6ac513748fd706b7167dd6e929f37ed2315b8c5e7f302976625848e9ad383261e8948adfc6926247676ccec2b6c8143d23343c4022f3a20795db SHA512 e4f5c3236eded7c17f381a9d6cdd20930444c486d0c8c3aaf67f5a46b3787643517e29d3d5d7305e72a60450b0e73daed996a9336a4166ab5241585e85190387
 DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5
 DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
+EBUILD vulkan-tools-1.1.101.ebuild 2200 BLAKE2B 0e9bb2e475a3dda73b3e2f196ee9575accfa54bf483e43a854f9083723fb32b7ace0cc1ca97cff4d3cd30274cdf67cc13ae5990e83e635af0e5263b3e62b004a SHA512 fb5cd9bdd0162d674f141f1ff5f01ea5888e5e03b4f03ded62f78a4f47a26b567a7365f75d0ec3c63e337d9e1447541632660e06816ced904b8b5c82dfb8e059
 EBUILD vulkan-tools-1.1.82.0.ebuild 2570 BLAKE2B 5e4807b5921e8883b183b97f9e0ee093d75fa5b71e4039e608823276db6440cd9e6f2168532762a513115ce6768847f04a3f5a544a0fb0ea88f519a554002d06 SHA512 0dcad5bd9b43b807c1e2622a003cb17de07ac46d0df1fa4510efdddd662e05894d7d379f21ae0aaafc6128f0629e859f2b8c911020371699dea2948e63e1a286
-EBUILD vulkan-tools-1.1.92.0.ebuild 2267 BLAKE2B b147cedd8c564ca9572b531743d28d00c630966c9d10ad09e4004a0b718af4259421b0d436152925862353ffb0d6e0f097400cfa3313f95e63242867e809c036 SHA512 7d8ef8cbb05901fd4ec95d884d98bb404d2e4b16208bc51d03d69759bb1e350689eedd21d4e599638a33e5e80c7866cb2d2324cbb06e895c3cb29dda6159e596
-EBUILD vulkan-tools-9999.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d
+EBUILD vulkan-tools-1.1.92.0.ebuild 2199 BLAKE2B 0ab17921ca1bdce82e1e506514e1bd0c9cebc9248cc5d1d7fe13b2f6b33c0af94d801d66f2c872e0e6f2678f618e9ff990db3f634971023aa77a2c25d9d05219 SHA512 535d82546f589843880b741df3844ec5b88e25690d8da110379a46d3c79cf74ada8ffdfe7becf86ab465514cbbb0170d533c17cbf5335a5844631b1a4bf63db3
+EBUILD vulkan-tools-9999.ebuild 2200 BLAKE2B d924055938b632919d81de174f0d2ff5afe1fc5af9a357392d4e626efadd01b2e6a900839416d4e6f7566189ec0c7d7e4df23fbdbd73c4ed6c98873ec1dc45f5 SHA512 e0216a51be8082952aa2abcd492fa9144930f2a4c6ac56dcaf737a9ec977df521e736e9965b9ebadb383b169ff4406e576cce380c32a39f485542dc6327ac4e4
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
new file mode 100644
index 000000000000..7c544ec45b97
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="35464647e75e0385973664d8443a6c000f1c292d"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+cube +vulkaninfo X wayland"
+
+DEPEND="${PYTHON_DEPS}
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+	dev-util/vulkan-headers
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	   )"
+
+# Vulkaninfo does not support wayland
+REQUIRED_USE="|| ( X wayland )
+			  vulkaninfo? ( X )"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=()
+
+	if use vulkaninfo; then
+		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+	fi
+
+	if use cube; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/vkcube
+			/usr/bin/vkcubepp
+		)
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_VULKANINFO=$(usex vulkaninfo)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+
+	# Upstream only supports one window system at a time
+	# If X is set at all, even if wayland is set, use X
+	#
+	# If -cube and/or -vulkaninfo is set, the flags we set
+	# are ignored, so we don't need to consider that
+	if use X; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="XCB"
+		)
+	fi
+
+	if ! use X && use wayland; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="WAYLAND"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
index a23ba1cb8bfa..f780cede7c81 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
@@ -60,7 +60,6 @@ multilib_src_configure() {
 		-DCMAKE_SKIP_RPATH=True
 		-DBUILD_CUBE=$(usex cube)
 		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_MIR_SUPPORT=False
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
@@ -76,7 +75,6 @@ multilib_src_configure() {
 	if use X; then
 		mycmakeargs+=(
 			-DCUBE_WSI_SELECTION="XCB"
-			-DVULKANINFO_WSI_SELECTION="XCB"
 		)
 	fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index d3d1c9c446ff..e7562a4d6835 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,7 +60,6 @@ multilib_src_configure() {
 		-DCMAKE_SKIP_RPATH=True
 		-DBUILD_CUBE=$(usex cube)
 		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_MIR_SUPPORT=False
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
@@ -76,7 +75,6 @@ multilib_src_configure() {
 	if use X; then
 		mycmakeargs+=(
 			-DCUBE_WSI_SELECTION="XCB"
-			-DVULKANINFO_WSI_SELECTION="XCB"
 		)
 	fi
 
diff --git a/dev-util/xxdi/Manifest b/dev-util/xxdi/Manifest
index b956dbaf0924..50533c37026f 100644
--- a/dev-util/xxdi/Manifest
+++ b/dev-util/xxdi/Manifest
@@ -1,3 +1,3 @@
 DIST xxdi-1.0.0.tar.gz 8039 BLAKE2B bc881ea566e5f34f03a9c9f2adb42294cf75fb5f663537491a14d393d5e55ba571afe211277bab2f5dfb3128f98b20832430295a71cce255b0196e2448a0b853 SHA512 ebf026f61f0b0a339e3dfa5c9dd6a819ef23f0d29948073cbf5f6ae9668e68a7dd903f695ab5a824494f8424dad8b79aace5742bc23484a25303a15aa32ab698
-EBUILD xxdi-1.0.0.ebuild 524 BLAKE2B df32d03eeb37f01060d9fd573d656ad23ff05ec8128203859b6e80bc6eb5ad0803c934b0f8f567c6220b8884b845bc3d4607d6045d8df37804ced92a9a78bd7d SHA512 fb0557381100c993af68928e186c007f216ea0eb1a9ddab2b1f6da3c8ed6ee9ff502ab555d8d40c9be4a08870e7450f363775b8abbaabd99632fd44839213d21
+EBUILD xxdi-1.0.0.ebuild 528 BLAKE2B 3aa5cf9a1d3169924fbf47d208975803111f949514d14eb603299fe22ab6bfc4b5f479c86ef7bec73e09b529158abdca4be3ede0a0787dbae668c928996657f6 SHA512 41c0b50fc8af228939ea9720a9a644370a2cc4c5a7ad2b8f8e9a5daf10cd5a9c841d1070c4f0aade736715fdcdb044708b7ca924571203ebb2466a82f202d4d0
 MISC metadata.xml 725 BLAKE2B 33538c0cfbeba53623ea742ff310ec5221ba0eb344a000029d65735dc86b968e5d769c6dc80220a02607c80c08b6dd3c65adfb6b4d395d50fe0893b99f4d98e0 SHA512 e123546a703ba283f8f4cebdf737d911d88405fd7a36b991939497891eef66ca2253711dba21b67a3ce58bf1fadb21054c20464c05e2cf42295cd1eef8cb6626
diff --git a/dev-util/xxdi/xxdi-1.0.0.ebuild b/dev-util/xxdi/xxdi-1.0.0.ebuild
index e5a189229eee..b67be9f6790e 100644
--- a/dev-util/xxdi/xxdi-1.0.0.ebuild
+++ b/dev-util/xxdi/xxdi-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gregkh/xxdi/archive/v${MODULE_VERSION}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /dev-util
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)