gentoo resync : 05.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
commit: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree: c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-util
parent: 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)
136 files changed, 1991 insertions, 2380 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e3d0631b32e5..9ac452c4c3f6 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 1e5502f9e8bf..60be34afe686 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -28,5 +28,5 @@ DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B
 EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aedb1f44b173df943b2edcb96f7d90384658c6689925e06873c3d5331c20f360732860f70e0bfecdb0d5518dfbb9d90816b671 SHA512 3659aca002096aa11dc94631de73f1081cda5a5728f2842aa767844b6b3e12e0bdcdd0abbc2903efbb1d9f11666e7bd392be694910ffae58fce1e8b52a8cd090
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
 EBUILD android-tools-8.1.0_p1.ebuild 3967 BLAKE2B 8422202a62ce921579811894675bc77d5992cfa42d39808954279ad12795a6099bba2a16f4e97b796f3ea07c224bffe3255c38ce53f4bf3e7ee867eaa1faa914 SHA512 b9660d621cb71dd1df58728fab9f71c92a802ad68bd1105d899f26c1d44891b9ddabc7dd7317d04e8d2005981cc8132160deb4ee8cca0e56247de2bc34032232
-EBUILD android-tools-9.0.0_p3.ebuild 4515 BLAKE2B ed27c6565d99553fb65df5586d19d50976ea3c60eb777884edc35ea04d819df31ae69a4b8d34caf63a3142e7f5217aa98eab34e628eedb7a1f13c24e58a0c069 SHA512 378af7dd0116da202901f16a6db32ecf093eda729a2cb1f29e79f7aef7a0d6214c59415d8337b6500fcd7978de60c5400fcbbeebefaf1f8eb78716430482ce27
+EBUILD android-tools-9.0.0_p3.ebuild 4513 BLAKE2B 54bf658dde5521394d9c41d62368055e2648202d3ff63af5f99adff3a0545cad7ff55920cfe304c2b124b02a47fd5c61956c058f3ee6c5ffa0c03dfb5fcfc775 SHA512 c321e3cf94a12148ece9a7f8143d404fb65010ad0df9dfe8bd0b6372525f3e80e563b2434e254fdf03cf317c80747d56207e75b22e445c19d3db668774050993
 MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 5a8c4c5ac0ce..6a157340caa9 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.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"
@@ -29,7 +29,7 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ff
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~x86-linux"
 IUSE="python"
 
 DEPEND="sys-libs/zlib:=
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index eab0d171ad46..5519e968b833 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,5 +1,5 @@
 DIST anjuta-3.22.0.tar.xz 6363016 BLAKE2B 8b02f3dc0f97d0e195039cfd462bb6db64199c92d689fbf751e8a88141f65a4dc604bbf848342d73e398ba755e89b3d934df375aad50c9cee12c38df8a8c2d9e SHA512 64689392bfe6102698ef8a1ce62aac37bffd793b917ef6ffc53cb5b8aa9eb5b8961a999c32db559e9e348bcf46a7ec0ca9448100910b52885ddff898a62f3295
 DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
 EBUILD anjuta-3.22.0.ebuild 3520 BLAKE2B a537f055c2f8fc5f5411512ad248abcc3f5af309617d09f3d0191481ddea3802a60ab27b06a3e2ff1c6e93879692d3ea2f43ffcfe132d6b2d1cc1dd3f4fbc1ba SHA512 5e19000cbe233a2688ebc24afd74f761b6395576b5ed3bf83f3870cfa7a855d10650e447853250a93ee2c9c1b366291a1240998401b7c7f613ab5816befa7530
-EBUILD anjuta-3.28.0.ebuild 3572 BLAKE2B d69d7ee46afa8a95980c795824090afa96f4d5b3778fe7a9d597be41001b8c8ea8e68dfd63d8aade4ca8c5b467d93a22f32e495fc5979d6e5cd29a86e5626f5e SHA512 d1668c8f3b3b5f9bf2b1fa056a470cef0c68e74fa3287a40348e1b84705c52f6718f02e2db9e3058832939f306e2e1d3efe38b8b81fc254cdb7990242fc7171d
+EBUILD anjuta-3.28.0-r1.ebuild 3919 BLAKE2B 9e3f6006eac5564ba10993aefb4e819657d3cb367dc732dfbe2cfab64d590b0471ebed6b0d56aea4061aa0dc5f58a10740fae1e808231609b5985ed019aa9d26 SHA512 ee471b71e40d15487106e515a5fd43d2330728a033d8cce29f6bd269b212abf15c5792205c325a0db45f36bea428209d6e201d45e66544f510b4272b3eaa0276
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.28.0.ebuild b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
index 998c1d399632..bd7857ff3ab1 100644
--- a/dev-util/anjuta/anjuta-3.28.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.28.0-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
@@ -6,17 +6,18 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 # libanjuta-language-vala.so links to a specific slot of libvala; we want to
 # avoid automagic behavior.
-VALA_MIN_API_VERSION="0.36"
+VALA_MIN_API_VERSION="0.40"
 VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
 
-inherit gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
+# We inherit autotools explicitly because GNOME2_EAUTORECONF is set only conditionally later, so gnome2.eclass doesn't do it for us
+inherit autotools gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
 
 DESCRIPTION="A versatile IDE for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 
 IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -87,6 +88,9 @@ will need to:
 1. Go to 'Build' -> 'Configure project'
 2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
 'Configure options'."
+
+		sed -i -e "s/\[0.40\], \[0.38\], \[0.36\], \[0.34\], \[0.32\], \[0.30\], \[0.28\], \[0.26\], \[0.24\], \[0.22\], \[0.20\], \[0.18\]/[${VALA_MAX_API_VERSION}]/" configure.ac || die
+		GNOME2_EAUTORECONF="yes"
 	fi
 
 	# COPYING is used in Anjuta's help/about entry
diff --git a/dev-util/bingrep/Manifest b/dev-util/bingrep/Manifest
index 65fce7d98cb2..5bb55846e819 100644
--- a/dev-util/bingrep/Manifest
+++ b/dev-util/bingrep/Manifest
@@ -4,6 +4,7 @@ DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483f
 DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
 DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
 DIST bingrep-0.6.1.tar.gz 614424 BLAKE2B 5a7f8378f8508a455ae6a877dbb2e2645ee605225e2ae6e7718da19fd5827155e9d101fc585c4ea54abd59cb22e936208f065f63467072eb693dfdb780651924 SHA512 919302a95003094da872eee89e4e142ed6f3edae593cb69ca85c3f0b61afd5cbf09479e84271457594fbbeee7042138039be21298f0b1ec7fbfc1c83c7f3ee1e
+DIST bingrep-0.6.2.tar.gz 614426 BLAKE2B bf3376e76eda2c40fdf24aec03c5001f02a310ce4b9eb1a8d312eba5f1f7694dad20938630548ca1106a55b251849f6c7db7eadfeeebbec95fb0101410806ade SHA512 3919012d376c9890e1f39610536993c089f9b04f59becc2c14323040eb04a4efb44184fb3375776826bc1073aa8449b90bfbd177e5141411f330602d59ecae13
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST byteorder-1.2.6.crate 19985 BLAKE2B 717b3c7a497fc1624a32c38a2f1a5ab48ac76ab996e2b7170c9a295002a64da05538489d7e497d88ae13b66c2d4911daff8840232d4201cef3d26f4e30cdc820 SHA512 7106b5404a213b080a231c4bcc3010caa2f2743a0d0b64553e0c789ad849970ce1fb547b330711d03374cba5a7ff56b728f5259d0c6fe7ac00c8c13324503dce
 DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
@@ -14,6 +15,7 @@ DIST csv-1.0.2.crate 888793 BLAKE2B 12dcb63b31e8bbff21120288b1f8db8c036e83a9f82b
 DIST csv-core-0.1.4.crate 25406 BLAKE2B 10c6493da7d9adf53fdfb44b7e8b229a40beb9dbb882053d778ef8b54d90001b7592fe6b9e9dc5e48e3f113e55ec01fb05d1399b133d9fd99078b8154ba7fbe0 SHA512 c2e5291489eb1d1c192c7d94cbe8be3c6bcf0a5d8ef2bb525ccdc20a9c512e3a42946241457de7ba219b59d330d87a2ce51995782621e6c1d4192e2a71e888f6
 DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
 DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
+DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
 DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
 DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
@@ -73,4 +75,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD bingrep-0.6.1.ebuild 1830 BLAKE2B 5cf7fe1eb18af77bcf40b1f10fcceaba97aae5ae748f4dd1ecf6cf6aee122b828bf82fb7556d23195fb8e06e1934d8103ecc69fc1d8d02218779f8d135814a66 SHA512 863d188121d89238c68ce88c70f8f099c3574727a3f57f95a946d633f6f7fa9c4a1ed4f582e5426951d8967cc118028e4119b7d503a771bd55ac77624dd5278d
+EBUILD bingrep-0.6.2.ebuild 1829 BLAKE2B 0567059c90846f6cc118a16a2a7bd09fcf30a80bc829e526278a08d888356fc8a460b4d4248456f601fc6daad0369e635a23828f653f6e6954066148ab93db91 SHA512 68cad8bff4b11c5b73b89c80487c0acde87c7a2bc4a69ba679ace29a29b07321f5ef09c933a6c654a4f509aba5092b978fbe2f58050ec65b4bcc15069ddb242d
 MISC metadata.xml 721 BLAKE2B 1033916ecf17446ce916c89c370bb7784c0547427b14f7cde6288f1de1bc883d04ca19bd31170308c8046d236ddacecf933b44f4cb33709327a6f2e4fe122aef SHA512 14014259f5ae3080b1362d2f73c7216bbe03321d01ba228c38e81262e9678b1056a13926515ec9f27a892335975eb7e591e851c03832a31f46449a5edb380ada
diff --git a/dev-util/bingrep/bingrep-0.6.2.ebuild b/dev-util/bingrep/bingrep-0.6.2.ebuild
new file mode 100644
index 000000000000..03f8b7145858
--- /dev/null
+++ b/dev-util/bingrep/bingrep-0.6.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.8
+ansi_term-0.11.0
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+bitflags-1.0.4
+byteorder-1.2.6
+cc-1.0.25
+cfg-if-0.1.6
+clap-2.32.0
+cpp_demangle-0.2.12
+csv-1.0.2
+csv-core-0.1.4
+encode_unicode-0.3.5
+env_logger-0.6.1
+failure-0.1.3
+failure_derive-0.1.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.2.11
+goblin-0.0.19
+hexplay-0.2.1
+humantime-1.1.1
+lazy_static-1.1.0
+libc-0.2.43
+log-0.4.5
+memchr-2.1.0
+memrange-0.1.3
+metagoblin-0.1.1
+plain-0.2.3
+prettytable-rs-0.8.0
+proc-macro2-0.4.20
+quick-error-1.2.2
+quote-0.6.8
+rand-0.3.22
+rand-0.4.3
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.5
+regex-syntax-0.6.2
+rustc-demangle-0.1.9
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+scroll-0.9.2
+scroll_derive-0.9.5
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+strsim-0.7.0
+structopt-0.2.12
+structopt-derive-0.2.12
+syn-0.15.13
+synstructure-0.10.0
+term-0.5.1
+termcolor-0.3.6
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+theban_interval_tree-0.7.1
+thread_local-0.3.6
+time-0.1.40
+ucd-util-0.1.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+utf8-ranges-1.0.1
+vec_map-0.8.1
+version_check-0.1.5
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-0.1.6
+wincolor-1.0.1
+"
+
+inherit cargo
+
+EGIT_COMMIT="9b29a829bc41bbb9c8ca2d0ecfef8472e7aeda81"
+
+DESCRIPTION="Binary file analysis tool"
+HOMEPAGE="https://github.com/m4b/bingrep"
+SRC_URI="https://github.com/m4b/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+QA_FLAGS_IGNORED="/usr/bin/bingrep"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index d0120253ffbf..7630aab1bc2b 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,6 +1,7 @@
+AUX bpftrace-0.9-llvm-8.patch 1306 BLAKE2B ef6c7cfd58f6683d3a234fef6a5aae6a8136b04e1ee5c14db76c62490f6b487ddb06465be16df4fda7cc92e2cfa1d97129e7e1e852a26468e24f8059314f13a6 SHA512 4067aee17715312cf49dc3510754d6aaaa4dba25dfb802dc434d068bf5f35135aca2c107b2463044e5f88890ac20c1ba97eff604616913f5246c57eda3aed7ee
 AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
-EBUILD bpftrace-0.9.ebuild 1190 BLAKE2B 54b1634249e4594ea5115c87047e74e4f73c1b48e24f51292ed8dbb5f554cae84c8d18f70e1cd1c73b9f3120c670ecc94833f7d7f62c3efd4a43fa8c8b6bb783 SHA512 6a36f394710b5c027b0ae6b040c956e4891c17294cbb1e913152a592d46b1b694fa3dbf102ab8e555486b165764e0c7cf30fad79f8663be9b1d7cd3b1040ca3c
-EBUILD bpftrace-9999.ebuild 1233 BLAKE2B 493490aea8b690eb3d86ad875462602b40552a9ef4713ffcf733550bf30fd6b16f33b8847f670e26c3c2245b2a5f10d888bcfaa7869b868cb126d428994f6e88 SHA512 355f550827610fce8cf8a51561bdce9b56e5b00f5d49c5b0d31dabe93307be754011d93d1ad9cbe2f140950d51d9f9ec77a44ab9fa8130c863b598eb98e00e9b
+EBUILD bpftrace-0.9-r1.ebuild 1250 BLAKE2B f3a2f791b7bfaf774e64361192edb2d0856d2ed5a31c36e517840fa873d8e244c9bc9836d4a2fa4d520e18ae2a1873ec6983f4d4f8e24b58dda36a5c44b11529 SHA512 5dca810b91e946c79ee251ff572f54bede05d56d0c5f593af0d3b7fb6b93d9fa634ad06704e96821ccf6d12cece76bc2abbdaaa8ff121b8afc99582e2f28acf6
+EBUILD bpftrace-9999.ebuild 1250 BLAKE2B f3a2f791b7bfaf774e64361192edb2d0856d2ed5a31c36e517840fa873d8e244c9bc9836d4a2fa4d520e18ae2a1873ec6983f4d4f8e24b58dda36a5c44b11529 SHA512 5dca810b91e946c79ee251ff572f54bede05d56d0c5f593af0d3b7fb6b93d9fa634ad06704e96821ccf6d12cece76bc2abbdaaa8ff121b8afc99582e2f28acf6
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index b483aed0116a..393a086df3b7 100644
--- a/dev-util/bpftrace/bpftrace-0.9.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="test"
 
 COMMON_DEPEND="sys-devel/clang:=
+	dev-libs/libbpf:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
 	>=dev-util/bcc-0.9.0:=
 	virtual/libelf"
@@ -38,6 +39,7 @@ QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 PATCHES=(
 	"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
 	"${FILESDIR}/bpftrace-mandir.patch"
+	"${FILESDIR}/bpftrace-0.9-llvm-8.patch"
 )
 
 # lots of fixing needed
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 1f874815e93c..393a086df3b7 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -13,8 +13,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
 	BDEPEND=""
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	#SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	BDEPEND="app-arch/xz-utils "
 fi
@@ -24,6 +23,7 @@ SLOT="0"
 IUSE="test"
 
 COMMON_DEPEND="sys-devel/clang:=
+	dev-libs/libbpf:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
 	>=dev-util/bcc-0.9.0:=
 	virtual/libelf"
@@ -34,10 +34,12 @@ BDEPEND+="dev-util/cmake
 	sys-devel/flex
 	sys-devel/bison"
 
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.9_pre20190311-bcc-0.9.patch"
 	"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
 	"${FILESDIR}/bpftrace-mandir.patch"
+	"${FILESDIR}/bpftrace-0.9-llvm-8.patch"
 )
 
 # lots of fixing needed
diff --git a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
new file mode 100644
index 000000000000..14d6a167a863
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
@@ -0,0 +1,30 @@
+diff --git a/src/bpforc.h b/src/bpforc.h
+index a6ee583..8d0e579 100644
+--- a/src/bpforc.h
++++ b/src/bpforc.h
+@@ -80,8 +80,13 @@ class BpfOrc
+   ExecutionSession ES;
+   std::unique_ptr<TargetMachine> TM;
+   std::shared_ptr<SymbolResolver> Resolver;
++#if LLVM_VERSION_MAJOR >= 8
++  LegacyRTDyldObjectLinkingLayer ObjectLayer;
++  LegacyIRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
++#else
+   RTDyldObjectLinkingLayer ObjectLayer;
+   IRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
++#endif
+
+ public:
+   std::map<std::string, std::tuple<uint8_t *, uintptr_t>> sections_;
+@@ -91,7 +96,11 @@ class BpfOrc
+       Resolver(createLegacyLookupResolver(ES,
+         [](const std::string &Name __attribute__((unused))) -> JITSymbol { return nullptr; },
+         [](Error Err) { cantFail(std::move(Err), "lookup failed"); })),
++#if LLVM_VERSION_MAJOR >= 8
++      ObjectLayer(ES, [this](VModuleKey) { return LegacyRTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
++#else
+       ObjectLayer(ES, [this](VModuleKey) { return RTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
++#endif
+       CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {}
+
+   void compileModule(std::unique_ptr<Module> M) {
diff --git a/dev-util/cargo-tree/Manifest b/dev-util/cargo-tree/Manifest
index d85da5a47006..8fe215229f36 100644
--- a/dev-util/cargo-tree/Manifest
+++ b/dev-util/cargo-tree/Manifest
@@ -1,4 +1,5 @@
 DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
+DIST aho-corasick-0.6.10.crate 26122 BLAKE2B 752eccb2fbf36fbc73b8694033d2f80f6ab6d2a8c2ae023329b90bb252b537adb1e80a604b4266bfb1ccc2963fcaa6579be48ef011c9728734c7cb77fa3eab99 SHA512 4a21b0e68c416e5dcfe99ded917577abdbe7c92e50227b7906a2b3bd25105f8e7d03103514d388171a41090cc7bcb63bb5b4dc3c6847a9b4e09bb3856a1bbd9d
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayvec-0.4.8.crate 24260 BLAKE2B 0445e8cbbe7781fe7890dd98d46bb4451de8441fdb99b74b9f08a6a93016eb8c94978f2bda263c6f2ba6d4ea31176446c0bba43f5cb12ea644289fd4568007fc SHA512 a20753d9b9ff320162f9d02f72d2756ed9e85260238e43c0528889597016525c4bca5ebd57f9a5c63727cdf707a3e3631f83401ea565f64e55208349785c625e
@@ -6,18 +7,24 @@ DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483f
 DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
 DIST backtrace-0.3.12.crate 33665 BLAKE2B 860f98231701f1e75a414297e663df48de739ac5b75f049831a77884ae11df499957c599ec66c8f92c41654c436117a11b92829b095c62eeb721962ddbf5f1b4 SHA512 40e5aa214691f9c3ea5a609b96ea364d72b7a1596c42f74777ac5906cddf0207f591922ffeb53ffcd62e47d3f296daea0c93b469ee3426cf34866397dc40f47a
 DIST backtrace-0.3.13.crate 34101 BLAKE2B 853f1527736d049559688f4ec49a800f0280c11ad24dcb88b7fab5a18c777f39e0307061c107d4b1d60d52183aede3db7b8f7145ad1df50d28dd13929dbb38ce SHA512 434037b8b9bae57bbc788d5db05d02464cab8aac92be1bee9636aec17b02f14110e7d6bcf0c529ce5ffbf632c2fc939fbcd96600bd90656ac489c1ccf1e8e439
+DIST backtrace-0.3.14.crate 33452 BLAKE2B a3177739d2d2877a5b0257636b6a14b1fdb7aee440fbbafb9602a199b09b73702132e99bd4826245371f9a9acf33739dcce9b15e7ab6be4c29e0c30ed2b6a9b5 SHA512 6ed74aaa996c30b7d97e2eee2aff72347ed3d26d6f5e9f5af4047dcf13170fcd9ea8edf7e44134faabfa34d41de0700f8c4b814f81e8f450729ef5db2d03a435
 DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
 DIST backtrace-sys-0.1.28.crate 522603 BLAKE2B 6150bee74264cf2383aa27cd33b28790b3c70da0c21c327dbc4af628b5f12afe941c1f3ecbb556f8dec5638b6be29f5db3867514417b267d7099202c5ea89f52 SHA512 4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
+DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
 DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
 DIST cargo-0.32.0.crate 825669 BLAKE2B b3d1ae376d5c4438e1f2912dcc242e61f52633dfba0f8ace9ee4646ff8a49c1ad02ed4feb6d20ed303fc6534b937b2f4095ded193c014c1b6e1035314ff9dc0c SHA512 fadcf5e8f830920de1fdc0a6dc061d22616d98e2ddb7816ddc219bac4d51fea70ea249f3779d86875e4e5ef2b4d5b84ee64ccef1e816ab6db0f9088539b4a80f
 DIST cargo-0.33.0.crate 836765 BLAKE2B 78a06124ffb1d34bde2bc465093cc045a7a3e3c271ac6098ed0f4c0c129d6055d125f837e1a9ea19830cf3949f9f78381a9964a8df0d17a5cab6abcc70638c33 SHA512 00170f3d89b10a9abe8a5aa17bcb2ece4dd3aba15e86c01aefeda3de12ec5fa26041a1fb5ae27ea5fb15d2db80d9aebfe268cc140019b0d500a1dd0a7a1e2b05
+DIST cargo-0.34.0.crate 919411 BLAKE2B 6862f5a35e50aa6d81059c0628aa8587b80f395f1a32d2dfdd9479c48be32ab0e5bbb062122e230c706402e49d6bc13f07cf3d28b38534c99d7f120b0c8d14b4 SHA512 9490748eb6ddaf120e67acd6642433b2626b114a2ef127cbb1e0feb49546983d91272ddff432e7d9ba5e271b56d8fe842d7be058f8edbcfcb5a82ed4030d8e2a
 DIST cargo-tree-0.23.0.tar.gz 23212 BLAKE2B 464936a2ac923600dadb282077e0d7a792f03da796df56d9360ce5a6340a1397fa2f9f314d677c53c27bb43f39c2619d70b5bd17ffdae89ac67493eb526e05fa SHA512 aecb14738f97b75123412100c1e4a0e0bb073070b25c13d2a002776bad4710ccd0cb1e863283e3aaffac4124754be76aaabf4b5e88337fbb579202351b60391c
 DIST cargo-tree-0.24.0.tar.gz 22603 BLAKE2B c0cc265e9dfb02dd8c14fc7944d2d6096b7a48a39b79d04dc70fddc31a0c65dcf52f9a4e3052def20953bfb57ff229ab44f252b90cefdf9c3301fd6e47df3b17 SHA512 ba4f8d01ff3c47632c54f81731ec35fa9b5afb2df5c1866ae730c981164f18579a803c2917bc1f327dd21aab39310d99854d7c2376c604be1b252705853045cf
+DIST cargo-tree-0.25.0.tar.gz 22695 BLAKE2B 04ebb2a2175ab5b4c714bf81326509b2d256955165aaa89b08effbcd1c88e7a1a61e04538e335d15a5e4d654e030588ffb16054b59a44d756ea2f52ec0305b2b SHA512 7162eb1dd33e8e4b1d374b2d83a4a350999375c932dcd5d0ab88fa704d5e4f2cf8366de41e1a48ac9f7200c8e0972715ea5c36ab0f0df65447d7b98aa0f9b265
 DIST cc-1.0.26.crate 42350 BLAKE2B 3a31535c6168036179930c8f8a4aab0a52632d733c9e0b54fa8d1e8a5d6c426ffca4e7da55bf23ea9fddb7ca72e6894a1f6a8e9175fc4058a37b7a181afd7bc4 SHA512 f4ab851d2aefce6d9e6b08b2af99e7b6c63238c6ef931d3f7872d79edb139f62627911335b62e8ef0c62f54bec65693a97411487af449b1f750a5b6652c785f1
 DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
+DIST cc-1.0.30.crate 43009 BLAKE2B 1fed399a931869a1927caf1a572ec04fd30ad1bac18478c2e329ab67c0028182e6d3f9c42926042ba041ace8c855b41f7ae8b14cd11f10fbe22da08d7472c802 SHA512 3ca9759808cddecc011ba202c75ce65f338568d5254b10f5de091829aeadc5acb9d2fd1d0da8411ce9c93cab7e8a84de5bb3e8045cc1e3459382e8fb2f83e307
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
@@ -26,6 +33,7 @@ DIST core-foundation-0.6.3.crate 24267 BLAKE2B 8e7ca9a19db4e51aed67df420ed50d409
 DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
 DIST crates-io-0.20.0.crate 7996 BLAKE2B fd60658cf2822132815bca3b63e39b12220cdd3a82f519f4df65fb617a752d6aa885b378dc11d8a57ecb297f07f2ecd4825e75e1fe69ef84bcea76955f97b04b SHA512 2d9a9101ba9a1034a98a446c75f2b43a08de96d7acdc4fd64f37ab24090af044b5d6a9cb0350acf88b86a9251715d46587d41cd80cb77b0439902643460a9736
 DIST crates-io-0.21.0.crate 8009 BLAKE2B f640e0cef1cb1b06624d4b2fe1961341a2ea8245847b97501c8b252bb2b62ef3003688c15291c91ec1f07799c8125c48af06d6eddf4e2f6992c3cd3eb7def994 SHA512 977c874aab867255950096445c069823aedadf4de3b1433f186c059bf3d00a2626be2aafaa8a7b5b9399ef9f8636be23043716e6d0d1861a17c60b62a5222318
+DIST crates-io-0.22.0.crate 8098 BLAKE2B 7175d48a19fe4c68d08e3c4535ec4b4c09846d27d4d3fec8b2e1e7263d6cfda0e3b2985675c302886e5412da5fca634f82ea180eaf35a6abee519b75cfbe00d6 SHA512 c99e96cbfd0c7be19019fe92b66168aa1d2bd8e187d95bea6c4e5bf60b21c62fdfb70e2c01ee57c65c7c6e1d9fc43fb3422456485f7ef85bc080a46a40924449
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.1.2.crate 38312 BLAKE2B 7448304242aba1798491da328eacc326132dd7c8bab21c9909bdd729b9b70eb321d00f992f6c7fc026ed2d0f6a562af1113e45baf61b907b8bdb4412357436e1 SHA512 f0ff5c889a89e0c235ff876d2e0bf50a5c97b85c6f19abbc3d12de26c97e678e784c04cc975be7d008b45fba7ac68c9a129680e37492d77f7a0f433fa895c659
 DIST crossbeam-channel-0.2.6.crate 64953 BLAKE2B 281d8ccc60ab2f4afe0e7b5d9fba5fab7cb2f3a36b8a04d4ac445bdd9f0838fea6b41dbe08be7f25e5154ffe2eb0fdb9304034080d881918a84ae3ef46bffd00 SHA512 6c124ebcecc70277b9957d3908acaa7c22c346f99b4e678eeda6a54406e1a6d703da6a95971dca248839cf831a830d172650dbc032de138c2d398f0f80a20c51
@@ -53,11 +61,14 @@ DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a864685020250
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
 DIST fuchsia-cprng-0.1.0.crate 2980 BLAKE2B 70b92c5e3b36c07ab357d4c1bdf26aa9813c91df36fa6f868faa5a65708f7bb5f4ed3cb45cad0e51e8c694c367e49d9328dbd8f0fbed8c4e5246b0f5ecf39bd7 SHA512 75a8a27a051dfff1eed67500d218a0f1a8f1c0859b1601ed8d7c4cf11b8bc0213e33f9f37b3461f2f8ea6d685f4bd94b678bee3ed48499bdc6093f04a387a75c
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST fwdansi-1.0.1.crate 4658 BLAKE2B 9ff7630d03280a27d4c58e858391bb9fa0e51d4f8aab875e8b1ac6ceb5f97e0db27f46efeb8e380cefc0348cfc845a10c72cb97ab5ae8a287b84fcfca0773acd SHA512 171044bcb47a672f0d22014741e4509c571a20511ed8d9cbc26fd857b65979925e5f51affff1033c9899a6b5448a696f661e6ee617a349dc732edb02456b7098
 DIST git2-0.7.5.crate 145895 BLAKE2B 668dcaf167d5544a165d4609bfe278d84bed307239d0351f5fb1d56ebaedd874f11520a164f956af88281f70b48477df735fbb844b869c4155ca0676fc467580 SHA512 94d6ee17368a8476ff415dd4de61b02a19b756de44084a787d093323fb11692d17d30aadfc5c1037e7f70b0e5f94aa0d1b6639c9f9afa17c19d6638b7cdcee4e
+DIST git2-0.8.0.crate 151568 BLAKE2B b4bf47247e7add92f8c96e4e8c2b1ade9d7db8e79b799ebae9e07f11870b0c660b4355a0581eef627ebeec2167a501a498e4a4bcbfe9ffa1895ca123086d2e73 SHA512 06270d9f1284796d1c56c4bcac7de477b4665f6c32b5d8ea2fe816d4ff72d662f67f3482349d5d2b055232d9f1619f6fb7afcc7fe0a9053df7133efd9fd342d7
 DIST git2-curl-0.8.2.crate 9187 BLAKE2B 6c42a6da60552fe38a2f83b79fcc2e884211e006369dbea7106434755ce60ffde4735e6d692afc848de914bab46affc10be751d75130f9d67b84fe74a1a3eeb7 SHA512 6713895f491341f1dc4dc3ca286358c8a20f8129c1a97776f60a8ab8c4e8b1fbb77e0d34b57cb1c09c8b917e7f4b8885f834f84e49813c7c6c57f1450b062888
+DIST git2-curl-0.9.0.crate 9290 BLAKE2B b90729fb3de5781f7d1ee180658be92a94fcde5b61991493703e7b60c34c0a730054f36ba49f42b9bd5d64d7bf9471f3f1e6e7eb5224d7f13eb928d3f6a0f981 SHA512 f43b1a9e62f53f96c4108975225ed4c0b214cb86cfe969ec399bc2483ae1eeec409d163fbbbcb78386208bcefcd26971f7a29537a29d37fdfd1051e02f0128ea
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
 DIST heck-0.3.0.crate 54128 BLAKE2B e2b922c722afa5d67e2c8a1ec2195ce579541141c9fc983afb2589de4c5208702476bd57c928b5358a5f8d09c5e67c179c7c43bf6bcdf4031cc0b78385c92c94 SHA512 6987552f783d26064968c2860e1ffac9ec1cdeaf69bcc2966e81c151bc001e481157179742704d41d7094198559720b89ad4113b989a9d3288ef2f2550c67903
@@ -70,13 +81,16 @@ DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc3799485
 DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
 DIST ignore-0.4.6.crate 45507 BLAKE2B 3ab9c229049683b9fb32942dff77f9d8c5977d1e4aa331244f9de76c5bdaa2b48c94d93ad953a6ff37021c14556ef2bf5b0306a3f8bd632a2b93b42deff29fef SHA512 7876a7572e89379a3480208632c9f34d99a9ca835bc19c543ccad1a835449ac2107444e3c65d2980444a78572f571b5c669ee4600bd02a67d864b341cab757df
 DIST im-rc-12.3.0.crate 98492 BLAKE2B 0edb749ff8b20581c856cfa5d441ade046de26962eb39daf43592f6c4573a3cbbefa4b44b479c41960f31e6b9d1738ccd16c25118aaba633d9bd8a6b604e879d SHA512 a3981ccdce43de938d614f5f0ea7ed43b3d6eb5b8542c55e178cac83fe1e4ea0ffa4334f5a3499dea4e01934cb5ed9cb5898a71832e6838abd98662e1f68894c
+DIST im-rc-12.3.1.crate 90614 BLAKE2B b25683ee3949e797ea89fe9740e2324e66a5af3d8815ce17478163b0fd7ce6b754f943bd657269b95491cc88d08bdbe66ac7d5993e3301b6f3419fbc1117564b SHA512 9d8637a5a1967b7cece7776a364e5c92e303db9d799aa49114fe0287d0e53c566bd86aa5c4de8b5079bb46165505673a904d10f2524fcfb66d6140d0f13509bc
 DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST jobserver-0.1.12.crate 19791 BLAKE2B 450588820d26d51a6b669faa042b8d9efc131bf2a077127468738f36f373d557ae4bad7ada5cd457540436d00d9805e67f1c886c2e2f445d5a78663dafb87986 SHA512 228af0a4174698b33be5ca5d1e87aac917e8d222f06594c7c69fcc541d0aba773012b791729c3e0669335147b62ce72259baf3ac0c9ededa3ef7c76752fbebe1
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
 DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
+DIST libc-0.2.49.crate 375486 BLAKE2B 38c6f83279d9ab9460b95296c8f4640d671ffd8e425c11338b0fb8360947f9e57fc8d0e4a6101d4d4b24ded14f90995f6c756d6bd260b775743c5be1ab76b598 SHA512 2a337c4574a226c600593ae7c78b7aa8da34881e0002872a362f34fc10e8b667d9425bbce8a39486c605f35676e43dc02717e2da68300da98e4e3728fb7056a1
 DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
 DIST libnghttp2-sys-0.1.1.crate 2225580 BLAKE2B 05e0d61759122a98270a0da5a4d1bfd4ba740d6287ab75fd3491fb88f0e995209fd8718230364fe79d19d2129443fc23120d1904b12d5db832d4619ef4ee1e06 SHA512 68cbcef54c9b274050b1ef50b57b7256cc7dab36a89cd2a6bf698ecd27f02e644dcc8d2b16c61cf111dd35e09ad62c07c7069873e5cfc85273a661da34ffc989
 DIST libssh2-sys-0.2.11.crate 458377 BLAKE2B b9fa613a518ec21e5b90ef75ce0a4171406feb3be64accdc83b3d5924010d4b94eb95d1698addb44ca6756afd5663461506e3831035b745637741a35719b464f SHA512 4fee372cf5d546e6471177127041313291c7f1aa21777b1e9f0c6027052938fe4c6193b6925815b64248faf9086ea04014b6cdc0420135ca99403016700c15da
@@ -86,6 +100,7 @@ DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
 DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
+DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST miniz-sys-0.1.11.crate 78188 BLAKE2B ad37f662e5f7d5eb49a49d197fbb0abb1516a9c044ae3db12d93bbf41e70cc7bc55f78f354aa3f77626005ef9c6186db4008f32e198422daf5c97fc0d8302722 SHA512 58f8c9cf01f8a5819f53fce02246172acacf89becd05c8eea32a06fb4b3911ad3b595fbffdaad5d0ca4af4dbc4e2d41c83e2fe82bc12c33b035360e83d17e901
 DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
@@ -94,13 +109,16 @@ DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fb
 DIST miniz_oxide_c_api-0.2.1.crate 163410 BLAKE2B 003013ab9bb9013f17577ff729aef09265384baa0d1e1521a11a7515c6f7dedac5963d5999f45538ab0bc1e065ae0c9d73ed63fa8b71286803e3380491fb00ee SHA512 2347504ac3a45e502ace4192dee292ac656771dd9dc6557f66648b94e97e77cf7ba763b99ab9b81de053cd33756a7dd5d3ed5d2741ec88c2164729071823a9cc
 DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
+DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST num_cpus-1.9.0.crate 10599 BLAKE2B 2dafafa67a4f187d148019c690c609c01743dbb0a8df77fc2771ae08d288b12a20550d9d582218900e3caf291e0e83e1bacd3b76ae46e6e65b94d5a642235c7e SHA512 8e51f266dfa1b9837f677d41a7edafe3768a9a0fea552ff5e63ca52874d1bf174b7fab018b1a6c130cc33259d0ff81e31d3933a376535f63c28d6da206d05c02
 DIST opener-0.3.2.crate 14077 BLAKE2B 975f837863d54cd6a6c41c49d72e1b8225df60a25feca675a8fcd32e06f3a577ed0523b68ef37f6557d07aa355a72f91b136189ab269a0cadeee4cc9508408cb SHA512 21efe732971b929f46e343d54ad73f18a68bca95c941bd3be0a39a53f568872b9bebf41aab35ee4c9863595ac616ab3a305330279bf7d9a20ad9ccb13e6b01ee
 DIST openssl-0.10.15.crate 167961 BLAKE2B 64dac45c9274dcfb9610204593d9932e8b6261e2b0bde0d69a1ef7fb06111b8469b187e1e7f380a39176cb66766a2d7065201072eba793f748def707b93a1c94 SHA512 fc9a0d57848012d0937efc677cf2beda8182cdce2a01e22a00d6aeefe9ac98704608c22a152465ff2ca9f62668af4d25982fb67b90aff98a90be12192fb60b42
 DIST openssl-0.10.16.crate 168681 BLAKE2B 6622e4f76531369337e8380447780d5e6eaef7b16b1cf04a58fe0a6dab195f27e4213ed921c999f72df7139b02ab268e9726594cbd10a570d697439a5f683824 SHA512 dff4e72f3da5bdc2b82012ec942f2725adecf2b62c42f9101436ebc8c3a38a2fed92ff421dbf02654371fa70e3345ca950159187cfe2ca5fdcb6a858197443ab
+DIST openssl-0.10.19.crate 171279 BLAKE2B e6c637a2b04eb5c4bfa18aa8f866f8580296fbfa86327842ee712519230f6a3cc2f2fda2e5b01bc73125d288260f7635c825d61b0883236be5773f972b757911 SHA512 a904196d7e8a0925e4c2d2d0a1606f49c24831451095a939f674246afbfe046be2208d65acc75dd555d9cb8969054c65c1d7c7393b0f53a0b22de02768427883
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
 DIST openssl-sys-0.9.40.crate 43360 BLAKE2B facfff126f92ad9be7f72b1beb8d6f30b69481494a71553daa6186fd16b861ddfa2b8a67a99d2dadf52cbf9712220c94e447aec37308b97b16caef31d92536db SHA512 6bd4eceaaa84a759bb6c250dde05241235e426a84382471c56618d6890d869c7fa56ec70c22ecf0435f5d83d7fc8509b68e0f9ff041a5d42ea4472d8769ba166
+DIST openssl-sys-0.9.42.crate 43618 BLAKE2B ff3998ab80e9ed117f5facad2ea0250aaddf7c9a0048a551d2a32d20e851cefa706c4e04ccf7b35ec890557ecd3cdd422827d6c596ea1f3dd916a3eb92e017b9 SHA512 6201194e4a75eff661e419310fe021d7ff423cc8779ee5839d17ca272ba6ebc019b3b6b8e477c06f41560d5ac944313ad0ab9635b3612abb0b1a17b5ddf0d2cf
 DIST ordermap-0.3.5.crate 35246 BLAKE2B a663aced769ea6bebedf21b95e98756796b9640d89e1cde828f7af32921cd7354dc7dc232fed40f4c65d54ab3e472200e07a057cfe634002d1371c9f93003e20 SHA512 4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd
 DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
 DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
@@ -110,6 +128,7 @@ DIST petgraph-0.4.13.crate 111936 BLAKE2B 426d865c16930715a2207f778ff108370cee0f
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
 DIST proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
+DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
@@ -125,8 +144,10 @@ DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87b
 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
 DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
 DIST rand_jitter-0.1.1.crate 18226 BLAKE2B 351d16c41d16b543dc8b4785cd6b8f5040f7c1e2370fb61537331373a0a4eaff6aaa34b3a68ba55f1d9ff408f7f4f0c6e614b6eab87b0e6ebef751585826706e SHA512 b1b72536883acfb97cc2797c1a3371a4ff466e454b61ea0a14ef1ecc81b423139d046a3bbac227d83cc71de4b398eef79e037d78a52d8b5c5a4eba1ae3b92c65
+DIST rand_jitter-0.1.3.crate 18341 BLAKE2B 6bc99b148765ca0ad7ce1d457eaf4c039e825a7178fea200eded79a7897aa407ba39d9c8ab1693f28511fbf6def1bc9594e29ffe108555d3e1a3f709abb802e6 SHA512 a70bb59677bc82b4f0b6549d8907b1cde2e1529435866b9161cbbef28ae79f7edaa4067fc6498800267f944d853940670bdd093d437ca8cc84eb2b0ea6dcd551
 DIST rand_os-0.1.2.crate 18359 BLAKE2B 699e5e8a542a92b631fb878bd5e8f5c925ea85d64cf00ab67191e16b428e583df9017ced7ec760477c4bb719bc5c718818e08c3a9ee6f504ea18b9e678c77ea5 SHA512 c4ffe4c8d0b5dcf40ca1b1804bd491345c411c9eb105be24c033aa7a76bd808af6d06ffcb168bad72e5adb5eb240827de39f483d80076a9f288316fd51e3d790
 DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
+DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
 DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
 DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
@@ -134,6 +155,7 @@ DIST redox_syscall-0.1.44.crate 15254 BLAKE2B bf2ed8addf2dccdc4c2dcad2e3079f0178
 DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
+DIST regex-1.1.2.crate 241143 BLAKE2B de5e00f4c23dbb00ffdad4548c7ecba6de24fba996034e966122b2d79142f0cab35d9a8edd5a9f6a6fa223bce36b07160492c11d844aa4582277d0d1b24de9d0 SHA512 84d4bc302daf92c71354c53565f55bc931b1a1d9f6a3ca11d1959ba9d6fc9a8cdb6d47ecad2e9edab451574a5159bbb4fe82f344513c56f63f42510cb76b1d16
 DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
 DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
@@ -145,19 +167,25 @@ DIST rustfix-0.4.4.crate 12698 BLAKE2B 06128ef65155657cc127e19bd6aea8e5a652f510a
 DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
 DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
 DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
+DIST schannel-0.1.15.crate 38901 BLAKE2B 23cbec1c786cca66e70cf3e238840258101a3f023edfcaef0cb66ad62a8d436e88e1f26a08d0eb544b5efec2b21e79ad9fcf84b521bbbfccfcca8fe040fe3ea2 SHA512 9c6f3cf370b76b8fd37cd26a5dfd686b532c30d47ef477548fa6994195dcfa053edcc2e8a395736768d5815b9f18db175be2e9d099767dd4ff4d9a8a3157675b
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.82.crate 71666 BLAKE2B 443f39840e8f88ad9a8d6c094ad6db759258a448ce2ee7c1036a4cdf446de522f960543f2a712d5d944dd8ede699b05eeb25a9f50cd128cbd3b7ec600185119a SHA512 287a11c84c8c2df98cdcb45916779f0ccca932f7901374dde7981ab16a8aa98a3cd79a698f9d126bac64269fe4def9b85b19bc2d200c2f302e916b87bf029ced
 DIST serde-1.0.85.crate 70965 BLAKE2B f6260c01d93f59542211ada91e38c77bdf0e493bf946bf33055e712aae55534c6343ed40d0d178b1f3de70172a80b482696398be4484f6d5a0c1d60099267e2e SHA512 695b6698b45f399dbba9ece3f79d3da973736260f9410cb9cdc149473d3f864cacdf5c851f1b73aae5cc33aae2949423520cfa4caf96cb3231d111238b7c7419
+DIST serde-1.0.89.crate 71395 BLAKE2B 6fc88c889a12ce4bee3dc96aefd80e18e21d52c11b840ec9f6562b300f386d3b6d83632006d5d70e52a3693c3ad4af5ee55f1b6869cb402305cd0c46ff565140 SHA512 e01f30208b7dce831890bfa37a38a6e2177c35f423fa02021d32c1209ae00a3e8f836deb12cc26c4343a4a10b87286d780ebb8eca83bd4191d1023318c15e745
 DIST serde_derive-1.0.82.crate 47403 BLAKE2B 91634aff2026dcf90240a83b2955d02a286db6db9a91514645f5fb5d2e6ac860ed6f7f7b8b7526688ce3bbdc6feb46692a49b0388deadae014575418cb18cf82 SHA512 bb00e82c7768b59a01f8df31fc425476ac595186ba658c69f33ef5b7b9d419e891989e178daecb517d27a59639b8dc47a91be7d01f5a52c177aaa151c647ef5d
 DIST serde_derive-1.0.85.crate 48580 BLAKE2B 5d76f4397d7c04e69840a240270755e3ff4e1119f0ed46b68ba7b45789190330f1b79480e6955fe52bf3bb7e52eb71f711c8aaa6222e2788c3f191abe872e129 SHA512 719e8f7687c7ef3e8266eb2436e755c7fb013de6d8e6859676cce079f7044d9eb1d073ea00fec6c1be86998ab9ab8357aa70d866e3e3158176f031615be058e7
+DIST serde_derive-1.0.89.crate 48599 BLAKE2B 938134e97381bb4da5296a383a1bfb0fd9055c9e712a4121a39189849cf08f73b32eb5053c9f94b44ad4a62632d2b898d524013278c578ef569a862676daee0b SHA512 9c6e54b86eea33c8f4cfb27924f95e811b940ad0c9ba934c61691d728eaab3a31835a5c7ddf8b15d67786bd6b6d7f008079c453f89dc05b57f6412c9b1432d65
 DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
 DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
 DIST serde_json-1.0.37.crate 68709 BLAKE2B e72f8fb0677430dca0037a7b067c36848a60cfdcbf7338e7e46cc10652b1e54ddc5764bd3b60f27f5cc99d8c6b1fd3661fbc75499f6ae46f9a4af9f60e61c961 SHA512 8808dd4ab1c4a85103956057dd7c1193376d81dc2a6bb98848b2c516f8c0b4267a401737281727ad903c9461d74a0e172ebcc57afa32f97124c17c26b6d00b48
+DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
+DIST sized-chunks-0.1.1.crate 18703 BLAKE2B 3c1ccfbd8fee5a7119d50027be025f4f28a4c0f5d29b56e8e6a9f4ef6689e5db6673c8eab21c17df30c9d53265c1c5559df2e3db92edacdab6ef213548fb7365 SHA512 e8705c1e397ad4cf4e6d6ee9bd551a1169810ffccee77f80db92099f50fa5425effaf2eb3984ad5531536638f1136e2cd633fedd45ee9c6825a38e5a4873ca97
 DIST smallvec-0.6.7.crate 21450 BLAKE2B 35201ac343c2029d9ced9de0361d1ae9046913abc3701c5f6a000008eb7aabfdcb6a05b63368989f4f182b7f0ab89956d7d211a0760432887f2be975be9ce0e9 SHA512 2f3e45b27d8a1e02ff856e9690d982a8c785eef797f0e33beb8a832b6de5038d5ca3d285f49d67bbcf9fb2cb4de278dc33f2e77c615ecd333da014f56c8aec1e
 DIST smallvec-0.6.8.crate 21448 BLAKE2B 0491237d8bb9d9c89355c6f6538bd962d3eb56ecb6a670a0d94032c4705d34c629b930d9465fef34efc8b4463f5c88b6b849f75306a143d7aca9574da32c9bcf SHA512 0eddd68498a20bb124fd7bf00700c98ca00a58ddfb4e6116aed0d7647b898760c9b46593c96b16bffb86541dd37f04559b75110fb3b520b1b91ad6429250250b
+DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
 DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
@@ -165,9 +193,12 @@ DIST structopt-0.2.14.crate 25517 BLAKE2B 7d7321b9abdb5bdf322c8170ea5bf8b8c3a995
 DIST structopt-derive-0.2.14.crate 12411 BLAKE2B b29493467688d812113c595a8d6d8999976a4099dd43fbe09714496ba4c0c1fed4df9e081165c68195a6b57c973b7b528fa38935a7a4b457e2aeac969324711c SHA512 224ee21f11b9dd07754c8e6464cb14d25e56866e2a0c65ece46affb6dc905fe6f8268814999438dbceebabb475d4966ec2d0b3beb8418c9bd48a9e7a9eeeea55
 DIST syn-0.15.22.crate 146349 BLAKE2B 161ac0586b2ecf50b635cbf881820b1a28cbf3d52bdd5872eca7517eea6fcd4af321c8dab7f05dfc8d449a2744708143d082ffeeced934a25886a812e0ceff2c SHA512 78721f2925edbd0b3b0e3377833e7621ba66251fb92631f0295bbeaf15110a6ade2ffb89f1dfad847ac1cbb608f8d281459450b95940205a0058ed41e8ceaf0a
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
+DIST syn-0.15.27.crate 145339 BLAKE2B 8e1c2be778ab47209ff3aac74ef9d61a386f1aec0d533c2e939b8472e1a3099aa9f8fb0e86d9a47249dbe59c328637488ae01ee9a27143bc1d0209c42f83d7f7 SHA512 eafd57f24e8250ca376fb39866ae19e9f871bf3ff33a866a7b6f66f60ddac24820ecb36c8459d0135f08a4f214a6f7bc379fbd494fd35cc803d6d92d73cb15c7
 DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
 DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
+DIST tar-0.4.21.crate 45986 BLAKE2B 6b72db6a70c5c39ca36bcc6616b56d68fc4f0ce70e7e50c3d18fd9aad1d1863b51e4540b36ce74c5472217d38e34632e5f6fe0843acf7486731e07b4f9102d32 SHA512 602a6fdda02efa463a81d5a9e5d4dbb9dca399caf7bf8bf387f0b5d9d49e1f2df246449f246341cc741bbfded467ad8eb6266254d7141d14532dcfcf70b8e966
 DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
+DIST tempfile-3.0.7.crate 23922 BLAKE2B ea7207d7a5c893751fedca320dc0b08c01de041eed2baf39c1e63f744b55ba3a823890d60fff504c1018950ff9e564eb17cc086f7c519279293570ef2e470751 SHA512 b6fb6a1f4f0f5483255f9672114fa6adf13edd4bfe8f7fbe6c4225a36ccab5b58fc5f5510c50e70746e2697f2cf503b20682e5b44cef0b65b7ffac4ee39529e8
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
@@ -183,6 +214,7 @@ DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df29643
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST url_serde-0.2.0.crate 3525 BLAKE2B 3beadf5f536b091ea54f8a1cf31553f2c9c51719a1d586ceed396363d26f1441c12a23bf8017cad4daca62a57b4f5b55b0b5d5577b4c61c1854f16a3d4554247 SHA512 9abf777f8ac1f369e8db826e35fd09a2a5f1685560027740a8388ce1c60de92da79b4d1b938f9bd082363396f5b7a742811feaf298b269b2f5e9465650ee827f
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
@@ -199,4 +231,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD cargo-tree-0.23.0.ebuild 3215 BLAKE2B 053d6c2175b37f8dc3eb2fde333e0e687ac2772f2689a2e59900c5eca34c41d1a8d1798cf3e11a12bee7c74fd0c8bd75bfd52ca409e5bb636e7c9479c88fcc02 SHA512 4affbdcd74ac1ec015ce32ac87eef35c4c26903eac69682aa16804e1b7637cdeda7fa54f09256da22fc25a27bc5d7c0ed8c674cc4650ca14bd5eb8ebf89e870a
 EBUILD cargo-tree-0.24.0.ebuild 3041 BLAKE2B ba7383585015a44da1fbfa68ab9da4e7743478b053a4629e9bfda41889d21788f285fd3310a14404d29530c519469201820ef35cf794f395197c6b73dbd13657 SHA512 154a5711bd335553fb9a5afa9c21505291bec02fdebc4161d9a35affa472b0d2ca5705e514fc26ccb8489d41d6befe9292a6fa6616ef72cc02971d104c718dc8
+EBUILD cargo-tree-0.25.0.ebuild 3065 BLAKE2B 20e1f06efdab4996287df6e8d53ee87563b0e6d8787b5dcca0dce70fe91816df96a6970754de420857d0dd1d5b211c428db5b85abfb520fc4f8746e8075b875b SHA512 c36a1e5fe8fe33c83acb29e53c2b1f19aba66687cf964729e48eccc91c206be6e56f4917601dc60329a85bb143a404c89a20ecc4db4fd35e5e9e77886761dc35
 MISC metadata.xml 335 BLAKE2B 458848de5f95f88465b613bc3d2b692c4a8638ae42dda2b98ab6801ec695f92db223d1c115b6021f07822c62bcf98987ffe976f48bb8c3d9c74f35673d810962 SHA512 d7fee3ca27c5b91888e5dcf5d02e453cfa3dd7d8ca72fc2060d052e74990c2311a71bcf60b7ee3ee02cf21229611769e388925d7ef5acf8597dededd6b35f918
diff --git a/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild
new file mode 100644
index 000000000000..cb4b4eb835f9
--- /dev/null
+++ b/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.10
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.2
+backtrace-0.3.14
+backtrace-sys-0.1.28
+bitflags-1.0.4
+build_const-0.2.1
+byteorder-1.3.1
+bytesize-1.0.0
+cargo-0.34.0
+cc-1.0.30
+cfg-if-0.1.7
+clap-2.32.0
+cloudabi-0.0.3
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.6.3
+core-foundation-sys-0.6.2
+crates-io-0.22.0
+crc-1.8.1
+crc32fast-1.1.2
+crossbeam-channel-0.3.8
+crossbeam-utils-0.6.5
+crypto-hash-0.3.3
+curl-0.4.19
+curl-sys-0.4.16
+env_logger-0.6.0
+failure-0.1.5
+failure_derive-0.1.5
+filetime-0.2.4
+fixedbitset-0.1.9
+flate2-1.0.6
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fuchsia-cprng-0.1.1
+fwdansi-1.0.1
+git2-0.8.0
+git2-curl-0.9.0
+glob-0.2.11
+globset-0.4.2
+heck-0.3.1
+hex-0.3.2
+home-0.3.4
+humantime-1.2.0
+idna-0.1.5
+ignore-0.4.6
+im-rc-12.3.1
+itoa-0.4.3
+jobserver-0.1.12
+kernel32-sys-0.2.2
+lazy_static-1.3.0
+lazycell-1.2.1
+libc-0.2.49
+libgit2-sys-0.7.11
+libnghttp2-sys-0.1.1
+libssh2-sys-0.2.11
+libz-sys-1.0.25
+log-0.4.6
+matches-0.1.8
+memchr-2.2.0
+miniz-sys-0.1.11
+miniz_oxide-0.2.1
+miniz_oxide_c_api-0.2.1
+miow-0.3.3
+num_cpus-1.10.0
+opener-0.3.2
+openssl-0.10.19
+openssl-probe-0.1.2
+openssl-sys-0.9.42
+ordermap-0.3.5
+percent-encoding-1.0.1
+petgraph-0.4.13
+pkg-config-0.3.14
+proc-macro2-0.4.27
+quick-error-1.2.2
+quote-0.6.11
+rand-0.6.5
+rand_chacha-0.1.1
+rand_core-0.3.1
+rand_core-0.4.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_jitter-0.1.3
+rand_os-0.1.2
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.51
+redox_termios-0.1.1
+regex-1.1.2
+regex-syntax-0.6.5
+remove_dir_all-0.5.1
+rustc-demangle-0.1.13
+rustc-workspace-hack-1.0.0
+rustc_version-0.2.3
+rustfix-0.4.4
+ryu-0.2.7
+same-file-1.0.4
+schannel-0.1.15
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.89
+serde_derive-1.0.89
+serde_ignored-0.0.4
+serde_json-1.0.39
+shell-escape-0.1.4
+sized-chunks-0.1.1
+smallvec-0.6.9
+socket2-0.3.8
+strsim-0.7.0
+structopt-0.2.14
+structopt-derive-0.2.14
+syn-0.15.27
+synstructure-0.10.1
+tar-0.4.21
+tempfile-3.0.7
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+toml-0.4.10
+typenum-1.10.0
+ucd-util-0.1.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.2.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+url-1.7.2
+url_serde-0.2.0
+utf8-ranges-1.0.2
+vcpkg-0.2.6
+vec_map-0.8.1
+walkdir-2.2.7
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+"
+
+inherit cargo
+
+DESCRIPTION="Cargo subcommand that visualizes crate dependency graph in a tree-like format"
+HOMEPAGE="https://github.com/sfackler/cargo-tree"
+SRC_URI="https://github.com/sfackler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	dev-util/cmake
+	>=virtual/rust-1.33
+"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}"
+
+src_install(){
+	cargo_src_install --path=.
+	einstalldocs
+}
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 4f15d73f1c1d..2bd6c90eb9a0 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,10 +1,6 @@
-DIST cgdb-0.6.6.tar.gz 954789 BLAKE2B 71a095ce0237dc00e8387349818a9af5d5afd6d3ba72f0835eab80e674bb3c2934dca361b58fe70115db3b0315cf2cd34e60640f0d10fee75c261a8cbc3d231b SHA512 9efd4e60f07f6e189fe3c91ef52c1b3c8d70623b11d08bac6d78c36e8f8f549071448212db973974b9604f84aafc73697d9d1305c3d9691fb5f19346d2e04e8f
-DIST cgdb-0.6.7.tar.gz 674132 BLAKE2B 5378bffd3bed99934b83c1db82baea86d24f83c4e586d0695193bd5ee864ca0c76ea493187ffb307d16610b2e5a8bcdd9c4b2949c1e00299eb20ceab7dd609a0 SHA512 0a9d1cc3fb00c3cdaeb060d20d3312dd738b617ff1b188db33a074e2790f9721ca58e924ecc9929b84832c3ca22a334d7a66294439341a9b6868eef1baafca3e
 DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
 DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
-EBUILD cgdb-0.6.6.ebuild 446 BLAKE2B 6916fd61e26daf6d29f59ae01772cfc7144ba34e9f056cc132e95cdd3879b51a15ae897528e0fd4e1e77a69e6ae8b159665edcc4e8ca81440faba1c8325cb556 SHA512 8b42cf87241b9ea21930d581e23792d8f8fdbfded7b32e00d2c49d52fdc48c9cb0fa4e30638467c66b3baffaaa4c40e221f1b5cfb5a6bba0e46b7ba70285cb2c
-EBUILD cgdb-0.6.7.ebuild 448 BLAKE2B e5d0ffc9397a430d76d3b67567ffe0a512bca902bc975193bc8ba01f570dd7b1e4de68cb26ee94efe528811fd15442f74af6e6188d56b5ae69306f5d21b28535 SHA512 00ad998f1b28cf7a99e78841943a973ee5f5a3e2888c4c749e68f36d082f20a2d518dfad0ac4dc493dc77d1549fe97c4f45fbd3782fe5e4b776ebf076b17ac8e
 EBUILD cgdb-0.6.8.ebuild 878 BLAKE2B 3f645a5f31c9a450a2426c4060d1cfa6041f5a3249565bf1baf0490f8e3894a17317c8ba0c88d0754c795f6ab072a667ab606a046a56b9449f5c01a6f660d026 SHA512 ef2ec446e1a58ebdc3e66d2097af59d8afbc573fdb8ca98da9a0bab71d6ad755ab0832f1d1028bc4d3148f68326a4d054242d7293ce73f54f128d80bb0f955ed
-EBUILD cgdb-0.7.0.ebuild 881 BLAKE2B 778de1aa175ab0ac9db729fab025ae1e1781e612b9a238a57dd7687c0458440bd468f940171dabf7e11de7d9ab76eef8a01df6f55941a2171eed220e205b5a75 SHA512 4fbb20d6d8e82979b5b81763dcf635f24a589ea12a1c00ecde694901a5747a90dc5a7ccb186f20329aa7d717aeb6d7d01469921b5a292c0446bd3d1d2f00cf9a
-EBUILD cgdb-9999.ebuild 881 BLAKE2B 5a3c6dc5bf761930537591428bc8f33df50ed1c93f1267eacb487d8e0ad8328606d7d8f5c7adb8c6e2cf945a328b2cd6fe3190dba7ae7e242fc4997e8941863a SHA512 ee777392e48feed140699b68c956da91dd38fca82d03facc6c45061ca1f1b11432af9667da84462dbf09c03cf40abcc9933611458d07e6333dc562958b68b106
+EBUILD cgdb-0.7.0-r1.ebuild 1334 BLAKE2B 24a7d37bbd9e055e105ee98ee4a982e5c1d38a61d60af61f70790fd3c4b50ec28d7fb33776d9b7bbd4d5b10b93e80f79bc6a223093cad1e92547255aae55f63a SHA512 6a9177d86a0a247d20f15621b3ac6b93c1f836fb004080f4c9e27222705c385318b96cfe23299e6f272a74530f2b0661a721f1960b8ca9f007a407c003a8d9ff
+EBUILD cgdb-9999.ebuild 1334 BLAKE2B 24a7d37bbd9e055e105ee98ee4a982e5c1d38a61d60af61f70790fd3c4b50ec28d7fb33776d9b7bbd4d5b10b93e80f79bc6a223093cad1e92547255aae55f63a SHA512 6a9177d86a0a247d20f15621b3ac6b93c1f836fb004080f4c9e27222705c385318b96cfe23299e6f272a74530f2b0661a721f1960b8ca9f007a407c003a8d9ff
 MISC metadata.xml 490 BLAKE2B 9eaa4ae0475e04d725f775f49d5bf57d7d0a00b53cfa1c0e67868d0127121f640ac304aef1c8d0c120666c03e815ab928b217800b2bf92e1bcbec9ed81a3519f SHA512 77ac0f28241716628619178ae93599276f8fd6051b7f00c5ef7fdfcd0a651cdd465dfde6de052156c8407d6a162a2a21199260001e06dd80e6eec8200bc11097
diff --git a/dev-util/cgdb/cgdb-0.6.6.ebuild b/dev-util/cgdb/cgdb-0.6.6.ebuild
deleted file mode 100644
index 5778250bac4c..000000000000
--- a/dev-util/cgdb/cgdb-0.6.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cgdb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
diff --git a/dev-util/cgdb/cgdb-0.6.7.ebuild b/dev-util/cgdb/cgdb-0.6.7.ebuild
deleted file mode 100644
index fd2095ed0c6f..000000000000
--- a/dev-util/cgdb/cgdb-0.6.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
-SRC_URI="http://cgdb.me/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
diff --git a/dev-util/cgdb/cgdb-0.7.0.ebuild b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
index f1e40470f225..b4fe338de7f7 100644
--- a/dev-util/cgdb/cgdb-0.7.0.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -20,15 +20,18 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
 
-COMMONDEPEND="
+DEPEND="
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="
 
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"
 
 RDEPEND="
-	${COMMONDEPEND}
+	${DEPEND}
 	sys-devel/gdb"
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
@@ -38,6 +41,22 @@ src_prepare() {
 	./autogen.sh || die
 }
 
+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 5a5dd25473fd..b4fe338de7f7 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -20,24 +20,43 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
 
-COMMONDEPEND="
+DEPEND="
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="
 
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"
 
 RDEPEND="
-	${COMMONDEPEND}
+	${DEPEND}
 	sys-devel/gdb"
 
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md FAQ )
+DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
 src_prepare() {
 	default
 	./autogen.sh || die
 }
 
+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index e4cb46d66d0b..dcfa6401c153 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,11 +1,7 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
-DIST clair-2.0.3.tar.gz 5194681 BLAKE2B b4f809e7699fbf66745c7f528f3f2c249e81541a64c540a8c39b9fa8f5b581d1297abdfe80bdb0ca3aec00010c6c95e8073397df284d2a92a3e95f91049cde80 SHA512 bf2d4ab15efc50bce3e828d0510ceb44463a6c1d978a854b3a05899996203a7c33bb6e60470eccb6e0a1e23b8ff41955cd0fdda4b77a9a7e042e1e27dd2e0885
-DIST clair-2.0.4.tar.gz 5194393 BLAKE2B 631ab14acfcf516a5dd65753fe2088dbabf1c7d13a6b079cb09f0c6a3000b346da948d9c6edd16c999753342d67b9bb2165a1b38956ee8957b48953d10490430 SHA512 fee3b9fe2865c0e352b454767383bf47d67bd14f7d08171197350c20f32bc80eb318db10c9fd4bd9da0024dac97ae287cb8dcc7605c3094f4d567122bfe3f7ed
-DIST clair-2.0.5.tar.gz 5194565 BLAKE2B 19eb49b5b3d4d3c3694c4aefc21abbdefbc5b6d3a53a0f845c587bfc98052be93bb83283b0b3fe42a5ed950e55390810032abb4ae4eba8de999f99f07528b1a5 SHA512 551b006c32f6e0c93f2ace33151864f876a7e32c85cf13d8e1dcf23b91f79c32d4b4a4c9bbb3991ff6955897c8dcdfdcec2d6fbbbdcf0b684522375269abca89
 DIST clair-2.0.6.tar.gz 5195113 BLAKE2B 6044ba36d63d74eaecad5cc48173cd56867fb3004c7a667b9134105815171fb34b99d86f7fbb7b9a3f69ff6061a7419a63ceb23a07280eedba36b9046a401ad6 SHA512 7d996200e9a30fb569243592f88a9ef4b3a7b32852abb953518e3b6b2833bdb8e81fa8528f35feda0a16d514e48714fa60b716d038fdeafd5f3398cbccec145a
-EBUILD clair-2.0.3.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
-EBUILD clair-2.0.4.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
-EBUILD clair-2.0.5.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
+DIST clair-2.0.8.tar.gz 5196242 BLAKE2B 9daa91599f9fe98f9a30a043fd261882b36abde5fe985097b47b48a9630db528d978f90f6bd68b32bae9d20a92f598199054cf188b1514a42876666703937b3e SHA512 000ba7c10ca540aaba34de91cf8060f6d28b704060457d320791d188871bf10ea1a8b5eb0526ae0aeebf6b6a307b096c2cc4038ddd5f955d200d20b96f1a725b
 EBUILD clair-2.0.6.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
+EBUILD clair-2.0.8.ebuild 1048 BLAKE2B b5c1bcef67e5bcf097d7ce2c4f9a1718a67291934ce94b2ad7ae28b45cf79efe23be1b2be3bb8d6ff4cd89ed3b3ee4e1decf2d721e268995604f44e8e41695c0 SHA512 51105ad82d34ade4612ea52b0d71d0413d4742a17d50244f7040099275be8b2c46823ac6884282c09de0368d1ae975f6466e99d553686da1e047f74ccc5bff96
 MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
diff --git a/dev-util/clair/clair-2.0.3.ebuild b/dev-util/clair/clair-2.0.3.ebuild
deleted file mode 100644
index 8c92e5db7e56..000000000000
--- a/dev-util/clair/clair-2.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/bzr
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/clair/clair-2.0.4.ebuild b/dev-util/clair/clair-2.0.4.ebuild
deleted file mode 100644
index 1cb27791309a..000000000000
--- a/dev-util/clair/clair-2.0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/clair/clair-2.0.5.ebuild b/dev-util/clair/clair-2.0.8.ebuild
index 1cb27791309a..a01224e9e2b5 100644
--- a/dev-util/clair/clair-2.0.5.ebuild
+++ b/dev-util/clair/clair-2.0.8.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
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 0a8f040c453d..d5693bdbdb4c 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,3 +1,4 @@
 DIST clazy-1.5.tar.xz 352344 BLAKE2B 0f7200900f1a8bcad3020cf98522e3ac9ba01dddc9b2200f08a8a86102e4389af7a4a86e1832ee4c0e750267948a908627032385a01af94d8d0ae5f438114b9e SHA512 863cb9609d02a2260b61bc6cb3e6d8a84975d3b4e4f1c94a82e8c600d95a28483c323f47ac39c39ecef24d0f51871b358055868c63a49b136cf8ee3060df5a52
-EBUILD clazy-1.5.ebuild 866 BLAKE2B 2cb1ae38c156c3ada0852a031c3d1c68d82e085409691f5a326b9f90c34ee448591392c03496ea063d18814ed181839d45e2c8fee3e1503e58c1c095c5aee1b0 SHA512 6cdb84f1bcddd90b03d55865eca2648531d6d2e995ed4d0de8b3c5d7147b2ff96fe0096ac7a4cd5152f47f7a4db1102a138e536f7d3382cc6d0f376f47b03165
+EBUILD clazy-1.5-r1.ebuild 1260 BLAKE2B 98951b2dda81c84f0fd3dce72b7cfb7d70d7cf1cd557a1c1c837724d953e8a81967ff59aeb7ad8ebbe858baf7656622969c82442014dcfba34b7dbd78a0f0f82 SHA512 91c1de9b9fded38a5158251efcd5407b6a2f9eaf4bd51c582a899308e765c67c17ac178cb7e1c545f7cf2ae7b1888a0278ccb852a3445a65df471aa171d8c0da
+EBUILD clazy-1.5.ebuild 865 BLAKE2B 43f896c2e097695685340bb5b9d707bf882f66bba63fd17cf0f1948b222acbcd4d1e773e54d6f0dfea5ea7102c5048a9d5fba1d683eca0c4ccba1b2b75ad4d9f SHA512 9d2b56b4453527e1562e104439271720db5f376e8f474b7082350688b6cbd2565bac4c672b2f239d8b8a770bec9cb9f362d107eec54ff9a21875006769dd8fda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.5-r1.ebuild b/dev-util/clazy/clazy-1.5-r1.ebuild
new file mode 100644
index 000000000000..f5cd867cd909
--- /dev/null
+++ b/dev-util/clazy/clazy-1.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	sys-devel/clang:=
+	>=sys-devel/llvm-3.8:=
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
+		-i CMakeLists.txt || die
+
+	sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
+		-i docs/man/CMakeLists.txt || die
+}
+
+src_configure() {
+	# this package requires both llvm and clang of the same version.
+	# clang pulls in the equivalent llvm version, but not vice versa.
+	# so, we must find llvm based on the installed clang version.
+	# bug #681568
+	local clang_version=$(best_version sys-devel/clang)
+	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
+	rmdir "${D}"/usr/share/doc/clazy || die
+}
diff --git a/dev-util/clazy/clazy-1.5.ebuild b/dev-util/clazy/clazy-1.5.ebuild
index d5bead0c2f23..7bf24b0ba071 100644
--- a/dev-util/clazy/clazy-1.5.ebuild
+++ b/dev-util/clazy/clazy-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c5ea4b307cf8..8c9fcea903ec 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,16 +17,14 @@ AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 BLAKE2B e9390cac784eef6d3b83b88f9
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
 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.tar.gz 8846626 BLAKE2B 1bedae3909880c71bba6cc91459a58daf98287ba76c527669d227f0540283f3902d99fca2f6db2d0bde271ee274f7ce6612da2bcead611a00319996e382b0674 SHA512 a3b47f2b8d3436860e8cc06a8c0288124289560853d24f68dfbb49a2ff3f861ee385463376ad1dafa6d4a618c06d2e9049b20fcac1d2c147b29bb93479a8d400
+DIST cmake-3.14.1.tar.gz 8849712 BLAKE2B a4f917507a7ba354889606f17b9ce2c37e69d80a4ee86e75f23e214c9db11bd7947f8abc879a23c7fe76bdda32ab49360eb53f00eb1c4c4e74a8f80a7221d41d SHA512 2f0c0fb1559f71c5c2bf1a77f6fb2ecdaf078e47b5ab8ce997c6877f5d165619bc7a101b1566a8a40f8883ffef6ee690f93f2652855825019ec153aa4543ffb5
 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.ebuild 6268 BLAKE2B 53bb585b3e89f1e1ca2d05cb1fd19799673a25b9bb8bafcbcd14869d0f9392f969d5fd4908bef5ba3d2fdb9054c40e17cc7d763d0fb64ef8d00cef375e9ea2d0 SHA512 b6c76a13362723a4155c2a46ac56492f0fe6f26fb3567dad4c71134423508b653e813fe683239ada1cf96bffe983fae62ba9d00a709d0c0af75e50d3dbb4ae67
+EBUILD cmake-3.14.1.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.10.3.ebuild b/dev-util/cmake/cmake-3.10.3.ebuild
deleted file mode 100644
index 4db91c1c1979..000000000000
--- a/dev-util/cmake/cmake-3.10.3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.0.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.14.0.ebuild b/dev-util/cmake/cmake-3.14.1.ebuild
index ce96349c2144..ce96349c2144 100644
--- a/dev-util/cmake/cmake-3.14.0.ebuild
+++ b/dev-util/cmake/cmake-3.14.1.ebuild
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 33ea05ac8478..e86bb1c92a3e 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,7 +1,7 @@
 AUX cmocka-1.1.3-examples.patch 1323 BLAKE2B 1e500f2b7d3f767f3a2dcd64c6eaa07906c6e47e670e91d9f7bd1472f7b0da824abcbf5e565bdfd78503ec0db91471883a35d42836def8541c44d72624db710f SHA512 2e8cffb329c5a20b96e104b810773051f5b17ed447543989da01ea43ea5fa4935bc8a978f929fbabeb5f2d12fa5d58859896939e24e33b569ed0ec608e8d793d
 AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a840713767106039d6916479c8d0cfe502ccff60c08011be1c711dcdb827a391deb7976706d37c2ed3d3b3941370fa6b6481cc24 SHA512 63c00e774c3078ba784685887cd46790375b37bb957800951ecd1a82f5d2f29ec7c0fe77da8f4c7e9ff0a7860e801598b9dd231d43adcd460ca1d1c68a7a3f05
-DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
-EBUILD cmocka-1.1.1.ebuild 1095 BLAKE2B 4f7d129d14ceed9431bb912ee006c7bb5cb5b553a092db59e4f0c4db322719795c87bd4bbf55e8828a3fc3b690e7dd6b62fd9c7af2d93ac0a7623381cdb2545c SHA512 25c81f57cee7f851e84cdece68206b5fcd28604698622037f900438a5a740312928dbd75417b4b112759ed1f8f5fb7aeece936b0b7bfc63c5221016256f5996d
+DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
 EBUILD cmocka-1.1.3.ebuild 1215 BLAKE2B 0993757ee364fb894a6c505cd6d03138bafcda15ac74671879880eaec2207abf5aa181cdb2ab9170239529d98d9cc5bad48f1cabfe5dd8b9124d0c2d9422fee6 SHA512 7db546da812952a9adf0efc5f90de762a6fca4b594532062c6540efd31883b67b6123e8999c593c9701bd44501714d42cab15119dd4234bfe96089f190225469
+EBUILD cmocka-1.1.5.ebuild 1087 BLAKE2B b0e89d62ce18b7d9b889b382e40c9efb77cf84abf903271e6c0855bcb331a1c027d5d282761a2d3263ae4eee8e7388e7199eb08363f53bf88b0d8788a46ad60f SHA512 9ae111c95cf2af4e5a8972cdf9c21c263e67dbaf9317e58d7165ed4630aa89e6f8e8fb5f14f8ec68d332dfd86dc638a6fc0c5bd49955c46d8c39546dd1567cce
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.1.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 82d5e18c4b88..e0d5dc6a7262 100644
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
-DESCRIPTION="A unit testing framework for C"
+DESCRIPTION="Unit testing framework for C"
 HOMEPAGE="https://cmocka.org/"
 SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc static-libs test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs test"
 
-DEPEND="
-	doc? ( app-doc/doxygen[latex] )
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
 "
-RDEPEND=""
-
-DOCS=( AUTHORS ChangeLog README )
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DWITH_EXAMPLES=$(usex examples)
 		-DWITH_STATIC_LIB=$(usex static-libs)
 		-DUNIT_TESTING=$(usex test)
 		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
@@ -32,15 +30,14 @@ multilib_src_configure() {
 	cmake-utils_src_configure
 }
 
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
 multilib_src_install() {
 	if multilib_is_native_abi && use doc; then
-		pushd doc || die
-		doxygen Doxyfile || die
-		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
-		dodoc -r html/
-		dodoc -r latex/
-		doman man/man3/*.3
-		popd || die
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 	fi
 
 	cmake-utils_src_install
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index de6ef83d8094..1b5a77d6f04e 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -2,5 +2,5 @@ AUX cppcheck-1.75-tinyxml2.patch 2232 BLAKE2B 389e8678fca9eee616640fc535b0c71d04
 AUX cppcheck-1.85-ldflags.patch 1503 BLAKE2B 0458ff66d61b9cd759839d31bc0fbe611e7d23e8d720a4b0a861d53b3fc54b30d67c481c22dfbb5254a6160eac04505f00dee01c4283214e15e21b26e0b7a76c SHA512 7cad7d456c8d3bfa5efab1c67bcd0f7e509e10e539ee9941055caad41ff3b4737d3ff82cfa172ad867651817bdd4a518a98d22732ce0df5227c149dd2122e9f7
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 EBUILD cppcheck-1.86.ebuild 2318 BLAKE2B 9c9f9ed14addbdd9ec6def55d91a604ced068a3ba46d04782df12e2b7914bff3fe50fde4ac63814e48d8ee77d85435db77ffd759f21366a5e9ce354805d28fbe SHA512 77223a1ec8c185c2a22f6df91f538e5b44597bf96025f8061ed4fdcf5cf1eaddd7509ec7ee230aab163067dd43e47f86a3b0f5f216f99a6dfc928e8b4150453b
-EBUILD cppcheck-9999.ebuild 2239 BLAKE2B 59c1a96744fd6a6df0bf84b4c239a88ead73e769bbf199db8a57e944362ba4d5554e1dd0283446952573d442e4b4d1130cf1ff5fba249352b8263378799ca2f2 SHA512 88b4ac22d69cad9860b238f2be3c346458755f4feb264fa604fdfef3994b08b474138e1d8c961788757c31ddd7e7cc42c21d96343a60adb2f9bb819bd1bbca3c
-MISC metadata.xml 321 BLAKE2B d5a81f7f1cafc279c08bc120e0feef7d74e2aa5f791a0c11df2a55738b18e35a4eac03f508501ffaf82e23c6f14aae441d2861a7b62bc5a3d8801941aa391b12 SHA512 c28c3db16b406dce013d82f8745530f7970a03738f89b418b0fae2a6cf0056dad078b77d5acf976403efa71315a33eccc8ab5973aa04512c41cab6c4e9f6ad79
+EBUILD cppcheck-9999.ebuild 2199 BLAKE2B 5215fdc0d4a40b8f79984bec98eb540e320e884db7f5788a7cdb082ce13dbd2ef3a6524ece473c04ca87412b38d1141119ae95b72bd13bb45b1dd604d8a531f6 SHA512 77b3bec0b288bc9ef55e28e8f1c17e17f2dd04f037d7b9b32aaf8386b832434bec8cd1b03174d0ba7985a8647cb3c0a0dcd7a928d3f66a8d8bf6eda544068164
+MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 492bd6fe04a3..c216c0f0a0eb 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -31,7 +31,6 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
-	"${FILESDIR}"/${PN}-1.85-ldflags.patch
 )
 
 src_prepare() {
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index 7556003fff3e..de3bd183267b 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
 	<use>
 		<flag name="htmlreport">install cppcheck-htmlreport</flag>
 	</use>
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 75867c175da0..a5cd95cafe56 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,8 @@
 AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cdf9fec5d147ba667522667fb7833f4dba37d91c83cc5033967d2d544b66562ea26634a8b8c2f292f23536ed7690b8d0f3d22ea SHA512 cb9639f7d17bcaedc720774ece7386608b39a91e44cc0aa9cd4359894a5fb06ae29a03b21bc913a110864161f8df623b82477e0d23265bdee88d13aba6c88535
 DIST ctags-20161028.tar.xz 852108 BLAKE2B a4c954c560bb2d0165c12b4ec4f7b7c2c674acde98d438d9388f5d6102d325759faa3d4801eb0f63da70064fdeb32ef1c1cdd4124ade8d87cd9632b77c823e1a SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e
 DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa8ce8998bdb0a245d7d58033e37c2984af963a312c83b364dafd37633270f5f5d06fdb635a927066282e9382f6a2 SHA512 6ed134347a4be16a5dcff35186bd949e73bea645908a5ac43082b92fdfa6040b0b99ea04590948ae8308d4e9eb1042c83a4f0df006709f15cebfbf0741d73641
+DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
 EBUILD ctags-20161028.ebuild 1727 BLAKE2B b461614b554f4a489d230b6892878b96968f2483b3a6951f206c5e50b852df641aef7025f4d6b50df9951556dfbc165ffac8a2b88d63bda4270151b906167d75 SHA512 ddcd0d9a4d410de17e7d752711c481417d1e93cacf3c3f335da79a33ef37f48d63182d0f0cf12c147ed4a67f7747911789f342dd63adbe90bfd6d5cf6bba6b1d
 EBUILD ctags-20170704.ebuild 1864 BLAKE2B 648dd6499ed80bd2f00e51fbd2524f9ba735d27878bf37ed520135d8a15fd80f1f6351c02fe2bc97fbc49d3275dac201f064736bd666395027fa92a55e860062 SHA512 fb3a06df7d9fb5e0772cfa45c364af9c42ca0c6b3c57c4f00f415236c18ef2fa30f5a1a0055776ea805818faa154d4b6cf18e20b57362f27dc2dbd532894c929
+EBUILD ctags-20190331.ebuild 1855 BLAKE2B b57b5cb98f39fef6cbea9d10a6f0387de725855ef50f62742fe51e7718c23708e0a8778bccbef7b14d1d2121fb2cb38bf55abbbd2d0b70c922be3536eb481f21 SHA512 515fbb932d4cf379fddedcd1ff18000729312ed88ed96c321e55e67a76d67b721475e28432477c47805d32e8ac03081fc5380bed48ddedc97925a4d2408e943c
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
new file mode 100644
index 000000000000..8baae1901d36
--- /dev/null
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+COMMITHASH="95975bd157cc1326120977ce530f0477bcbf43b1"
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="json xml yaml"
+
+CDEPEND="
+	json? ( dev-libs/jansson )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )"
+
+RDEPEND="
+	${CDEPEND}
+	app-eselect/eselect-ctags"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${COMMITHASH}"
+
+src_prepare() {
+	default
+	./misc/dist-test-cases > makefiles/test-cases.mak || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-readlib \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
+		elog "You can set the version to be started by /usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 7cd1cadc4164..82e72ebf84d4 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -2,6 +2,6 @@ DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc5
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
-EBUILD cucumber-3.0.2-r1.ebuild 2667 BLAKE2B 6caa8fcc64b5ed621e5a3eac0b9f660b2dfb4fcabf7c5d29a9e62e0c86e6762c4f2b741d0569c947c57ec729c266795c7cba5e54957f0ef07df71d784233a4d2 SHA512 232ba5dce6b04745d8e9b4262b80aa6831053b0f7bfb91492c312e1ec0cfcd3feb221b734cd33afd2dd44678e21c0b454b13303dd96136a2d74a71cfa37c537f
-EBUILD cucumber-3.1.2.ebuild 2697 BLAKE2B 44d2a186a11d9f46c5eba4669a59a13598e496694840f35dffee9020d7811ec5bd17a6cbe6394b6f750032cd827d3a2edb607780cc134d2a13d22d5d736ca6e9 SHA512 b611da21f9e0bcc6df392abe44f47b8fcb4c9f9b74197ab2997dca44f0a9d3ab21ad4ea3e18517184ddd9b417863af0b4011e3a1881f51aeb21af3f65ad57ea6
+EBUILD cucumber-3.0.2-r1.ebuild 2673 BLAKE2B 718c85f7f4df14fca77c5667a0b25ba696255518a91c0fb5edb0140530f052ac9ebd419595ebb9505cb4389acb5ec872aad48e9496ba115c3a2887b8f0c49c15 SHA512 a4ec7c01e2f0ffd630763c2dafef49d9989644321fa8c4dfb30b4c906e48afe3191c4ae6babaecee4163a46f3b4fdbc474721350915077f0386982b68f3e72a0
+EBUILD cucumber-3.1.2.ebuild 2703 BLAKE2B 2c06ae7c702f4cc6d50f53c45d2d0844272c95b7bed0a026f0b8275771027d786bfd4e416abe3ebe5980b5f77e212b736a2c3838a93268d78aebe9bf34aab9d3 SHA512 dd508671e0d6c9a4fca9d551db85837c0f2ebbf7053273bb9c15fc43d768ab398193e2d1cb13c655cc061394fb7b608280378aa28b04d4940b7e97faf8650c8b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild b/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
index ad857d32c3e7..ef62db8a64fb 100644
--- a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.2-r1.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
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index 319f0e1ad439..f608147f4b66 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.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
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 805e89ac56f2..cdb4051fa417 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -2,14 +2,17 @@ AUX cutter-1.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba657
 AUX cutter-1.6-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.7-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.7.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
+AUX cutter-1.8.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
 DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
 DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
 DIST cutter-1.6.tar.gz 1083427 BLAKE2B d51b88f2b9dd2655ef58d7075086959ec3ed59ed4b21db81a792ee165deda523a4e59378c954d0f2aa5b0af25d67329ed2119c004edc402c9b593a3b230a6fd9 SHA512 83aaadfbaccdaa514606408868c050e22d0a80a749b98a9f6df929467a16e69b0d454b25ce1cf53e35ebbfb74e9b39e2bd390057488c9bb3992a442ca306c2f1
 DIST cutter-1.7.4.tar.gz 1182307 BLAKE2B 7b80c99654c430c7d694b658c5757a0f75463f02867ca33baa12bbd84a16782421350b5db63c90dd999a17b89865ecc5a87783f2a5e6df2a7395f957076c3e28 SHA512 d5750e756b51a0a140f53946b7cd7ed6f12b81c798335873781d5ecb906012fe0e257ff27e5c75e0ece6000f65a8b602530d80e6f9da22abbb8beac6573db6ac
 DIST cutter-1.7.tar.gz 1099734 BLAKE2B 200621a902fabee66ebb6e02cc0efb7a705320c6071db5ce64adee0717977a72056bb5ef3ea8f8cad05488c7f031da7c24bbfc2986bb780f111f0a3a5b7a5b0e SHA512 52eea3017ebe02dee4f4e2f7109486ef2b833359959f7058fff49b4462dbc551e6d25cf31da934c9dc8489dad68ad2a3ba8b12fa60789852d13e8d3cb225a1b8
+DIST cutter-1.8.0.tar.gz 1431831 BLAKE2B 8fd54238acb83f5747679e520b40981fbffa4a19b8f96231fed1fee904cacee6cb02e5c483cfa8d00d0ced526cf6238e1a3a3a7353304fb603267fe7047822c2 SHA512 f88b581720ca969a1c34b671f31c8084bc588d5c7c3b1975d2012ac04abba953eaf87f28b72cc9ef608d14d8281aa92502efa965378fa89a9c174b049a9fca7e
 EBUILD cutter-1.0.ebuild 637 BLAKE2B a7ee78a5d5f0f988ca10b0f7af3a5d5f63d433eea111358953599db557bd4cdbb656858619aaeb53293faf2749f8cb4540670ee590e6e3a9ec373a98f099da64 SHA512 71f8a88e2ac7b0d3215cbb32c3cc3c3b9d433010deb6755d5fcabfee26e1440948eb33c658374a2070c1e5f844099c715f461935da410d3fbdf2daf2be181a88
 EBUILD cutter-1.4.ebuild 1009 BLAKE2B a0056eeecee4e95a9b9e6332b9d8ddd9007ff569d93c473257ebc59bcc3a80a9a6bae8dc996f50ba355b8e29298d1a9c6c158402f77f4056bfca6674875135ba SHA512 9b78868d333fd97fc424e3eaa46d136098298f79860db68898dbad3841353dc81dbd513a312431f16d536c3273c968a5317f6bf58250f9f9ae792b9643ad659a
 EBUILD cutter-1.6.ebuild 1009 BLAKE2B b511368dcafb04f330ba2a9212cc5a2ce451f6ac69efc4b02dd789f63c326536af8a1b2339c2a17c50a2f47fa41f80bf5465ceced2c3880a90e482fcca372137 SHA512 3ec586afa2c3c9b040acb05e54a37b767dcf35fe0e9fe840befb0d8cd7221d2c6f91d994ce3006fb0d45666c29d79c47fdd0d3c4a3160aaf4661de077c00b903
 EBUILD cutter-1.7.4.ebuild 1177 BLAKE2B d692a0279ecfe0dec8e7b6d13c0ca45e0ed3b8ba4cfd4797a8a2853e80d0fcae422939da225a45e2df2be60740d935e1cca6d9dbf1d6e27766f5293fe11a6ae6 SHA512 3f92f93fc9c9718a688c6cd0c4b5ca3a16092c87a14cab00cfdb47430067fd20fb0a651ab4f744cebf5f735e6dc517410c4ff1686490940c421195bdeb19e48e
 EBUILD cutter-1.7.ebuild 1180 BLAKE2B 298213403869122e505d67cb655aa5604be2c51e8ff8370e5ddda46157c4ce4c549237c96412c7435a90096d7d78f0c9346dc2c6cab4fec66f4b6a1d2ed122c9 SHA512 ea4eedb00a260567cf62853d3452b368d0c84fcd889c00ed67c224450fee010ab0096b1f2dbad03376791ea2908fac2accf024865fead13861c1f2609c97e829
+EBUILD cutter-1.8.0.ebuild 1291 BLAKE2B 4a0b06bd35e99427330f72177e94923bdefd5b56d9c7f148941be136561e5caadcd55b0518f0e8973cc40f10b62f03c09d593894ca46dd9af52754e425d37f06 SHA512 f93d7fc5ffcc45bfe93f0410ed0a6dd55b5b098bfc05d5213836ca9dd2b68839dbfd972082eedf15d6450cd41725b47f19d3709303c867dd458519d7062bf101
 MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
diff --git a/dev-util/cutter/cutter-1.8.0.ebuild b/dev-util/cutter/cutter-1.8.0.ebuild
new file mode 100644
index 000000000000..e1e21ad2836a
--- /dev/null
+++ b/dev-util/cutter/cutter-1.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit qmake-utils xdg-utils gnome2-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jupyter webengine"
+REQUIRED_USE="webengine? ( jupyter )"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtsvg-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	dev-qt/qtnetwork:5
+	>=dev-util/radare2-3.0.0
+	jupyter? ( dev-python/jupyter )
+	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3-config.patch"
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
+		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
+		CUTTER_ENABLE_PYTHON=true
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/cutter/files/cutter-1.8.0-python3-config.patch b/dev-util/cutter/files/cutter-1.8.0-python3-config.patch
new file mode 100644
index 000000000000..e2ab05564721
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.8.0-python3-config.patch
@@ -0,0 +1,31 @@
+diff -Naur cutter-1.8.0-orig/src/Cutter.pro cutter-1.8.0/src/Cutter.pro
+--- cutter-1.8.0-orig/src/Cutter.pro	2019-03-27 12:14:42.436446303 -0400
++++ cutter-1.8.0/src/Cutter.pro	2019-03-27 12:16:26.971448895 -0400
+@@ -118,10 +118,6 @@
+ # Libraries
+ include(lib_radare2.pri)
+ 
+-!win32 {
+-    CONFIG += link_pkgconfig
+-}
+-
+ CUTTER_ENABLE_PYTHON {
+     win32 {
+         PYTHON_EXECUTABLE = $$system("where python", lines)
+@@ -140,10 +136,13 @@
+             LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
+             DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
+         } else {
+-            !packagesExist(python3) {
+-                error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
++            system(type python3-config) {
++                LIBS += $$system(python3-config --libs)
++                TMP = $$system(python3-config --includes)
++                INCLUDEPATH += $$replace(TMP, "-I", "")
++            } else {
++                error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
+             }
+-            PKGCONFIG += python3
+         }
+     }
+ 
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 4b41ee5ae0c0..2f2ef1b0023e 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,7 +1,9 @@
+AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
+AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
-DIST devhelp-3.26.1.tar.xz 613508 BLAKE2B a84d6bb55a81f0beda0603f343022b997e263934fc48ccc95503e156a0ee0984e1c945af785971c45f197865147c63be354ace72582d3575692dd5eed7e1e724 SHA512 76beec8846703004202229853a7a208b31bf56e2f10c102a3bb6e88fb9e54aded027e6ab9620706629dcb02cf5973f1d4fe88d217a7b3b8cb0efc948b02ca660
 DIST devhelp-3.28.1.tar.xz 642992 BLAKE2B d3b3a2768b33fb47f05d35d9e6fe970d2f42c564c37916123d7377515dfb5a8277c51f543d103d4b34b11d72e3fbf4d7efc63296e118b1b6a6ac5ba557376a02 SHA512 a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b
+DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
 EBUILD devhelp-3.24.0.ebuild 1652 BLAKE2B f371d3e2a9119eb5cb29c1b90c538a427fc81a1d00b1658b606a3076050b0b5f813af92dab684e191d156aa6309362ecca8daea03385c34146a3e9f32d376ee5 SHA512 596006b0a3e1c6d005f683be218b843a17593dbdd1f82ee2dfc43868609f318a74f3c48cbd8f4797310d214f885380aeb94c350242f2f81ecd0e6db8cbcad19d
-EBUILD devhelp-3.26.1.ebuild 1720 BLAKE2B a3f309bbee7533f0f4e2f9002578a6f311ab5ed8cb134b5b73a5c7639068a4479479b64c1ec8b0b43cc0b7468cd9d8c6549cac84d97c2b9b79a6986b7cf7af81 SHA512 fb626b2203dd6dac9257eb135cecfa98a315094c5ef2c3faa0604f4d0cdd57571783ad1e7f54a72d33bbbab2398d1e85f029ae3049453a2bbc2399159cd6ad28
 EBUILD devhelp-3.28.1.ebuild 1783 BLAKE2B 06084e4718a94e83d7a8a005f37a021ae7c7d918ef05d531e7f5b01f05d2dc5c3c7dc67262a4e2057ea22a46521c6323fc67d200f21756a5b910f52f3a155a7a SHA512 3e2489ccda475a4c95b0f4f95445036ff88693ca43d11e67b142ccd899064eecac45ef391ce892aeaa11909e94ba962abffa316e4536f41f06bf795680977466
+EBUILD devhelp-3.30.1.ebuild 1854 BLAKE2B dd7a2c7877853ca21744d9d8c5f1048c81b83b912feea173dbe3d1f4fdd0f1bb8556388dd46fc847054a8bbf50e5ec3c18516c3987a02c9bf00eb59dea249667 SHA512 2dc6cbec979f03abb684d974778c2d5d9ae3e5e1edb15a2d5315141f955254bda52a81eacb285876724d8113ad26d84ba59c2d4b2f103134f2985b34da9b2776
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.26.1.ebuild b/dev-util/devhelp/devhelp-3.26.1.ebuild
deleted file mode 100644
index 76edd828bd88..000000000000
--- a/dev-util/devhelp/devhelp-3.26.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-4" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2[dbus]
-	>=x11-libs/gtk+-3.22:3
-	>=net-libs/webkit-gtk-2.6.0:4
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-#  dev-libs/appstream-glib
-#  sys-devel/autoconf-archive
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		${myconf}
-}
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
new file mode 100644
index 000000000000..478d603945ee
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# gedit-3.8 is python3 only, this also per:
+# https://bugzilla.redhat.com/show_bug.cgi?id=979450
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
+IUSE="gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=net-libs/webkit-gtk-2.20:4[introspection?]
+	>=gui-libs/amtk-5.0:5
+	gnome-base/gsettings-desktop-schemas
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-optional-introspection.patch
+	"${FILESDIR}"/${PV}-optional-gedit.patch
+)
+
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dflatpak_build=false
+		$(meson_use gedit gedit_plugin)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use gedit && python_optimize "${ED%/}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
new file mode 100644
index 000000000000..09e4405a50e0
--- /dev/null
+++ b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
@@ -0,0 +1,37 @@
+From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:47:49 +0200
+Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation
+
+---
+ meson.build       | 4 +++-
+ meson_options.txt | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a0def09c..2d1d3e0a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c')
+ ##### end CFLAGS
+ 
+ subdir('data')
+-subdir('plugins/gedit-plugin')
++if get_option('gedit_plugin')
++  subdir('plugins/gedit-plugin')
++endif
+ subdir('po')
+ subdir('help')
+ subdir('devhelp')
+diff --git a/meson_options.txt b/meson_options.txt
+index 2eaa7ff9..8fdb5a89 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
++option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin')
+ option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
+ option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
+-- 
+2.17.0
+
diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
new file mode 100644
index 000000000000..b5afa8a2b874
--- /dev/null
+++ b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
@@ -0,0 +1,38 @@
+From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:44:40 +0200
+Subject: [PATCH 1/2] build: Add optionality for introspection build
+
+---
+ devhelp/meson.build | 2 ++
+ meson_options.txt   | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/devhelp/meson.build b/devhelp/meson.build
+index ea217895..f88fcb07 100644
+--- a/devhelp/meson.build
++++ b/devhelp/meson.build
+@@ -123,6 +123,7 @@ PKG_CONFIG.generate(
+         requires : LIBDEVHELP_DEPS_STR
+ )
+ 
++if get_option('introspection')
+ GNOME.generate_gir(
+         libdevhelp,
+         export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+@@ -139,3 +140,4 @@ GNOME.generate_gir(
+         include_directories : ROOT_INCLUDE_DIR,
+         install : true
+ )
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index a10fc603..2eaa7ff9 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+ option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
+ option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
++option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
+-- 
+2.17.0
+
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 90e5fd32af94..b538fe939c42 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,5 +1,5 @@
-DIST gcovr-3.2.tar.gz 343748 BLAKE2B 721643e837d6469546a3bc3a191dfebff032e17c9a843c56c16c4440ab09a9db35596bf3e92c46784077e164ea1a97bc8b43151f8bddceb8071596ceec42049f SHA512 b8a810cb156acc1bbff108002f49b358c5b4044a6450c9b6a7a682c841e95f8159d42e4a8a1c4742fa82da1e99085ef4ede29a483291be4d79dcf09003829a45
 DIST gcovr-3.3.tar.gz 323226 BLAKE2B fe3d6ab4d24032f57ee17c3fc44b10e0b177aad01b072306a99abc7dbfee07b5f14ef34412d36938302bc279dffb2a25502981ba952339c1b4e896762defabb0 SHA512 e5046bc4e38c99691c3bcc58abdfbbe965c46d02c8c50dbf135bd5108bd9bba1fa450ab0b5e23157a178f7c1303ec9c285470e9be1a14274528e5d7051013a08
-EBUILD gcovr-3.2.ebuild 443 BLAKE2B 9b27a284631c1d23988ff1f0b7e96ef63399bfacdd04d600b0f523e6e8938cb84250da9329d2dd5d559e0103a83313449be85424f1e8ec5b27136a44005c8bbe SHA512 6e2095f225deab3771b83816477e6d9a59d2625d1554bfc810073d60b413059d539d2a9c45c75a107e06337c61c517e7a78aef02b03cf29adb48a296641cf414
-EBUILD gcovr-3.3.ebuild 451 BLAKE2B 566f180c178204fc7db0b9ba5bb8f92263a21120d63a1024de77ac8f6f40fd803e4dcca6773c4bfd979a920feee21dc16febeb83063f415d2ebfaae34f64454c SHA512 a00a118ff852939f363f8db716b02a9d2cf5af229a591a18cdbf397ac1909cf035eef49669cb813269ac038704b5d141c023eb76741b70e35611a021f4efa9c2
-MISC metadata.xml 329 BLAKE2B d81db6e30052ad893c6545b86d613ba960324f98b6dc3587c5becc2e0a92277f61f6c1f5005322cda86eeef50213e1f3c7c8b448d20d1cb5f4c6de1cc27c37fa SHA512 f6ba1f1e9cc2036097acb46bee3d5c4c18788862195613026a7678baea38e591fbc13e4dc9570d7ee0bf93a1f03a3bf198147f45de50411253c109c2163dad8d
+DIST gcovr-4.1.tar.gz 193692 BLAKE2B 5536ecbf0636a3a75083d53e2dc239a48e6df740a037954a2aa2e837e764c0530c73fe32c66078efa4c3a6652f907ec15505c8efbac8a1d861031d34b05f4c74 SHA512 aab2a98421557ffe846f644725e5c6cee65afb0c22ca86ce8713516810bc91bd32caf4c5c18e2628f8f4444de6665478a6001cfce3841a8c394fc0b4309d83fb
+EBUILD gcovr-3.3.ebuild 444 BLAKE2B 663842a76fa5f38b74b7d0dbabdb1c23ffbe2047bc4f78e693a73d817d37737e60c85ced3488af2551ed7338b6034b96c8f20612531c5d949051c796e7954f24 SHA512 e6d6ceddf99dc975e3915779168c64592352b25265aac596cfa57c074cda5e35ca30e72a22a6a83c0dfc1f0eb3ad00b3f1de71e712e56ed09d99c6a8b9d9b362
+EBUILD gcovr-4.1.ebuild 802 BLAKE2B 30ad0d7860d54b1d3f5af200d8254058c734038953590c45e1be1274eff6acb4dd6a54d8cc340ded706c3698ca1b15b00d2ae072b2c5d77cff2fb5b105153c53 SHA512 6e14b13059c0a12328ab76e2e9f03db361a7e470ac07513191b2a3ee4e50b16b96ffdd1a7b3a4e2a322579a97ff9c13371a2649934527ac8a4fbfef1bbe50139
+MISC metadata.xml 404 BLAKE2B 0c1ac87d95e969877abd8993c95d6b723d0faaf645093cc01c3c88dbadce84a218a12d4f799a1e95535d67fcdc5725b02d95cc8b53408af04a1c81382bf223c8 SHA512 472f35c3e963a0eb02f8ede9f996bad20a6b67f364c5b2f40b37b90d552dbc1414af5c01862cd4ed7586a6e02cc10a408134cca6eb994f0b897f2fdef3a2054a
diff --git a/dev-util/gcovr/gcovr-3.2.ebuild b/dev-util/gcovr/gcovr-3.2.ebuild
deleted file mode 100644
index 51ca37e86b40..000000000000
--- a/dev-util/gcovr/gcovr-3.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python script for summarizing gcov data"
-HOMEPAGE="https://github.com/gcovr/gcovr"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/gcovr/gcovr-3.3.ebuild b/dev-util/gcovr/gcovr-3.3.ebuild
index 457c4f4c6415..4c9c447f8021 100644
--- a/dev-util/gcovr/gcovr-3.3.ebuild
+++ b/dev-util/gcovr/gcovr-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/gcovr/gcovr-4.1.ebuild b/dev-util/gcovr/gcovr-4.1.ebuild
new file mode 100644
index 000000000000..0c6dfe433055
--- /dev/null
+++ b/dev-util/gcovr/gcovr-4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python script for summarizing gcov data"
+HOMEPAGE="https://github.com/gcovr/gcovr"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# a bunch of "unknown module" failures
+RESTRICT="test"
+
+python_test() {
+	mkdir "${T}/bin" || die
+	printf -- "#!/bin/bash\nexec PYTHONPATH=\"%s\" python -c 'import gcovr.__main__; gcovr.__main__.main()' -- \"${@}\"" \
+		"${BUILD_DIR}/lib" \
+		> "${T}/bin/gcovr"
+
+	chmod 755 "${T}/bin/gcovr" || die
+
+	PATH="${T}/bin:${PATH}" ${EPYTHON} -m pytest -vv || die
+}
diff --git a/dev-util/gcovr/metadata.xml b/dev-util/gcovr/metadata.xml
index f5957872efbe..c35a878c81da 100644
--- a/dev-util/gcovr/metadata.xml
+++ b/dev-util/gcovr/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">gcovr/gcovr</remote-id>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index e26058ef3b4c..536762a29f54 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,7 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
-DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 EBUILD gdbus-codegen-2.56.4.ebuild 1306 BLAKE2B 0822701e68416ff599d2e5980ca176a10841b74a99f036bc4e4fb187cfcb865b99cbe312af75ba208e959d3a765d0d8beb7ad620475fead87087cfb6a5e51b56 SHA512 f671799d602017a6df349a00711edd80136021041e08c5349844ac94c2b6e759ea3160d2b72ed3a1cbc866d2549cc8fbbfe2bad3053804affd8276aaad225015
-EBUILD gdbus-codegen-2.58.2.ebuild 2130 BLAKE2B b58e9658ecdeaea3e5db2006133bf957993e3d74f98b66f18cd65ebfee45252f8e3bf2c357c44b7128f61da4b041716b42125fe5a50dad05d5d109ee73de9c62 SHA512 83cbd6cab6a158de848b9157a356fb0dc36a68dd4ad04605935a08b4254885e29f6099b858e26731d70173f7501382ce46f4aea9f18eabe0db0e89d79bea368c
-EBUILD gdbus-codegen-2.58.3.ebuild 2125 BLAKE2B b6180ccf6ec81e1b9eed19a6e659619970aedc9b7f5c4c2c33706e8eda5e7a59a4681c268dc14b174af06b345bef355e1a00341589c8b7f9e59c80ed9cafc992 SHA512 281be33cae4ae62cf6238cf21d39f82dbff2e285b363f3a9d42584e42f9da55a6d3ada370ca7c21c6715cbc91df93d6b5dba5a39c964ef8d015bc5dadd4b5c6c
+EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 2f46a4472a03a12102244dcaf5d9f5b551eae8dbf1f805f0fb81810d9777ebe0b3200ceb418d1185b49b8ce337f81421fef36456127885d32fb62e223f25255b SHA512 2292435122c8fa808244132c28aa358414e4d45e59bbbfd46d42067160680150c181fd8be53cf25e7b46d76330930bfec4f96623f9b99a8132726a94f252739c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.2.ebuild
deleted file mode 100644
index 9f7004d0f1c0..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.58.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
index bbf4635b9907..b845598b7295 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 6abb5ba65f3a..bba305b996e5 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,5 @@
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
-DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 EBUILD glib-utils-2.56.4.ebuild 1409 BLAKE2B faac06d9c04b56b3566a3227a3b8cbe8170c3aced4cf1ab2fb2fde119e2423cf81fe6a06c5b147f4154f44ea17bf4d1b2149dc9e5580dfb4dc13b59e35ed0020 SHA512 8f6a3b9b1d9bd0f7d1b393122545a0922b699a7c5a43a3c4a1d14390b92e2a7bbd584eb4970f8554c38827585b1d6ae0220b7f67f712105cdaacf87f03d0472f
-EBUILD glib-utils-2.58.2.ebuild 2411 BLAKE2B 3b498ea0da25ed833915203ac8f4cfa736b46fd8d7d389fb9ca59369a23c1ff04638a50b5ca24fb5db2d7812e68a1051428df0829afa7464739685c7a0ce4558 SHA512 b505bcee6d11c9fba2c05db68959c38456c58d5cb30ee66849e484844f94f1b691d9933f9b702c1afc0610dc52bbec525b23116ae26460dfbf453010a3932305
-EBUILD glib-utils-2.58.3.ebuild 2406 BLAKE2B 03cb75956a88fd798d1bdda0bf16f92ca7b9970160b5c76c6e6feb4e270fe2197a69a467e62890d7cb682f05cb4561bda6e7a6c5bf780ec17e98c8a27c03f0cf SHA512 481139996bedb794b6990ab6d84d57e3cda15adf1ac993d7cc705ba6c453f5682bc0f7482e13df4f38624779fb99b5ffcd2edb406b681c22a5f6cd0fdc8bdc7e
+EBUILD glib-utils-2.58.3.ebuild 2403 BLAKE2B 7c595e8cb50824739ecf33646f0430347e22a5ef927d87e0f03acf804f0634ad628bde59dc14853d080bb5deb9121c7d54da79ef23fa691f74edb5b8178ea6a2 SHA512 61664c33e416c9ecf7d93e6656ee414dbb83ccb2cdd380cf0f5276cb3e66e24b343e19ce1bbf0dd5391e42cf3c63a36c837f08f5ee3695fbf84aea2b3b9a1489
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.58.2.ebuild b/dev-util/glib-utils/glib-utils-2.58.2.ebuild
deleted file mode 100644
index f6a840920a6f..000000000000
--- a/dev-util/glib-utils/glib-utils-2.58.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}
-	!<dev-libs/glib-2.56.2:2
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.58.3.ebuild b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
index 8798d9d0acb2..7492ad8b9c0d 100644
--- a/dev-util/glib-utils/glib-utils-2.58.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index a6dcc1d161dc..585c26aea9d3 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,11 +1,7 @@
-AUX gn-gen-r0.patch 2025 BLAKE2B ee95f445ebbf8ba58724aea497d98a2be257708e59c5c5f237f318b3075d5f75135b935defa794cd37ec81aea9ef3c39648e4b92056e9f0746a31ca75e085a4d SHA512 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7
 AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
-AUX gn-gen-r2.patch 2410 BLAKE2B baec5c55e7fbcb2f98128ec8f43bcbc154b0cd8c5348ccbb964020d8ff36117d83078630ba6b952e6860e7dd7d99a0563a8eb7db39f9fea2b30b11a782c10029 SHA512 ca43a150c8f1902b4ae777a8b015403f2cddd63aa9597dc5f9c527928b6820264e4f9cce9179fedc739e12171e47076b05a8ea686107e7c7c9bf2eab4458bb04
-AUX gn-numerics-arm.patch 7056 BLAKE2B c14f25fa03b5d31aa057d0992ff408176168afef0acc4867f345b4f52b513fc726afb458e0a3e9b45340892e497c03cce1d9bf8da10c90c83d8f6a9cbb9aa031 SHA512 051508e5917775a6ae11d03c69cb4b5260b4eae35a805715204e121cc112f888ff6026a041a942fe49feb59b21a5c7e31cb1a07de63a3d365f7ca13cb13cffdd
-DIST gn-0.1445.tar.gz 958901 BLAKE2B f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300 SHA512 2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06
+AUX gn-gen-r3.patch 1560 BLAKE2B b76caed0277797f9e478465d329933be1418ea01d54cbf2620dfd8bd77fde428705c188a1a5eb2ac0d755622a870c30cebf7e027550ec69698297a64d04145a0 SHA512 80d18a413523ccceccbe8669527cca4b402a400d61c067ece21f8dc2bc9a00d3ac38b24c3f4f399f352d7af20675e1b81eeef3fbde2c681d50354296a8b4cbf5
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
-DIST gn-0.1479.tar.gz 909494 BLAKE2B 5d7165371337be630b2d8dcfd8cd067358d56d8d82501288a56bc15955674f0528fde27056c13f32a2b908576a9e2f28529dec9cd1f259e964405874ce74e90f SHA512 2be22c95952f9993d3f89e932abc0ed08eb2e99a3659322d90bf953b1f68591303b3490e0e55bf3988b1226fefef0a5b7f5d3039eb9ef76e4fe36a2e538ef94a
-EBUILD gn-0.1445.ebuild 1035 BLAKE2B 4379c5852e60d16e4eb7036abd922bfd80d5116d727725ffc887a3c04f951adfed32826d9e5e4780110e61a7b4e547b9b58e912f8d5712b23f88937ebcbfebe3 SHA512 359cae269e45cfb01ebf43205ac0f1c61639d9c9cf62580394245581e55d7812ec356726135a783c75715f998b9b0402230532b890a155d6864c6901318e0006
+DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
-EBUILD gn-0.1479.ebuild 1230 BLAKE2B b3207bdea28d83aef19a657017d8715d6ed8b730e479c3155b0f5b93f7e799f34841195f72b773292006197525cc33fe48b6fe5e08db169327d1f4a126dc2f96 SHA512 27f0e899a344f5ba7c30a84d229044632c86372c8308179bf6f6ecc66dca2a846c76c0b5e6d07440ac1d64db429097a0c8dd0cce3c33d0701eae35f547d3e21b
+EBUILD gn-0.1544.ebuild 1195 BLAKE2B a8476c5c8a3c0cde6dc09e87635764327e95f550977a98d46e1bcfa21255775a95ae999390cb0bcebd60e801c7252fac48d64daf4ca0ea134d68a3cc1db1f457 SHA512 999dc0bc2ee0559259649e19a26372f858e7fb32ce2e3acbff486e890076864d702a3bf203f1e92e5dab54ad0a59895e2b13d691ccba47888d7c9f1c626a2ea4
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r0.patch b/dev-util/gn/files/gn-gen-r0.patch
deleted file mode 100644
index d30af3ab4ac6..000000000000
--- a/dev-util/gn/files/gn-gen-r0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/build/gen.py b/build/gen.py
-index fce8fb18..2927da5f 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -260,17 +260,12 @@ def WriteGNNinja(path, options, linux_sysroot):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      ldflags.append('-O3')
-       # Use -fdata-sections and -ffunction-sections to place each function
-       # or data item into its own section so --gc-sections can eliminate any
-       # unused functions and data items.
-       cflags.extend(['-fdata-sections', '-ffunction-sections'])
-       ldflags.extend(['-fdata-sections', '-ffunction-sections'])
-       ldflags.append('-Wl,-dead_strip' if is_mac else '-Wl,--gc-sections')
--      # Omit all symbol information from the output file.
--      ldflags.append('-Wl,-S' if is_mac else '-Wl,-strip-all')
-       # Enable identical code-folding.
-       if options.use_icf:
-         ldflags.append('-Wl,--icf=all')
-@@ -279,11 +274,11 @@ def WriteGNNinja(path, options, linux_sysroot):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-     ])
-     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+    ldflags.append('-pthread')
- 
-     if is_linux:
-       if linux_sysroot:
-@@ -293,15 +288,6 @@ def WriteGNNinja(path, options, linux_sysroot):
-         # probably resolve this and (re-)add a way to build against libc++.
-         cflags.append('--sysroot=' + linux_sysroot)
-         ldflags.append('--sysroot=' + linux_sysroot)
--      cflags.append('-stdlib=libstdc++')
--      ldflags.extend(['-static-libstdc++',
--                      '-stdlib=libstdc++',
--                      '-Wl,--as-needed',
--                     ])
--      libs.extend([
--          '-lgcc_s',
--          '-lpthread',
--      ])
-     elif is_mac:
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/files/gn-gen-r2.patch b/dev-util/gn/files/gn-gen-r2.patch
deleted file mode 100644
index 701a317bf023..000000000000
--- a/dev-util/gn/files/gn-gen-r2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 00e907811ea7fc56de73ad44903946a9179b1c4f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 14 Oct 2018 20:34:07 -0400
-Subject: [PATCH] Remove unwanted cflags/ldflags parameters
-
----
- build/gen.py | 19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/build/gen.py b/build/gen.py
-index 11c92460..b186e3b0 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      ldflags.append('-O3')
-       # Use -fdata-sections and -ffunction-sections to place each function
-       # or data item into its own section so --gc-sections can eliminate any
-       # unused functions and data items.
-@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         # Garbage collection is done by default on aix.
-         ldflags.append('-Wl,--gc-sections')
- 
--      # Omit all symbol information from the output file.
--      if platform.is_darwin():
--        ldflags.append('-Wl,-S')
--      elif platform.is_aix():
--        ldflags.append('-Wl,-s')
--      else:
--        ldflags.append('-Wl,-strip-all')
--
-       # Enable identical code-folding.
-       if options.use_icf:
-         ldflags.append('-Wl,--icf=all')
-@@ -356,12 +345,12 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-         '-fdiagnostics-color',
-     ])
-     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+    ldflags.extend(['-pthread'])
- 
-     if platform.is_linux():
-       if linux_sysroot:
-@@ -369,14 +358,8 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         cflags.append('--sysroot=' + linux_sysroot)
-         ldflags.append('--sysroot=' + linux_sysroot)
-       ldflags.extend([
--          '-static-libstdc++',
-           '-Wl,--as-needed',
-       ])
--      libs.extend([
--          # These are needed by libc++.
--          '-ldl',
--          '-lpthread',
--      ])
-     elif platform.is_darwin():
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
--- 
-2.19.1
-
diff --git a/dev-util/gn/files/gn-gen-r3.patch b/dev-util/gn/files/gn-gen-r3.patch
new file mode 100644
index 000000000000..362a6854a264
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r3.patch
@@ -0,0 +1,48 @@
+From bedf2161dea8cf4813fd14891feee2e8e8d5bf28 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 14 Oct 2018 20:34:07 -0400
+Subject: [PATCH] Remove unwanted cflags/ldflags parameters
+
+---
+ build/gen.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index a7142fab..06d5e2b3 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -278,11 +278,6 @@ def WriteGNNinja(path, platform, host, options):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      if options.no_strip:
+-        cflags.append('-g')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -311,7 +306,6 @@ def WriteGNNinja(path, platform, host, options):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+         '-fdiagnostics-color',
+@@ -320,11 +314,8 @@ def WriteGNNinja(path, platform, host, options):
+ 
+     if platform.is_linux():
+       ldflags.extend([
+-          '-static-libstdc++',
+           '-Wl,--as-needed',
+       ])
+-      # This is needed by libc++.
+-      libs.append('-ldl')
+     elif platform.is_darwin():
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
+-- 
+2.21.0
+
diff --git a/dev-util/gn/files/gn-numerics-arm.patch b/dev-util/gn/files/gn-numerics-arm.patch
deleted file mode 100644
index f822cdb40852..000000000000
--- a/dev-util/gn/files/gn-numerics-arm.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 8952cb06749d4bd390991878281bc7e72a6eef2c Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster@gmail.com>
-Date: Mon, 10 Dec 2018 10:27:20 -0500
-Subject: [PATCH] Add missing headers for ARM
-
-Bug: https://bugs.gentoo.org/672862
----
- base/numerics/safe_conversions_arm_impl.h |  51 +++++++++
- base/numerics/safe_math_arm_impl.h        | 122 ++++++++++++++++++++++
- 2 files changed, 173 insertions(+)
- create mode 100644 base/numerics/safe_conversions_arm_impl.h
- create mode 100644 base/numerics/safe_math_arm_impl.h
-
-diff --git a/base/numerics/safe_conversions_arm_impl.h b/base/numerics/safe_conversions_arm_impl.h
-new file mode 100644
-index 00000000..da5813f6
---- /dev/null
-+++ b/base/numerics/safe_conversions_arm_impl.h
-@@ -0,0 +1,51 @@
-+// Copyright 2017 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
-+#define BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
-+
-+#include <cassert>
-+#include <limits>
-+#include <type_traits>
-+
-+#include "base/numerics/safe_conversions_impl.h"
-+
-+namespace base {
-+namespace internal {
-+
-+// Fast saturation to a destination type.
-+template <typename Dst, typename Src>
-+struct SaturateFastAsmOp {
-+  static const bool is_supported =
-+      std::is_signed<Src>::value && std::is_integral<Dst>::value &&
-+      std::is_integral<Src>::value &&
-+      IntegerBitsPlusSign<Src>::value <= IntegerBitsPlusSign<int32_t>::value &&
-+      IntegerBitsPlusSign<Dst>::value <= IntegerBitsPlusSign<int32_t>::value &&
-+      !IsTypeInRangeForNumericType<Dst, Src>::value;
-+
-+  __attribute__((always_inline)) static Dst Do(Src value) {
-+    int32_t src = value;
-+    typename std::conditional<std::is_signed<Dst>::value, int32_t,
-+                              uint32_t>::type result;
-+    if (std::is_signed<Dst>::value) {
-+      asm("ssat %[dst], %[shift], %[src]"
-+          : [dst] "=r"(result)
-+          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value <= 32
-+                                            ? IntegerBitsPlusSign<Dst>::value
-+                                            : 32));
-+    } else {
-+      asm("usat %[dst], %[shift], %[src]"
-+          : [dst] "=r"(result)
-+          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value < 32
-+                                            ? IntegerBitsPlusSign<Dst>::value
-+                                            : 31));
-+    }
-+    return static_cast<Dst>(result);
-+  }
-+};
-+
-+}  // namespace internal
-+}  // namespace base
-+
-+#endif  // BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
-diff --git a/base/numerics/safe_math_arm_impl.h b/base/numerics/safe_math_arm_impl.h
-new file mode 100644
-index 00000000..a7cda1bb
---- /dev/null
-+++ b/base/numerics/safe_math_arm_impl.h
-@@ -0,0 +1,122 @@
-+// Copyright 2017 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
-+#define BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
-+
-+#include <cassert>
-+#include <limits>
-+#include <type_traits>
-+
-+#include "base/numerics/safe_conversions.h"
-+
-+namespace base {
-+namespace internal {
-+
-+template <typename T, typename U>
-+struct CheckedMulFastAsmOp {
-+  static const bool is_supported =
-+      FastIntegerArithmeticPromotion<T, U>::is_contained;
-+
-+  // The following is much more efficient than the Clang and GCC builtins for
-+  // performing overflow-checked multiplication when a twice wider type is
-+  // available. The below compiles down to 2-3 instructions, depending on the
-+  // width of the types in use.
-+  // As an example, an int32_t multiply compiles to:
-+  //    smull   r0, r1, r0, r1
-+  //    cmp     r1, r1, asr #31
-+  // And an int16_t multiply compiles to:
-+  //    smulbb  r1, r1, r0
-+  //    asr     r2, r1, #16
-+  //    cmp     r2, r1, asr #15
-+  template <typename V>
-+  __attribute__((always_inline)) static bool Do(T x, U y, V* result) {
-+    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
-+    Promotion presult;
-+
-+    presult = static_cast<Promotion>(x) * static_cast<Promotion>(y);
-+    *result = static_cast<V>(presult);
-+    return IsValueInRangeForNumericType<V>(presult);
-+  }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedAddFastAsmOp {
-+  static const bool is_supported =
-+      BigEnoughPromotion<T, U>::is_contained &&
-+      IsTypeInRangeForNumericType<
-+          int32_t,
-+          typename BigEnoughPromotion<T, U>::type>::value;
-+
-+  template <typename V>
-+  __attribute__((always_inline)) static V Do(T x, U y) {
-+    // This will get promoted to an int, so let the compiler do whatever is
-+    // clever and rely on the saturated cast to bounds check.
-+    if (IsIntegerArithmeticSafe<int, T, U>::value)
-+      return saturated_cast<V>(x + y);
-+
-+    int32_t result;
-+    int32_t x_i32 = x;
-+    int32_t y_i32 = y;
-+
-+    asm("qadd %[result], %[first], %[second]"
-+        : [result] "=r"(result)
-+        : [first] "r"(x_i32), [second] "r"(y_i32));
-+    return saturated_cast<V>(result);
-+  }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedSubFastAsmOp {
-+  static const bool is_supported =
-+      BigEnoughPromotion<T, U>::is_contained &&
-+      IsTypeInRangeForNumericType<
-+          int32_t,
-+          typename BigEnoughPromotion<T, U>::type>::value;
-+
-+  template <typename V>
-+  __attribute__((always_inline)) static V Do(T x, U y) {
-+    // This will get promoted to an int, so let the compiler do whatever is
-+    // clever and rely on the saturated cast to bounds check.
-+    if (IsIntegerArithmeticSafe<int, T, U>::value)
-+      return saturated_cast<V>(x - y);
-+
-+    int32_t result;
-+    int32_t x_i32 = x;
-+    int32_t y_i32 = y;
-+
-+    asm("qsub %[result], %[first], %[second]"
-+        : [result] "=r"(result)
-+        : [first] "r"(x_i32), [second] "r"(y_i32));
-+    return saturated_cast<V>(result);
-+  }
-+};
-+
-+template <typename T, typename U>
-+struct ClampedMulFastAsmOp {
-+  static const bool is_supported = CheckedMulFastAsmOp<T, U>::is_supported;
-+
-+  template <typename V>
-+  __attribute__((always_inline)) static V Do(T x, U y) {
-+    // Use the CheckedMulFastAsmOp for full-width 32-bit values, because
-+    // it's fewer instructions than promoting and then saturating.
-+    if (!IsIntegerArithmeticSafe<int32_t, T, U>::value &&
-+        !IsIntegerArithmeticSafe<uint32_t, T, U>::value) {
-+      V result;
-+      if (CheckedMulFastAsmOp<T, U>::Do(x, y, &result))
-+        return result;
-+      return CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y));
-+    }
-+
-+    assert((FastIntegerArithmeticPromotion<T, U>::is_contained));
-+    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
-+    return saturated_cast<V>(static_cast<Promotion>(x) *
-+                             static_cast<Promotion>(y));
-+  }
-+};
-+
-+}  // namespace internal
-+}  // namespace base
-+
-+#endif  // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
--- 
-2.20.0.rc2
-
diff --git a/dev-util/gn/gn-0.1445.ebuild b/dev-util/gn/gn-0.1445.ebuild
deleted file mode 100644
index 8f8649a10435..000000000000
--- a/dev-util/gn/gn-0.1445.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
-HOMEPAGE="https://gn.googlesource.com/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ninja
-"
-
-PATCHES=(
-	"${FILESDIR}"/gn-gen-r0.patch
-)
-
-pkg_setup() {
-	:
-}
-
-src_configure() {
-	python_setup
-	tc-export AR CC CXX
-	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
-	echo "$@"
-	"$@" || die
-	cat >out/last_commit_position.h <<-EOF || die
-	#ifndef OUT_LAST_COMMIT_POSITION_H_
-	#define OUT_LAST_COMMIT_POSITION_H_
-	#define LAST_COMMIT_POSITION "${PV}"
-	#endif  // OUT_LAST_COMMIT_POSITION_H_
-	EOF
-}
-
-src_compile() {
-	eninja -C out gn
-}
-
-src_test() {
-	eninja -C out gn_unittests
-	out/gn_unittests || die
-}
-
-src_install() {
-	dobin out/gn
-	einstalldocs
-}
diff --git a/dev-util/gn/gn-0.1479.ebuild b/dev-util/gn/gn-0.1544.ebuild
index 89fd565c9595..92d8f91252f3 100644
--- a/dev-util/gn/gn-0.1479.ebuild
+++ b/dev-util/gn/gn-0.1544.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,8 +21,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/gn-gen-r2.patch
-	"${FILESDIR}"/gn-numerics-arm.patch
+	"${FILESDIR}"/gn-gen-r3.patch
 )
 
 pkg_setup() {
@@ -33,8 +32,8 @@ src_configure() {
 	python_setup
 	tc-export AR CC CXX
 	unset CFLAGS
-	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
-	echo "$@"
+	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip
+	echo "$@" >&2
 	"$@" || die
 	cat >out/last_commit_position.h <<-EOF || die
 	#ifndef OUT_LAST_COMMIT_POSITION_H_
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 9532bd578abd..8dd643764641 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,18 +1,8 @@
 AUX 3.24.2-jedi-fixes-1.patch 1224 BLAKE2B 4e3ea7702ddc69f892522596c9ff33495556b2d3cf1bcc2f09db7773d6f833b39e3a65f26813b1c75255c60ea5b0f0477439d25e7897f9d45baa84e6166f8d11 SHA512 f46e3a2e5128873bf8dc2ece5bca060d4d2dc936ce21127ce023f606c4841f888b5acaedf5500c1a5e2af634f12d1594e7dbb3480726ac871ca73e47c6fd0639
 AUX 3.24.2-jedi-fixes-2.patch 928 BLAKE2B 8fb3e4bb34217309475431ea66f24c003e27a89314d1eafff37b11eb9f79c76b7bddb78899e9cf78215dd72e5da27e6f416757db40921f06904ec6a215ea1dd6 SHA512 e5b08a6ad2e182e9340d49876b0ee61f9a5e97abb8c31361ee5058647490894b741250c0850adfb18f93005ccebbbbff5c0ca6fe75f61d1895816f33e4801af0
 AUX 3.24.2-jedi-fixes-3.patch 8966 BLAKE2B 9dc40ddc73ae2ca5b0cbb6202391eb3aa550771dd65f7fac84e724d207c5867129c8607417279c78aa469234e62a3e1f62cb294701948b5741b06c4a0aecbf9d SHA512 5481e325a338cea5946a4515e8e532c8d516b0f05a2f3c7ad33dc3e9bbc83024bb8ceb2f0913b1795fdc57e856b37ccaf314e05b414d27669a4819b63747f255
-AUX 3.28.4-fix-docs-option.patch 1504 BLAKE2B 8a20eb2f54661bb21c395c5a056a38a5a436d0b16eeb0481d1b77785c0344f1ad36f9e53beaf7eae46c7770211c7ea498edbd678c11b8b48221e375e175563e1 SHA512 ae8873baf05ad04d8fbd22d31f8c87fec0fa0daca5a382d4d8edd955a3fda9e795b611449c4d6de82ab732a76425eeed734c9e9d840b792246fecdd7abb1fc80
-AUX 3.28.4-fix-tests-schemadir.patch 962 BLAKE2B d027e41385f37239ca8a7c71b191a22032d15382bae093fff839edfbeb28df10e6fc86b15731f16a691a912883edb9daed3f623e573fd679edf8a8d2f3fc0ca2 SHA512 94da1944b15f7c10ec88b1ed852407f89d4018ea96b5f4037471e1b008ff66150e824341cdce94d914047c0dd8e46bc929712a50c59529037feec77a365f3650
-AUX 3.28.4-jedi-0.12-compat.patch 3659 BLAKE2B 9d259cf65c6cc3c164615af1cdef288fdaf5e39bdd23823119d7c534234a396a9acf07a0bfa217b66dd10281e21726b81001f4a51b429cb16d9f3fe1b986c94a SHA512 1c70278890b833dd6abbaaf526f5208c0cd6faa14a3333d2140d1fc363c04b43a46cfc3c9c7bbbd70eee5fcf364ce42115bf5902436aad1b0d64077179e514be
-AUX 3.28.4-python37-fix.patch 2518 BLAKE2B 6e9025560bf84accee9ed8b88af65204342eb16eee657b5ce43ec20412d3cb62e6a024e1243370d6cdc29721ed91e4125c066ca7dc9818b0c9ea41341b60ee53 SHA512 8e4bed650f19c45811396977ca0c366059dbcf12a3247e1662e902699cbb96c20741b4d39f399cd34cb5dfbbfa96f85ee0a3c64a36bc85c39f7a483707d25f58
-AUX 3.28.4-valac.patch 559 BLAKE2B bf7d217ea0d9432fe27445c0641f92361577deb50d81d5d52fd1b5c40d088946c05d2525e7b0a876681e33da65ecc7df8be417910a3be1a92c425479879f573d SHA512 98923a2db0c370f487d364ad909b79ae2e11bba680c89f61808a1708170f05a9e8171512914f084b583190a5b4b22f6386f38f4420e31cb9ede2ed361ccb4366
 DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
-DIST gnome-builder-3.28.4.tar.xz 9309060 BLAKE2B a4402452ffaf64cc767edb9cba65b74a88cb77d04ca2ffecd3b01c53382930891c2c03e2528861f4d28ca3643465b6767235e945f44cc37d2d716bcbb3ab25c8 SHA512 ef83b909f295d83478aa7d5deb8b5d8291ddf6134e147e88452cdba8ff449a2415d0381d63d3f82cf28942b1096a704de64540c8cdf5f06c21c8278c93fbbc03
-DIST gnome-builder-3.30.2-patchset.tar.xz 43720 BLAKE2B c444117232c6560e68cad46134327e94b361cf89c4f68f2e68940e8a46d2a42720aa5e881dcb3153a3c75057cfacd8c67287a8bb0740999d4628ab6498db7c32 SHA512 e17a0357d2a3e6c059ef27dbf591ad3acfa6f5d7d58f47ca8ebc6dc6883a1bb1bb87b15f3c564c2babc5857e9de4a7a47934398d0000880f233265d7254087d3
-DIST gnome-builder-3.30.2.tar.xz 9478508 BLAKE2B 546328df141582d0d15317166c27493ac1f0b813680607f05de3429301cf8e4937cfc51bff69db26cd4ef1a8ef02aadd5aaa643c857eeabf9b16606a2a3a5cda SHA512 39087e3a30a807b7374167ba4c5295a9161e3c8d8e409172dcd28c52db48e72cd9303c2d4ff8fd11d4bfc70af6c810e5dc254c4c74b646875206221cff3bad57
 DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f
-EBUILD gnome-builder-3.24.2-r1.ebuild 5195 BLAKE2B 2d9dbfd2abcf2261221ef5310853501d93f64db9e235a0b0b1b843a754306033dd26ebc239ef46ee05d8109f35f85055359fc2ce66ea6bf2007dea80f621b3de SHA512 ac2295cdc97874f921a65cf6cd5f766b9deb94dd1cd171e8d0568964c0d2f9e5aa8addeb6410af5174c2c6f636332cfacd171c3d2862bb586baaf0e0bd05e227
-EBUILD gnome-builder-3.28.4.ebuild 7642 BLAKE2B efa930bf7f780419b101adf3e52428f4d6c9b971fa3e34ead9dedae6f2dcb9fb16cf187595359543e0c1a8a684a1f30e659ebc61fe2300c346d15442d77b8e30 SHA512 879a4d217c7b8bd9b5c3c7b6aaed99d8c8adff23717a84ed7bf56b503819aa6494f3b7d64b73b4c0a16291e640bc0f2b5203db0414cf8b74f6345ba6f1f50ad6
-EBUILD gnome-builder-3.30.2.ebuild 7203 BLAKE2B 520b057ce700e10ef365227d87cd79860c715c2aa058219f96822033f4e2e96b682a7f8ce158cc87a2755b35a4c4b2f6c51c2306ed36ccffea84d5cb83048e58 SHA512 0e48bbb51a694af872a590705f69d9dd36ffff6ff8e9dc9cd4264e43eb951e8e7ca05c4f3be7cecc6789f8b4f0dc611e1a232a3122ce19e6232be7a7b4fe81c7
+EBUILD gnome-builder-3.24.2-r1.ebuild 5207 BLAKE2B 25ebe0af2a9907e1d9f7c77d079190e35946ca846f1d2a1251a4547e1190f65b45514cdfb9b9f3757c9533b730381f430388b2f79b799c9e5cd496c67b2c200a SHA512 74b8fcee5eacb5a0dabe117de94ef6cc1acf4e5e36d5715563e953d309e3ba89ec3945e546e1897db38da2aa2261e9ebadd38e1caf598525e9a7b0ec7eef54f8
 EBUILD gnome-builder-3.30.3.ebuild 7027 BLAKE2B 0c39dcd0dee45c881e514c4a16b928100e5f98db25b452e469f35dccf5ba67be06f472d466162412a6c8b1c578a328495c9f3b5126a9efbd3fde389ac1cc9281 SHA512 06b450aeb1d5541ee36efb77bfe597b0343387112e2ab162cf7e8b130aaa24d47bc8b8417c2cb68ad90652350fba7c4f5745f4797dbb75d59158f2a3f8d2fac8
 MISC metadata.xml 1114 BLAKE2B 34d8dba8d48edca606ec56c996b93a6e47736e5d92aa20b71bf8f2a4c46cda82d3023b4c253357c7126e91ece1d12d9043cd020a2de2a5390ee984f97be4e552 SHA512 1882f56d3f5f88db34f37559f4f64bcab0f01e9496c4316358229e5662347f66ad2eb987571df8596b12a4170cf9ba5a2a41d39d82f1687d21753b1c5716c2a5
diff --git a/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch b/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch
deleted file mode 100644
index ca2323f314a0..000000000000
--- a/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 054ef6d2e47da9f41e7c24908b251d074e11a03b Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Wed, 8 Aug 2018 13:03:50 -0700
-Subject: [PATCH] help: fix get_option() to check for proper value
-
-We want to check for help docs, not sdk docs. Also, if enabled, don't be
-automatic about it. Fail hard so the caller knows there is an issue.
----
- doc/help/meson.build | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/doc/help/meson.build b/doc/help/meson.build
-index 1336e6a26..e684f078c 100644
---- a/doc/help/meson.build
-+++ b/doc/help/meson.build
-@@ -1,15 +1,13 @@
--if get_option('with_docs')
-+if get_option('with_help')
- 
--sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: false)
-+sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: true)
- 
--if sphinx.found()
--    custom_target('en user documentation',
--                  command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'],
--                   output: 'en',
--         build_by_default: true)
-+custom_target('en user documentation',
-+           command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'],
-+            output: 'en',
-+  build_by_default: true
-+)
- 
--
--    install_subdir(meson.current_build_dir() + '/en', install_dir: pkgdocdir_abs)
--endif
-+install_subdir(meson.current_build_dir() + '/en', install_dir: pkgdocdir_abs)
- 
- endif
--- 
-2.17.0
-
diff --git a/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch b/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch
deleted file mode 100644
index 3c427c415841..000000000000
--- a/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a66b2d99f21bff6986b0dda5b7cc9ee393be934a Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 29 Aug 2018 12:30:14 +0300
-Subject: [PATCH] build: Fix GSETTINGS_SCHEMA_DIR envvar handling in tests
-
-GSETTINGS_SCHEMA_DIR does not support multiple colon-separated paths.
----
- src/tests/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index 646f6f875..42c0e6d28 100644
---- a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -16,7 +16,7 @@ ide_test_env = [
-   'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-   'G_DEBUG=gc-friendly',
-   'GSETTINGS_BACKEND=memory',
--  'GSETTINGS_SCHEMA_DIR=@0@/data/gsettings:$(GSETTINGS_SCHEMA_DIR)'.format(meson.build_root()),
-+  'GSETTINGS_SCHEMA_DIR=@0@/data/gsettings'.format(meson.build_root()),
-   'PYTHONDONTWRITEBYTECODE=yes',
-   'MALLOC_CHECK_=2',
- #  'MALLOC_PERTURB_=$((${RANDOM:-256} % 256))',
--- 
-2.17.0
-
diff --git a/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch b/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch
deleted file mode 100644
index 4132e2d1bfef..000000000000
--- a/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 799a378b96cad5dc9b1093604e76ed362d22f4cc Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Sun, 27 May 2018 20:19:34 -0700
-Subject: [PATCH] jedi: minimal attempt to get things working again
-
-This tries to get some of our jedi code working with recent API changes
-in the jedi project.
-
-This is just a minimal fix, and I'd expect some others may be needed for
-improved functionality.
-
-Fixes #403
----
- src/plugins/jedi/jedi_plugin.py | 44 ++++++++++++++++++++++-----------
- 1 file changed, 29 insertions(+), 15 deletions(-)
-
-diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py
-index fd8e15d68..052500da1 100644
---- a/src/plugins/jedi/jedi_plugin.py
-+++ b/src/plugins/jedi/jedi_plugin.py
-@@ -91,8 +91,14 @@ try:
-     import jedi
-     from jedi.evaluate.compiled import CompiledObject
-     from jedi.evaluate.compiled import get_special_object
--    from jedi.evaluate.compiled import _create_from_name
--    from jedi.evaluate.context import Context
-+    try:
-+        # 0.12
-+        from jedi.evaluate.compiled import create_from_name
-+        from jedi.evaluate.base_context import Context
-+    except ImportError:
-+        # Pre 0.12
-+        from jedi.evaluate.compiled import _create_from_name as create_from_name
-+        from jedi.evaluate.context import Context
-     from jedi.evaluate.docstrings import _evaluate_for_statement_string
-     from jedi.evaluate.imports import Importer
- 
-@@ -175,23 +181,31 @@ try:
-                         pass
-             return module_list
- 
--    original_jedi_get_module = jedi.evaluate.compiled.fake.get_module
--
--    def patched_jedi_get_module(obj):
--        "Work around a weird bug in jedi"
--        try:
--            return original_jedi_get_module(obj)
--        except ImportError as e:
--            if e.msg == "No module named 'gi._gobject._gobject'":
--                return original_jedi_get_module('gi._gobject')
-+    try:
-+        # Pre 0.12 workaround
-+        # TODO: What needs to be fixed here for 0.12?
-+        original_jedi_get_module = jedi.evaluate.compiled.fake.get_module
-+        def patched_jedi_get_module(obj):
-+            "Work around a weird bug in jedi"
-+            try:
-+                return original_jedi_get_module(obj)
-+            except ImportError as e:
-+                if e.msg == "No module named 'gi._gobject._gobject'":
-+                    return original_jedi_get_module('gi._gobject')
-+        jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module
-+    except:
-+        pass
- 
--    jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module
-     jedi.evaluate.compiled.CompiledObject = PatchedJediCompiledObject
--    jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod
-+    try:
-+        jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod
-+    except AttributeError:
-+        jedi.evaluate.context.instance.CompiledBoundMethod = PatchedCompiledBoundMethod
-     jedi.evaluate.imports.Importer = PatchedJediImporter
-     HAS_JEDI = True
--except ImportError:
-+except ImportError as ex:
-     print("jedi not found, python auto-completion not possible.")
-+    print(ex)
-     HAS_JEDI = False
- 
- GIR_PATH_LIST = []
-@@ -376,7 +390,7 @@ class JediCompletionProvider(Ide.Object, GtkSource.CompletionProvider, Ide.Compl
-         return False
- 
-     def do_populate(self, context):
--        self.current_word = Ide.CompletionProvider.context_current_word(context)
-+        self.current_word = Ide.CompletionProvider.context_current_word(context) or ''
-         self.current_word_lower = self.current_word.lower()
- 
-         _, iter = context.get_iter()
--- 
-2.17.0
-
diff --git a/dev-util/gnome-builder/files/3.28.4-python37-fix.patch b/dev-util/gnome-builder/files/3.28.4-python37-fix.patch
deleted file mode 100644
index 2fc6ee5be06f..000000000000
--- a/dev-util/gnome-builder/files/3.28.4-python37-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e1d32d76231b1051a2380995f4a7822aa525375a Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 11 Jul 2018 11:57:06 +0100
-Subject: [PATCH] Python: Avoid identifier 'async', which became a keyword in
- 3.7
-
-This is an incompatible change, but so is async becoming an identifier.
-
-Fixes: #565
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903558
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- src/libide/Ide.py               | 6 +++---
- src/plugins/jedi/jedi_plugin.py | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libide/Ide.py b/src/libide/Ide.py
-index 02bb61937..07d429c7a 100644
---- a/src/libide/Ide.py
-+++ b/src/libide/Ide.py
-@@ -41,9 +41,9 @@ class _Gio_DBusMethodInfo:
-     in_args = None
-     out_signature = None
- 
--def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=False):
-+def DBusMethod(dbus_interface, in_signature=None, out_signature=None, is_async=False):
-     def decorator(func):
--        func._is_async = async
-+        func._is_async = is_async
- 
-         func._dbus_method = _Gio_DBusMethodInfo()
-         func._dbus_method.interface = dbus_interface
-@@ -54,7 +54,7 @@ def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=Fals
-         in_signature_list = GLib.Variant.split_signature('('+in_signature+')')
-         arg_names = inspect.getargspec(func).args
-         arg_names.pop(0) # eat "self" argument
--        if async: arg_names.pop(0) # eat "invocation"
-+        if is_async: arg_names.pop(0) # eat "invocation"
-         if len(in_signature) != len(arg_names):
-             raise TypeError('specified signature %s for method %s does not match length of arguments' % (str(in_signature_list), func.func_name))
-         for pair in zip(in_signature_list, arg_names):
-diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py
-index 84bd11c27..a346a342e 100644
---- a/src/plugins/jedi/jedi_plugin.py
-+++ b/src/plugins/jedi/jedi_plugin.py
-@@ -688,7 +688,7 @@ class JediService(Ide.DBusService):
-         self.queue = {}
-         self.handler_id = 0
- 
--    @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', async=True)
-+    @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', is_async=True)
-     def CodeComplete(self, invocation, filename, line, column, content):
-         if filename in self.queue:
-             request = self.queue.pop(filename)
--- 
-2.17.0
-
diff --git a/dev-util/gnome-builder/files/3.28.4-valac.patch b/dev-util/gnome-builder/files/3.28.4-valac.patch
deleted file mode 100644
index acb1c54f8519..000000000000
--- a/dev-util/gnome-builder/files/3.28.4-valac.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/plugins/vala-pack/meson.build b/src/plugins/vala-pack/meson.build
-index dd36d351d..a8c53c6e5 100644
---- a/src/plugins/vala-pack/meson.build
-+++ b/src/plugins/vala-pack/meson.build
-@@ -6,8 +6,8 @@ endif
- 
- add_languages('vala')
- 
--valac = find_program ('valac')
--libvala_version = run_command(valac, '--api-version').stdout().strip()
-+valac = meson.get_compiler('vala')
-+libvala_version = run_command(valac.cmd_array()[0], '--api-version').stdout().strip()
- libvala = dependency('libvala-@0@'.format(libvala_version))
- 
- vala_pack_sources = [
diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
index 296e94b87677..b73fb3fee895 100644
--- a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.24.2-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
@@ -41,7 +41,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.9.0
 	>=x11-libs/pango-1.38.0
 	>=dev-libs/libpeas-1.18.0[python,${PYTHON_USEDEP}]
-	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/json-glib-1.2.0[introspection]
 	>=app-text/gspell-1.2.0
 	>=app-text/enchant-1.6.0
 	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
diff --git a/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild b/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild
deleted file mode 100644
index c963ac48f1fa..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-VALA_MIN_API_VERSION="0.36"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clang +devhelp doc +git gtk-doc sysprof vala webkit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ${LIBGIT_DEPS} and libsoup-2.4.pc >=2.52.0
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet)
-LIBGIT_DEPS="
-	dev-libs/libgit2[ssh,threads]
-	>=dev-libs/libgit2-glib-0.25.0[ssh]
-"
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.28.0[introspection,vala?]
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.22.26:3[introspection]
-	>=x11-libs/gtksourceview-3.24.0:3.0[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.28.0[vala?]
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_USEDEP}]
-	>=dev-libs/template-glib-3.28.0[introspection,vala?]
-	>=x11-libs/vte-0.40.2:2.91[vala?]
-	>=dev-libs/libxml2-2.9.0
-	git? ( ${LIBGIT_DEPS} )
-	dev-libs/libpcre:3
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
-
-	>=dev-libs/gobject-introspection-1.48.0:=
-	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	sysprof? ( >=dev-util/sysprof-3.28.0[gtk] )
-	vala? (
-		dev-lang/vala:=
-		$(vala_depend)
-	)
-" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
-#   usage in vapa-pack plugin and need it rebuilt before removing an older vala it was built against
-# TODO: runtime ctags path finding..
-# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2
-#	>=app-text/gspell-1.2.0
-#	>=app-text/enchant:2
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for appdata.xml gettext translation and validation of it with appstream-util with FEATURES=test
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust language server via rls; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-python37-fix.patch # async 3.7 keyword usage removal
-	"${FILESDIR}"/${PV}-jedi-0.12-compat.patch # preliminary jedi-0.12 compatibility from 3.29.9x/git
-	"${FILESDIR}"/${PV}-valac.patch # Make valapack honor VALAC env var - https://gitlab.gnome.org/GNOME/gnome-builder/merge_requests/109
-	"${FILESDIR}"/${PV}-fix-docs-option.patch # Fix USE=doc to work without USE=gtk-doc
-	"${FILESDIR}"/${PV}-fix-tests-schemadir.patch # Fix tests GSETTINGS_SCHEMA_DIR handling (or tests fail on fresh install) - https://gitlab.gnome.org/GNOME/gnome-builder/merge_requests/111
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false
-		-Denable_profiling=false # not passing -pg to CFLAGS
-		-Dwith_channel=other
-		-Dwith_editorconfig=true # needs libpcre
-		$(meson_use webkit with_webkit)
-		$(meson_use vala with_vapi)
-		$(meson_use doc with_help)
-		$(meson_use gtk-doc with_docs)
-
-		$(meson_use clang with_clang)
-		$(meson_use devhelp with_devhelp)
-		-Dwith_deviced=false
-		-Dwith_flatpak=false
-		$(meson_use git with_git)
-		$(meson_use webkit with_html_preview)
-		-Dwith_spellcheck=false # TODO: requires enchant-2
-		$(meson_use sysprof with_sysprof)
-		$(meson_use vala with_vala_pack)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-src_test() {
-	# FIXME: this should be handled at meson level upstream like epiphany does
-	find "${S}" -name '*.gschema.xml' -exec cp {} "${BUILD_DIR}/data/gsettings" \; || die
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${BUILD_DIR}/data/gsettings" || die
-
-	virtx meson_src_test
-}
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild
deleted file mode 100644
index 09aad7b39c46..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-VALA_MIN_API_VERSION="0.36"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and ${LIBGIT_DEPS}
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet)
-LIBGIT_DEPS="
-	dev-libs/libgit2[ssh,threads]
-	>=dev-libs/libgit2-glib-0.25.0[ssh]
-"
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.30.2[introspection,vala?]
-	>=dev-libs/glib-2.58.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.0:4[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.30.1[vala?]
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_USEDEP}]
-	>=dev-libs/template-glib-3.28.0[introspection,vala?]
-	>=x11-libs/vte-0.40.2:2.91[vala?]
-	>=dev-libs/libxml2-2.9.0
-	git? ( ${LIBGIT_DEPS} )
-	dev-libs/libpcre:3
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
-
-	>=dev-libs/gobject-introspection-1.48.0:=
-	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	sysprof? ( >=dev-util/sysprof-3.30.2[gtk] )
-	vala? (
-		dev-lang/vala:=
-		$(vala_depend)
-	)
-" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
-#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
-# TODO: runtime ctags path finding..
-# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2
-#	>=app-text/gspell-1.2.0
-#	>=app-text/enchant:2
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus )
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/meson-0.47.1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust language server via rls; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-
-PATCHES=(
-	"${WORKDIR}/patches" # gnome-builder-3-30 branch up to 2018-12-16 (commit f9a9dc02dd0a2c)
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false
-		-Denable_profiling=false # not passing -pg to CFLAGS
-		-Dfusermount_wrapper=false # meant for flatpak builds
-		-Dwith_tcmalloc=false
-		-Dwith_channel=other
-		-Dwith_editorconfig=true # needs libpcre
-		$(meson_use webkit with_webkit)
-		$(meson_use vala with_vapi)
-		$(meson_use doc with_help)
-		$(meson_use gtk-doc with_docs)
-
-		-Dnetwork_tests=false
-		$(meson_use clang with_clang)
-		$(meson_use devhelp with_devhelp)
-		-Dwith_deviced=false
-		-Dwith_flatpak=false
-		$(meson_use git with_git)
-		$(meson_use webkit with_html_preview)
-		-Dwith_spellcheck=false # TODO: requires enchant-2
-		$(meson_use sysprof with_sysprof)
-		$(meson_use vala with_vala_pack)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-src_test() {
-	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 35100fa981c0..6e27958ccc30 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -6,11 +6,13 @@ AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcf
 DIST jenkins-bin-2.150.2.war 75969613 BLAKE2B a86cffd210ee40ee01a1f4ee03c59b2c6c04a8d03f8f0bc5688118e00fe59bad2c8c1fe4b37de590929f1d36e9b00a0549e391609646b13f32d34769314369a9 SHA512 38e960b895dee3917146f49888ec23cfdc115354327de3ae63a4003641dd80d1d2565e8256dd47fa966c1b5515f1f90eac466ec007cf6d820958ce43147eb4a6
 DIST jenkins-bin-2.150.3.war 75968662 BLAKE2B f57716fcd6ae6330f291810a947e13e1629c3d7f1fdcc7061862258895bb691c5d43379e5c59956b60557843492f5e096fe43aacae88ba4a1baf3cb67bb28782 SHA512 b2a5bf51b09b9df9bec13f09f911c76c1bb0c2edc91f0933caf6f71e4c296e5f53ad54711aa6632b5f3e3dcb1f335594517a0c086e23fad8892fb6a3e77dd978
 DIST jenkins-bin-2.160.war 76018620 BLAKE2B e215220e978ac0407c742e3e5989b50f9d18ed387991b2c7c1120d4f9018ea3a24dcfa3127d29291af5d7dbf0155c3a68744c429e53ef3e160d33a5a3296cdac SHA512 7e6f6d1381ab9b46cd62423a607a6c8c05438073cd21cd7827f66fb98300a54c9528e87d00ca2332ec43068aaaa54493bf0469fe81be20fe444c10fb25cc6c96
+DIST jenkins-bin-2.164.1.war 77330344 BLAKE2B 6af841ced531f3b095444a4d22a487c6daa63dcbcb7c9dfda3bcd847873d77425b9d12f68a2aae79c1d0bcf8c65bf77eb72baa27ea78924ebbae1d270a60a503 SHA512 44ab0e30509d36af9aef26c34d50c0370ca08a0fd2fb007bcd0bdcdc012464fd7e5358e689cd017e9a4ad3a1c4e87cf4ab03646c4489e6be3b31ba1d3be5b289
 DIST jenkins-bin-2.164.war 77329094 BLAKE2B c8b470ab3f4606947520b8867fbf09611a00385f89ff95b64c9c603d2f3fadcad1a136f73b0fa0f0cbc8bb7df6f77c1449b8556342a366894c358f1117fd9a0f SHA512 92e1a4c236d0091fea9b70236c4cd14560b3d12ebe51e8698e1ad2d70820bd4acae6f0579be741b2eb7749ac95fe4454392f2e1879e54b0b14a265541d7acb66
 DIST jenkins-bin-2.167.war 77246248 BLAKE2B 58cb64cec5f63bc147557098740bcc02a131fd8ed7f935763130f037800aa7886e4c544d47ac595077d490037035d9d83976da4c62e5b7582a6366ab863654da SHA512 55d760aad38d64201cf806e8dcff7b07da8e1eabad279909f6dc342a5312f8f162b584e6fb0e77fb4c2db95424a0004b571c883245c01c0d8352291e33c2a0e4
 EBUILD jenkins-bin-2.150.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.150.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.160.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.164.1.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.164.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 EBUILD jenkins-bin-2.167.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.164.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.164.1.ebuild
new file mode 100644
index 000000000000..323b88955105
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.164.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 8982b36acec0..10edb5a1b0db 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,3 +1,4 @@
+AUX kdbg-3.0.0-no-png-install.patch 1801 BLAKE2B 69d1f3f589a4a0376149a9e601bc9d97723b04a5074eac15a5aeec10dba54f42b66b6e232e8b32b69d6d3c19062512f6cbed1323d3efaec538c847829b8f7149 SHA512 d1aa8518a56a0f46f0e7a13e9649f5fe26cdce162664d63911b387718d4d6416ce08dcba6d3d0bf831b473be906a8ec160c942e6e78bb58a05ca4cf85642f38a
 DIST kdbg-3.0.0.tar.gz 430150 BLAKE2B 62411f95f1d109d95647e83defc2f5a84f9f7d7dc715f5a2f84eb6ecd18c7e1d02da0d68bf5bc8bb37216f98edbac11c24286f03ffc2ab9ad9fc7203ccd498dd SHA512 6398a7bbb9c744a837dd73645b497ab00eeaca9a326d61b135dc9040c616b4a2bdc0cf1da59c101dc68a159e12bc3b4a994a9d1dbf33f7d152e5c3003abb498a
-EBUILD kdbg-3.0.0.ebuild 1191 BLAKE2B affd50a6189911e15bf5566277a7a23142f38bb04392dafb4f89e8694eea72acfc3811f4e60bf40a65e1bcae6feed27b7f26fc6ade4e8daa6fe0e7ef88f05ca1 SHA512 7d1c924e50ec68175a6c4157044c5738a8f6abfc1b32a19d611e79842ee04ffcb3aee38c53cd016427c68d78acdefe634754eddf07c114edf772847ad01b323a
+EBUILD kdbg-3.0.0-r1.ebuild 989 BLAKE2B 69f68ed63de7fba3054839559953a743181f664d81d8dffa8bb6f331f6334ba39ea53d931c6c320b3e42d844e6bc4522640d2714361a72556107543efec409cc SHA512 b69f06370ca8c622babf21edc44df93f2e9bf21e2acbd9ddf8c1cb5fc35ae299ed95923e8f4b0131123d6c7be66f0861a2ff86fb140accfffa7890a8cce588c6
 MISC metadata.xml 371 BLAKE2B fe7d9700b798150f83b58f44ae125090c0af51f6d6e81d7c5048828e75d9b95147a01c009b5bb195e6d6fbeb047dc019059802e3f60e02e59596f2f027c7ec4a SHA512 70d360d6ff4a809578a61351cdd5bdc42b6bc72eb6551ef8083595d941909f1c6ab91a4cb793f1161eaad3a65e0313e498bef0cc5e763a918d2e83c7352f7805
diff --git a/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch b/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
new file mode 100644
index 000000000000..237feaa981bd
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
@@ -0,0 +1,54 @@
+From 826d503da8bfe7c567fc44dee178a4fca2b52f0a Mon Sep 17 00:00:00 2001
+From: Johannes Sixt <j6t@kdbg.org>
+Date: Fri, 15 Feb 2019 20:26:03 +0100
+Subject: [PATCH] Do not install the pulse frames.
+
+Andreas Sturmlechner noticed that the frame PNGs are slightly broken:
+
+  .../pulse000000.png: broken IDAT window length
+
+Since the PNGs are only needed to build pulse.mng, do not install them.
+---
+ kdbg/pics/CMakeLists.txt | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/kdbg/pics/CMakeLists.txt b/kdbg/pics/CMakeLists.txt
+index 41625b3..9615b1b 100644
+--- a/kdbg/pics/CMakeLists.txt
++++ b/kdbg/pics/CMakeLists.txt
+@@ -31,35 +31,6 @@ set(PICTOGRAMS
+ install(FILES ${PICTOGRAMS} DESTINATION "${DATA_INSTALL_DIR}/kdbg/pics")
+ 
+ ecm_install_icons(ICONS
+-    22-actions-pulse000000.png
+-    22-actions-pulse000001.png
+-    22-actions-pulse000002.png
+-    22-actions-pulse000003.png
+-    22-actions-pulse000004.png
+-    22-actions-pulse000005.png
+-    22-actions-pulse000006.png
+-    22-actions-pulse000007.png
+-    22-actions-pulse000008.png
+-    22-actions-pulse000009.png
+-    22-actions-pulse000010.png
+-    22-actions-pulse000011.png
+-    22-actions-pulse000012.png
+-    22-actions-pulse000013.png
+-    22-actions-pulse000014.png
+-    22-actions-pulse000015.png
+-    22-actions-pulse000016.png
+-    22-actions-pulse000017.png
+-    22-actions-pulse000018.png
+-    22-actions-pulse000019.png
+-    22-actions-pulse000020.png
+-    22-actions-pulse000021.png
+-    22-actions-pulse000022.png
+-    22-actions-pulse000023.png
+-    22-actions-pulse000024.png
+-    22-actions-pulse000025.png
+-    22-actions-pulse000026.png
+-    22-actions-pulse000027.png
+-    22-actions-pulse000028.png
+     22-actions-pulse.mng
+     DESTINATION "${DATA_INSTALL_DIR}/kdbg/icons"
+     THEME hicolor
+\ No newline at end of file
diff --git a/dev-util/kdbg/kdbg-3.0.0.ebuild b/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
index d6e46f2cfd5a..e8543c0a37c6 100644
--- a/dev-util/kdbg/kdbg-3.0.0.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="true"
 inherit kde5
@@ -11,10 +11,10 @@ HOMEPAGE="http://www.kdbg.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS=""
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -26,13 +26,12 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!dev-util/kdbg:4
 	sys-devel/gdb
 "
-DEPEND="${COMMON_DEPEND}
-	media-libs/libpng:0
-"
+
+PATCHES=( "${FILESDIR}/${P}-no-png-install.patch" )
 
 src_prepare() {
 	# allow documentation to be handled by eclass
@@ -40,12 +39,5 @@ src_prepare() {
 	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
 	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
 
-	local png
-	for png in kdbg/pics/*.png; do
-		pngfix -q --out=${png/.png/fixed.png} ${png}
-		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-		mv -f ${png/.png/fixed.png} ${png} || die
-	done
-
 	kde5_src_prepare
 }
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 0d7708168f60..699fc237bcf1 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,4 +1,3 @@
 DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 BLAKE2B 4cf890f5a3281cfefee14575c5ebc3d756f69f27af00fbe806aeac27aa1f2e5643a78dc415d9d5ea3c5434c5b08266aa114cb1d844002222cdc861f133e6b7b2 SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d
-EBUILD kdevelop-pg-qt-2.1.0-r1.ebuild 519 BLAKE2B 5c576faa37c2eb4a79dc545ca1e7ee7161e620c8d2005b97cc0d7bb8accdb57e49d8bb0083e94849eba8e88b8602855f3fef8de23ef7dbe158e4cefdba6ceb70 SHA512 1f70c09b1cb788cb6ee42d9be9cf8eb81c9885345db6149d696df15c956aa3672861b981a77f0a810bb16909b0183df77e3d4f1b290c6440ab2e97c89db647fd
-EBUILD kdevelop-pg-qt-2.1.0.ebuild 489 BLAKE2B db137e6e9e0afca0484c28ddda0a309c31b7e3cc4a81a6307580001a755cd286ec183c6f87714c882d2d4fe4e1f5b5a385c6cb2b62909ba2288074e81f63e349 SHA512 2a715a11b24881f1829b717c46d4cdaf74a569f60056be30a7d8a6acb06f54ddddfbf72b2bed11daf6df93beff88999e300d17824030758b3a1fa1bbfedaf09e
+EBUILD kdevelop-pg-qt-2.1.0-r1.ebuild 517 BLAKE2B de0b12b1863ac8516a22f4f72a32451f49ea2e8d0775c5fb105112d44f4eb7f8786b87f41356f02489a727fab70977c497827d9e3232e21aac7333161f781e53 SHA512 4e9381a8e4be1a4755d14803da62644654f66b6c641eafb785bb7eecb764cae425e896e0adae07bb6fe6eb43fd981a47fe700ebb175086d2c930dbe8e9639a3b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
index 48120d4e89e4..f51e180b82ad 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
deleted file mode 100644
index ee86aa1a4186..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDEBASE="kdevelop"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-LICENSE="LGPL-2+ LGPL-2.1+"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="
-	!dev-util/kdevelop-pg-qt:4
-"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 28a6f4b7b9d1..e76d90c6fb76 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,6 +1,3 @@
-AUX kdevelop-php-5.2.4-tests-optional.patch 2468 BLAKE2B f30fee2d349b2512a8fb1a02d6d1380ee5b11de43e58187438f8030faad3eaac6cf56b21ef6a7e047efb1bbca0188005092404ef0efed400ff2ad23f4752f4fe SHA512 5ef6d1b86ff63177bd28e4161e4292810aa651163581022be657786391fdfe4017e0ddd1cb94ba0be104153dded411f4b182deeda243987cf5d09f167868ada0
-DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd
 DIST kdev-php-5.3.2.tar.xz 1008036 BLAKE2B 33940afeeb7b8594f0dbf56e444ba05f9665c7e4c9bc1d55c9d6a5b85bd2e03a04db1b8f27d968d627e26cfa573a3da519bb1d0eb592dc784296c9db7ea1fad8 SHA512 d8649bca173eccc1aa6568715e5976beb762ad7a377adbdab8f55aad76176ca5c8d16477ec70fa231b5699105d2a827c2ffda1c4835419c670c561b4444605b4
-EBUILD kdevelop-php-5.2.4-r1.ebuild 1247 BLAKE2B 24daa76c99e3ef06a944f837ff18ac86bd8dc41917d49a4b58681fe677ef504d099b502f14ef7b6503523bd70e3d90e704181cfc712e51bbd47633a623e50965 SHA512 a5e1f1c06b877575eb42054ad2289d19f3f9b04c08c071024500ef612d1c7fff7d924c77643c47ea9a3f0e7e073d32e6092bf3fad8b45255b28fa4063811f43a
-EBUILD kdevelop-php-5.3.2.ebuild 1141 BLAKE2B 06962ec7c5dfee2c0eccf495e6caa2910ed030fa7ac0c6ebb5b9f41707ef7797706883bb643a36bf8b92b0af82ec171db6e316fe84394f4c1b3ad088329db225 SHA512 abcbf392fddb6b64b2d94a921fb488a93cfe6624c85f9e8082996d38498b6bd1df6118514f67b8392badeb730af46c7cbf7015e8636abe0da1fdcd811cee81c3
+EBUILD kdevelop-php-5.3.2.ebuild 1214 BLAKE2B 863956e8365f60c38dc4923eda487d4d6e0f964dd3aa7eba65c36260b6c178f0651dd8efa0e69e6b00344cfbcecab99e2f1f7fbc498d90b11b0ac614dfc50b80 SHA512 27e2c15f93c98cacb142ad9e610a99651533a351dffefd8c68cc27490a9c59ad173180e3cb0710e62357d2b6fe6673f259a6bde1a2b42e1458bb58bb673e3074
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
deleted file mode 100644
index 853952f11ac5..000000000000
--- a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 7 Oct 2018 12:05:45 +0200
-Subject: [PATCH 1/2] Make Qt5Test optional
-
-Test Plan: Builds fine w/o Qt5Test present.
-
-Subscribers: kdevelop-devel
-
-Tags: #kdevelop
-
-Differential Revision: https://phabricator.kde.org/D16012
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c09ca29..c1e25d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,10 @@ include(GenerateExportHeader)
- include(FeatureSummary)
- 
- set(QT_MIN_VERSION "5.5.0")
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
-+if(BUILD_TESTING)
-+  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+endif()
- set(KF5_DEP_VERSION "5.15.0")
- find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
- find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
--- 
-2.19.1
-
-
-From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 10 Oct 2018 01:35:19 +0200
-Subject: [PATCH 2/2] Drop unused KF5Archive
-
----
- CMakeLists.txt                  | 2 +-
- completion/tests/CMakeLists.txt | 4 ----
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c1e25d6..5f1070a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,7 @@ if(BUILD_TESTING)
-   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
- endif()
- set(KF5_DEP_VERSION "5.15.0")
--find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
-+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils)
- find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
- find_package(KDevelop-PG-Qt REQUIRED)
- 
-diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt
-index dbe37c1..214cc05 100644
---- a/completion/tests/CMakeLists.txt
-+++ b/completion/tests/CMakeLists.txt
-@@ -23,9 +23,5 @@ ecm_add_test(
-         Qt5::Test
-         KDev::Tests
-         KDev::Language
--
--        # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure
--        # we can work-around it :)
--        KF5::Archive
- )
- 
--- 
-2.19.1
-
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
deleted file mode 100644
index ff68ee5e3fd3..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDEBASE="kdevelop"
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="PHP plugin for KDevelop"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-util/kdevelop-php-docs
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-util/kdevelop:5[test] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	kde5_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
index 730fe6342498..d339104a6d8a 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
@@ -43,8 +43,11 @@ RDEPEND="${DEPEND}
 	!dev-util/kdevelop-php-docs
 "
 
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
 src_test() {
-	# tests hang
+	# tests hang, bug 667922
 	local myctestargs=(
 		-E "(completionbenchmark|duchain_multiplefiles)"
 	)
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index b34db31bfbf1..84edcf6364de 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-5.2.4.tar.xz 1073172 BLAKE2B 774ef9853d9304073c5c8ff0657774a546c361d316116c1b09f21dad5f65cc8566948f42d179d5e612b64874ea14087e26794fdc3f3c7a9910569592c064973b SHA512 abf86aeeffba496a51cc6969bb0dd75509b3385332914f8135e3b1ec5e4da592af5a7d07fd98ad231d8c09109c2396037727e3db0a7ce14bd427f87d558fa3b8
 DIST kdev-python-5.3.2.tar.xz 1074980 BLAKE2B de19a603d9c0fbf870b271b16d98b676ad9246edbc62f926c63ec66f51806c52fdec0284b016b291599b80d68faeb7eef80f4b5efc7e8f12f6362948b1df05c2 SHA512 95d8e0e94bfad70fabad75e362f5483db897ba56980251a76af48df863c7277746704c826692a6cec854e60c97f3ea9791b1e162b7ea2f357d469715d0a74672
-EBUILD kdevelop-python-5.2.4.ebuild 1165 BLAKE2B a66030af8d7e71e5cf494e88cb1d1f2d5b843ee7a0e1ce21243e528a9b6daf67dec0033dfb843061133846dae3b25db39149833cce52ff8250c225c9412f98e5 SHA512 7d4113a3e68919132ca8847a9b49cd41379d3d81da5010ba29dea68e1ef7269a25850555b2328dd03b198c1f26c6c9ebf4a8687b20cd8d99eadb64ac10fa116f
-EBUILD kdevelop-python-5.3.2.ebuild 1124 BLAKE2B e37cecd3a7173dc1b347413b6e71e37c9c6ed56b3e2d2f5a868f948853e8bca6210085d25b5d18dcdc19cfbf3b34aabed77c831cdff1e740390afbe485764a55 SHA512 5438d59b346a6ea75fbf5b8bd11ef00637c0356690678f600efd027f5bdacad6b505621937b7e2c6fe9f1e1ea2896ce69abfd8dc3398f1a63a7fbb9cc221b0f4
+EBUILD kdevelop-python-5.3.2.ebuild 1122 BLAKE2B 06832b22adea00c8f98753dd9c05d5a43975b9118facfdece25a61eec6caeed77a9e555f92b76351f58f67f799d9dffc8b6b5c953eb105f50f5ce968886df5e4 SHA512 5246a39dc49dd41596a34bcc6327f28eef52fda72fde17c26a08c5b2fc2165bafa3d4864e93c67a6c2d0e93ec3be8d2472844734e9748fae1b768ffce688c364
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
deleted file mode 100644
index f760c0a47170..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_TEST="forceoptional"
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null || die
-	emake parser
-	popd > /dev/null || die
-
-	kde5_src_compile
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
index 0a046b765fe7..f9a306678f5b 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 2d7b47067da1..7222ecd353fe 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
 DIST kdevelop-5.3.2.tar.xz 6851944 BLAKE2B b918cd0cb9b915227a442641a110db27387fd2e946c0411e40206a4a68990a9268a6c47c7f1da8a8f8a5c2690a1577c75fbbbb353d69ddfeed419e2c561aac4a SHA512 f0a8354a596a13dab0c5560d8308097918f5540b02d9a66a63155af00aa024aae9c01b455290ecafe705784a9c25afd24f7d936d1f817af1fb5b52d96e6dc596
-EBUILD kdevelop-5.2.4.ebuild 3694 BLAKE2B 7f0e35fe10187cbd8085b16d966340eb13a6df533816169e2a75fb1ad1cd21e1fea14c3bba1a169eebb42b345894bcf0a3ad3e223208279f03334fd2709daf8a SHA512 8961f2ba12d2c1b4a961c1fe93eb366bcad5663960122edd640a40e7e12b21d74763f31b18173612de41bc82f4091b560f9bc605ab60706eb2d36b37e24c1c57
-EBUILD kdevelop-5.3.2.ebuild 3831 BLAKE2B 6ddc23cf95ddf9fe4226e60ea5d462d3fe85fef6099f3687445acdb0d1ac4d02c9955e02fca0d1d771d7e9f6647d4bca3d006db1650413c6ceaec3c90e389e7b SHA512 cb55d0422b19db8d58efb22e55bcf3ed33bdcc1a7a1ea37ae122fcf91461c77ad68ea433cd4576d1ce1ff07c58af55c76b288841026955e0640957be5a0bdb00
+EBUILD kdevelop-5.3.2.ebuild 3829 BLAKE2B dff439b66ad1bbf2494e6a44d7f8508c65f5d3bfdd82afc6dc35b7c1e08904d8e04fd1b13dbe8901ad0a97fee6a0bc18f4b9c05b7867fe9e6b7cba18f8592aa0 SHA512 dbe186231393fd726aca839ce306e0f02d23a3b9498fa1b481159925e3aeb8f8e98261ba0d500bd8cde028d1202ee783a6dc00317c1d2d278b8af976408ab4c9
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
deleted file mode 100644
index f1dff60ee6b6..000000000000
--- a/dev-util/kdevelop/kdevelop-5.2.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( $(add_frameworks_dep purpose) )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.3.2.ebuild b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
index 099fede3aacd..8a841a0d0f4d 100644
--- a/dev-util/kdevelop/kdevelop-5.3.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 63c38f316c43..24b38ade82a4 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -2,9 +2,11 @@ AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc29
 AUX lcov-1.9-gcc-4.7.patch 1035 BLAKE2B d4ce8c505f1dd22f44feadf9f99bcf73fd5e461a714d3d40d5e8e222b5d427d947e42d4806252437ae4392ec3ee3d9521f85173044d493f7a4f81a35e042c5fd SHA512 c9d1a80ead5ed8de91fdac4ac3b7b8d8cbcf245f38276c91551a4f74942ff348947fbbd4b4a3fa171fd90ea240ffea8f4b162ca9eab2a929a7daa2eb0834f307
 DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd22a6ee52035115d84e7f05d7593168ffee9c5925937a509e3be64cebaad6e4694004ee2808817d6df19da SHA512 db42256c7fbe00d17256ad4944b7e658e65f2dc2b9df1814e25d46a652e92a0ff8bacd4e68de743681df22f4352ffc82b3ccdc0a85723546d7eb64c92e28c0fe
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
+DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
 EBUILD lcov-1.11.ebuild 574 BLAKE2B 4349f37845e48e6cd30e543557ee59b00ff18a030d3049adb7a1d47924202c9233db6c8b6831ba123cc1e3ca7093b298ae688cbfa15dab59097d4ea858d3dbd0 SHA512 a5559fb75533fa53ec54edc0262fac5582b68ca42b66b4dcb7b708e69032eb63c7fffb94af629113d50ff2598166853ed19c489ebfbddafada4fe88e0ea4f3bb
 EBUILD lcov-1.13-r2.ebuild 875 BLAKE2B 498056b0e0cc168cd73b11215677eb133e275b6c43f4f7a2764cd61b404fbfdc7fae118c85a124d90439cdd1bf6ac2f417d7e06a8e417a610567e8e8e9fe1402 SHA512 0d41f7863cff19f2f2502637091a0e8c387712bac88a6a5d9a43e6c952f2860e4a5f6e81b1e8f4f56368ad9bb66f2b020538455335fc5b22622961ccf733b010
+EBUILD lcov-1.14.ebuild 825 BLAKE2B ad1c93c3934a96d2770094f84f5c80b6221e276da61a4f31051c646d04b4d91cca47ced68b2647ae9398cb8aa3717c3bdc65855b7ee09c31cc09912a15c126bd SHA512 28b0849fcd0af2961024d601f4bdeea2ca6a3810e2e574467c48185a2c9aa8064df905e1ca01625f02162fdcba206a409126265bd85e51e2a85ed3f5f5a423a1
 EBUILD lcov-1.9-r1.ebuild 591 BLAKE2B 33ef4b968b902c0b9433949ebda11cf354ffedb796d418d8e85d540082e9e7b9331eaab53de3408bf4e38ec00770bcbc16e675abc594101a8768b68e5d41dacd SHA512 43ceb5cd12d882924ad03decc31afbc0e8c620fd2cc04483ef013abbad658f7bf8682d1118761b60ae81a32f20a5f339258edfa7c7c9ffb1fb4aaf9356efac18
 EBUILD lcov-9999.ebuild 825 BLAKE2B 57bdeb72524382fd715b8e854bc6221f2671cf31045c9832078b6d63dae0eca6e20be38ea48a34ad2eb949768d9fc6fc492074a4e97a9ae5d20bc9a492326e92 SHA512 c5c8a461cb533aea1275ff86a3747238405e730a2b1479a1857ba3227a98ee63e6336a1cb1cdafe58e98842cf36af4632ae1423b02ad8527f4a0990056590bd0
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/lcov-1.14.ebuild b/dev-util/lcov/lcov-1.14.ebuild
new file mode 100644
index 000000000000..db891ffab229
--- /dev/null
+++ b/dev-util/lcov/lcov-1.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+fi
+
+inherit prefix
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="png"
+
+RDEPEND="
+	dev-lang/perl
+	png? ( dev-perl/GD[png] )
+"
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 968fc958048a..4d649aefe9c9 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,10 +1,10 @@
 DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc807cd84271f8be35a06437e718fb40a0f5090f213e203ffb746b254583f59e912d00300635e78f43aeb75a8dc4048 SHA512 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
-DIST lldb-8.0.0rc5.src.tar.xz 19602752 BLAKE2B 4f861bf53b254d3b2496b954a566ae02fe043d938cc04b931c88237dbf593de42c1e51ace0f81280b9e646a2febe853f9be72bec8f91d351ba7f9fe3b4d46df9 SHA512 b10e57410b4414e9f373bb2486690108d6a83c8268c9fcc4e30af60f488bf0dec660c4556ff384cb12b0af29d3c9e5a05a9bf57a0bc9acd1d3c39cf071304440
+DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
+DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 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_rc5.ebuild 3016 BLAKE2B a54f8a425a716ab94b9d97441cbee297e93297fc632e9f658c89b0d9df62d25a5bd13ff0062850f78f0de13c4ff010e3d2c4e8648aeed764e622eba9dd4db6ae SHA512 6b852c966bd6a1b4c6789fb2f0a79e79ba68d1884d97af78b452c6388017b72bc9a6139e4f487da85b8569787097eb6416ff6856ce21e362064e4da230723f84
+EBUILD lldb-8.0.0.ebuild 3010 BLAKE2B 3df47e43fda7564f0e86afe317e3489deba983ec81a349cba2886a13edf70e07e6367ecc85b06aa94a2044763db4357382cdad59ae720dac40c58d546c71391a SHA512 75974325d1a8883f8487725eb0144b5cf6f7e188abf9365dee2983c800cb508bd08e8aa8d017368c4805f87934c8df779aa6ec40e1b35a47c5bf226de7714a53
 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_rc5.ebuild b/dev-util/lldb/lldb-8.0.0.ebuild
index cab280bed822..1da6e6ba172b 100644
--- a/dev-util/lldb/lldb-8.0.0_rc5.ebuild
+++ b/dev-util/lldb/lldb-8.0.0.ebuild
@@ -16,8 +16,8 @@ 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 )"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index be19dea5b467..4ad9c4dc4c6b 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,3 +1,4 @@
+AUX massif-visualizer-0.7.0-fix-window-icon.patch 815 BLAKE2B 253bd14bef04a2f1abe531d0dffaec837502a4ae56db341a875888160553a3246cd71fcb01977844482eccbf123dbb4fc4ddcb4b50c06230ce7544dfebb4cb57 SHA512 ecb5d0aceefd82bc05da91fe2e76f999078e41f10821534e512a52f13f43ac247ddf88e7f5d0952e5d8aa07c2714f7ea8f2e31b8361a2a0eb1de5a25692dd984
 DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0.ebuild 1111 BLAKE2B 141c0f6ef1200c2968483a6a11f9f1cba5332889e34f1d90c3ef3889d34b82e6003a96d77251859b946b700448aff5d40905618e865479741fee7879be5a93eb SHA512 53302d3a613bc323845a7a18c5fb3f2368eff015b5e6f7ee59466ef5bd50c0dfdf8e5a40654f2f596b182bd2f03dd976d1b7761acd0f9fa6933deea446ff67cf
+EBUILD massif-visualizer-0.7.0-r1.ebuild 1135 BLAKE2B ff8941c0feabd90eee02ef1ded88406a500332681aef34b2f3a244319ab7d0949e64b9c095dbd5380038cf30b7649ae98b4245c289ea7133d7ff8b8045b70018 SHA512 085d20a0f29457c9c103ef1f5ac9e4d7a391a1eed6c2d1f48901db2c0031b6749aac5b87f1cad73d684868ae5ece9b9c35cd20ef0f471f8496f976965581ecad
 MISC metadata.xml 370 BLAKE2B 8b260169231c67d50430301c4d6b3f87a07b59cc3d6a961a05d7f2e6987128ca7f5582d3b09812fdd6a0079b32f539ba0107b4338905766cba81ca79fd31c155 SHA512 a47938e506c035d69c8e69a4edb2e2587f76e9bd348aa0d9e88455cdf8c0d988b276e9f81c67c2039bef153051dcebd7b62b6b3d6bff1ebbbc572f87bbcd6382
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
new file mode 100644
index 000000000000..57e27fc9b26b
--- /dev/null
+++ b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
@@ -0,0 +1,25 @@
+From 51788c6f295651fecd3bb498236bbcf3c263ee84 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Sun, 20 Jan 2019 09:37:43 +0100
+Subject: Fix window icon for non-desktopfile WM to own icon
+ "massif-visualizer"
+
+---
+ app/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index c4526ba..21865e0 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -50,7 +50,7 @@ int main( int argc, char *argv[] )
+     aboutData.setOrganizationDomain("kde.org");
+ 
+     KAboutData::setApplicationData(aboutData);
+-    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("office-chart-area")));
++    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("massif-visualizer")));
+ 
+     QCommandLineParser parser;
+     parser.addVersionOption();
+-- 
+cgit v1.1
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index 3879dd8ec904..bf0964314b2a 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 inherit kde5
@@ -34,9 +34,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_qt_dep qtxmlpatterns)
-	x11-misc/shared-mime-info
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package callgraph KGraphViewerPart)
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 394e5b39852f..608580bb7ad3 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,7 +1,7 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4 SHA512 6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
-DIST meld-3.18.3.tar.xz 564660 BLAKE2B 2dc939e7d21408659de969e50eb8e790231391af0a30a44aecc359dabaf258e863512663d9e19a2b38fb42a419cfdbe1094e05eada8311f52cd615cd6db4e98b SHA512 7edd3c564616893732073995c8e161712964d8fc3abd8dad43183a6e36003bdad7b5593f04112e05244a59563b8d0fcf9d7c524f820d6145696ad0c73d67516c
 DIST meld-3.20.0.tar.xz 591956 BLAKE2B cf4dce55b8282c287a9bcf964f6c412e5db246cc8c85ab98729af0e12f861ae323eaab1db57a7bd7f27028896148a5142b8d02f3f5abbd86b98eeb1882cf76a8 SHA512 33a14aeb474351a35ff08ba828846e849f1c4f000af81c38fa8f7d481b5de464e728d29742eac40164138c44557f92f6b2a329a337ee59f28d00a5bbc4652798
+DIST meld-3.20.1.tar.xz 594812 BLAKE2B a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78 SHA512 cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
 EBUILD meld-3.18.2.ebuild 898 BLAKE2B 8e4fafffdc83112a8012662e3b26a3e506599fbcfcc385572939cbe8f33852acd5e6077beda2e186cc06174ed25a62099dfc1ec59122b229c1787442355a8d62 SHA512 78ce7d28f88129ae9b461c9bd6240f39beb68e9d472368042e37a77e3cb9a64bdd5e5fa6f7eb26677f107b8f67298ec253428e56b75987c5891644b5f6c0b0c9
-EBUILD meld-3.18.3.ebuild 897 BLAKE2B 029ccd55648cd6ef13cee50448dc0b04faf39f4dd2fca4d80253282803311699b6d22a6026252edea18083618a9723fbd2bf5f1324668f81dc44ab5051f3c3ba SHA512 dbcb138264995d9e8beceb420ba1b447efc57fa123ceafff32ae3c86bf800cb9542ff95ad3c3ec3942efee9e1364f2f90d5f00ba5a842e2ec8c180df45cbf606
 EBUILD meld-3.20.0.ebuild 901 BLAKE2B d6b875a25f7c430de3b47bb858b79ac271da6206fbdf32a43e46e3021319c92ef77befc525c2877fe52764b20203945bf023c2e05c9846ada0ccad16c41dc60b SHA512 8e11722dfa2dc80c11533d8f10d2606f0b952606d91f96a7baa39f7eb15b06f49c0f9e05d72216cfc19c24e430c7dea879539e0aa3e3fb4340c08a6861c00d29
+EBUILD meld-3.20.1.ebuild 901 BLAKE2B d6b875a25f7c430de3b47bb858b79ac271da6206fbdf32a43e46e3021319c92ef77befc525c2877fe52764b20203945bf023c2e05c9846ada0ccad16c41dc60b SHA512 8e11722dfa2dc80c11533d8f10d2606f0b952606d91f96a7baa39f7eb15b06f49c0f9e05d72216cfc19c24e430c7dea879539e0aa3e3fb4340c08a6861c00d29
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.18.3.ebuild b/dev-util/meld/meld-3.20.1.ebuild
index e93d81db1f1d..5620f4667736 100644
--- a/dev-util/meld/meld-3.18.3.ebuild
+++ b/dev-util/meld/meld-3.20.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit gnome2 distutils-r1
@@ -20,8 +20,8 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2[dbus]
 	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.14:3[introspection]
-	>=x11-libs/gtksourceview-3.14:3.0[introspection]
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
 	>=x11-libs/pango-1.34[introspection]
 	x11-themes/hicolor-icon-theme
 "
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index a7fdbc7b1522..75033444216d 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -2,5 +2,5 @@ AUX gentoo-helpers-r1.sh 299 BLAKE2B cac826ecdcf18d07b3bcc612f87090bcb26dc166f49
 AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ece892f08edbbedf49be7b9953afdc923aa1fc50a115e01dec03a3d06fcf9a69bcda4d896c8a40560a3e SHA512 51fdfb9330a2d5bec9bcad9e91635a5fc245b3c02527ab70c0f9285cae0bb4266ba1ffaca26eaf6c4f9caf66a151bca776df36a0de2c4862e5d18d9417555502
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD netsurf-buildsystem-1.7-r1.ebuild 697 BLAKE2B 803dfa0b661778a40fc84e6e216503ea4b5dd3b7c28cc6d3812ac2ed8905a8b6c56bfbcd56d48cbea15bbb32c3fa09b3348fbe2db9142c13ab8f564288df39a0 SHA512 91dc40f9542b22d2a3fe3b61b5d1f5eb457b78d6c72f9ecb53d24872e90e5a299d5c5d79f07aa3bdf44a9f2748dd515f3dc3a4b5784d538988dd121946b7e00e
-EBUILD netsurf-buildsystem-1.7.ebuild 667 BLAKE2B c63a2ab3ffe66b359b717f1572bc3788ed125a50797d2f5c7fd83938c136edd72584b67c9f8c4a7b7b16346e13e890d7f93d388254be52046c678814496441ae SHA512 41643f9b47b979a04140b3d200b6f9d0c65ea873093fff4f7eb2e90bd545554c21664a83cab83fc2ca601afb72bfbce86b99f3ccd20422812149186cd88b5a09
+EBUILD netsurf-buildsystem-1.7.ebuild 666 BLAKE2B 7e640a421bb041b10a220cad42afa9b6835b65fe0b39b8cdfc63c8e99129c6396bb8247e7f8a280c62276d41b041892e2162126412aad6c35f3ac39fbe7971b2 SHA512 0818bb0dd1f2eac87fcb5da10128d392fdfe274d9594c910a1bfe14f8221716193bff0fbf514dbe9b8cb10117347f04f63dcfad4772074bca4971e28a9af0af9
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
index 98224af8242b..96a869ef6d7b 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index b416f5805f1d..fca00b955d16 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,8 +1,11 @@
+AUX ninja-1.9.0-musl.patch 1997 BLAKE2B 5fa4e9b171a87ebb8fb618a2b4b0c47668d0aaf0a2b3a5b08a3be5649235228d2cd38c3891d52b1d1e0217f16b1e13175a1a077567c07e83ba8cd36aae96c7aa SHA512 78b29a57ec3c4feedf2bcfe9370b30cecd5302f29e8e14c6a3bc01becb555be6330aafba12f9225625af0644ea1f534feba8396d32bb944253a9daa5dd0e98d8
 DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
+DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
 EBUILD ninja-1.8.2-r1.ebuild 2690 BLAKE2B e38c119b8a865e6e367999600ab69f996e782f0b3e7d21f286944c1c7ab235a9e843b046cfe1696131516e22442e61f35ea37299d5bcb6e750b0b316f5c9c643 SHA512 48177691154c54526ef986a43a2527c2c008f272dca54dbd39bc5b8c8a9b45f3c1b26a96240b0008a5f7336c9db6b3d0f7bbc972d1b1ddd7cd304197bc090f27
 EBUILD ninja-1.8.2-r2.ebuild 2690 BLAKE2B 2eb84e017da16e36b88908d6d8e418d8c624e5a70d92ca1bb39e3615098f1872b63f91d4bef9afac6f8e6b398e699897790d5b36bf1b7b0298f53740cbe0d698 SHA512 734a76d4b7e03d1a23af8785442f0fddfb04fb7073782b73ee5631ddbe931df0bb611fa0c2805db9ebc1d8db90f4ef997977e734825b8d00c5c3ffdcb499f78e
 EBUILD ninja-1.8.2.ebuild 2547 BLAKE2B 8234fa945a4908448d202f7fbea1415771fc810f93afc9a02c2696141e15f47c3f2035a434432d0c50494e6e852741b64dcce80ed56c463dd50e411ce4b50399 SHA512 42811e0c8e250c6eabe2bad9ad98c0d94ad81e42100763348f70da8b2e521ad7b3355d613bccfbb51512ba15fc1c204f86ddaac417dfa8e320fb3e5bd398ed65
-EBUILD ninja-9999.ebuild 2558 BLAKE2B 54b95fb5f5e12d9ed496f04eb9b83cd503554deb2917db3f0b1d1015fc8579f448f7a0512b1827d02bd48f669fbb81f44abb1ebc9433b32e6318ca7c34d7684e SHA512 3161b622c1a7147333954295fa99891245434aac5c0a4079cb0c329efa5c689a383739e0b78ae2142dcba7838e30f554850cb4808432995bdeddfbc4a78e2b17
+EBUILD ninja-1.9.0.ebuild 2733 BLAKE2B 2beb9b4c90a7f7364e485750e562aec9a629d59600d14bd54ea9f7f35035f51fc120795884843ae5bbab3e4a8df704c9ce5ae587702d5f0164e20cee2b5ea3d0 SHA512 bdcc584200015901c35cf7f51960f867e01ee2de42891aa928debb8d2374874e794dd9e18c45d945915ab79858cac96e2cc05ded38158d0b34c55d054ce539b1
+EBUILD ninja-9999.ebuild 2682 BLAKE2B dacad50bfaa4f69a0bd86d5b802e6a096eca82a86944a8438c428fc6862d96e9b824d1bfc876ab3c9b24d87dd61846d9228992fa4cb4453633e4fe39f9e3b4cf SHA512 d61dc38e706761c735bb3fb753a6d664f015ce668677f5b348d369cd3c38a6def4a0f129a70093575efc994ea0b5cd4b570b54ef404676bc119fd89baad69af2
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/files/ninja-1.9.0-musl.patch b/dev-util/ninja/files/ninja-1.9.0-musl.patch
new file mode 100644
index 000000000000..f6aeb428974d
--- /dev/null
+++ b/dev-util/ninja/files/ninja-1.9.0-musl.patch
@@ -0,0 +1,39 @@
+From 567815df38a2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001
+From: makepost <makepost@firemail.cc>
+Date: Mon, 24 Dec 2018 03:13:16 +0200
+Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
+
+In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
+compatibility macro. Should help avoid hardcoding platform detection.
+---
+ src/disk_interface.cc | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/disk_interface.cc b/src/disk_interface.cc
+index d4c2fb087..dc297c449 100644
+--- a/src/disk_interface.cc
++++ b/src/disk_interface.cc
+@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
+   // that it doesn't exist.
+   if (st.st_mtime == 0)
+     return 1;
+-#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
++#if defined(_AIX)
++  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
++#elif defined(__APPLE__)
+   return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
+           st.st_mtimespec.tv_nsec);
+-#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
+-       defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
+-  // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
+-  // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
+-  // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
+-  // For bionic, C and POSIX API is always enabled.
+-  // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
++#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
+   return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
+-#elif defined(_AIX)
+-  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
+ #else
+   return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
+ #endif
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
new file mode 100644
index 000000000000..4bc01a90da3c
--- /dev/null
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/ninja-1.9.0-musl.patch"
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/ninja.vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/ninja.vim"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 0f378c4dd3aa..bd7bd0ad6edf 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -11,7 +11,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
@@ -41,15 +44,17 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+"
 
 run_for_build() {
 	if tc-is-cross-compiler; then
 		local -x AR=$(tc-getBUILD_AR)
 		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
 		local -x LDFLAGS=${BUILD_LDFLAGS}
 	fi
+	echo "$@" >&2
 	"$@"
 }
 
@@ -59,7 +64,7 @@ src_compile() {
 	# configure.py uses CFLAGS instead of CXXFLAGS
 	export CFLAGS=${CXXFLAGS}
 
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
 	if tc-is-cross-compiler; then
 		mv ninja ninja-build || die
@@ -82,7 +87,7 @@ src_test() {
 	if ! tc-is-cross-compiler; then
 		# Bug 485772
 		ulimit -n 2048
-		./ninja-build -v ninja_test || die
+		./ninja -v ninja_test || die
 		./ninja_test || die
 	fi
 }
diff --git a/dev-util/ninka/Manifest b/dev-util/ninka/Manifest
new file mode 100644
index 000000000000..ddcc17ab1f70
--- /dev/null
+++ b/dev-util/ninka/Manifest
@@ -0,0 +1,5 @@
+AUX ninka-2.0_pre1_p20170402-braces.patch 284 BLAKE2B a417f77193b086485ca5522cc14328c54ba52e1a0a8ae263c1d2880f5c6efa0629ed6c180675c844af9595ba977a453548400964b2cc09f70c758c90937f2c8c SHA512 76bfcd86036fccca00f2f5e145a52aa280fb129b7dccdcb6c2f1dcd591b35d964baef3f82116f7f2159394be227766ebaa15bce7e3177f8a15fbeda41c05be71
+AUX ninka-2.0_pre1_p20170402-makefile.patch 911 BLAKE2B 40157c2517b8959842a83d47d60f937a5da8d0c6da8ed3378fc186fe7a6b528d048b8f4227cc529b5862b72a489c7f3a5ce5280b7977dfe425e01518adb6db01 SHA512 4b9c604608446b49d308221757f986f8c9c901aacbd9c09dba1b26eecb6798e381782e49270f79ecbf4cff45d50c4dba99cc04b9fd9d428a9c8b66d7d74043aa
+DIST ninka-2.0_pre1_p20170402.tar.xz 136080 BLAKE2B 9c612dd3586681b1bb037d5c7271341fc652ca62d3e22ee29f330922d78e9a460e3bb2700f4216ea3fa564ed2e5c83a9c50cdea5db796851bbdc999b9f35658a SHA512 fc1c8f6e134c6c618852bc62b306c4e73fcd7443900f4d31d9abffe718e8b4fa7e3853631d0207f70e1223d00a72e976f4c3e7c8780a892113644ba5167f30a1
+EBUILD ninka-2.0_pre1_p20170402.ebuild 1112 BLAKE2B 6e0e0217108598a7ccdaf27469db6e4ecbe95361d737fb9fe2f2c38e0901864e530362f1742c9a661a018b0442d168f8392705079d735b44924cd178b869bb1d SHA512 c24e1c10bc810a7363a7dc9d5ffcca001bf9a73eb2c1041330b743acedc66fd8cc1aed67b73ce432d9446adcaa1d704751f5726a9c4c222df1203753f27d8dfb
+MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-util/ninka/files/ninka-2.0_pre1_p20170402-braces.patch b/dev-util/ninka/files/ninka-2.0_pre1_p20170402-braces.patch
new file mode 100644
index 000000000000..54e4d4a50feb
--- /dev/null
+++ b/dev-util/ninka/files/ninka-2.0_pre1_p20170402-braces.patch
@@ -0,0 +1,11 @@
+--- ninka-orig/lib/Ninka/SentenceExtractor.pm
++++ ninka/lib/Ninka/SentenceExtractor.pm
+@@ -114,7 +114,7 @@
+ 
+     # check for trailing bullets of different types
+     s/^o //;
+-    s/^\s*[0-9]{1-2}+\s*[\-\)]//;
++    s/^\s*[0-9]{1,2}+\s*[\-\)]//;
+     s/^[ \t]+//;
+     s/[ \t]+$//;
+ 
diff --git a/dev-util/ninka/files/ninka-2.0_pre1_p20170402-makefile.patch b/dev-util/ninka/files/ninka-2.0_pre1_p20170402-makefile.patch
new file mode 100644
index 000000000000..1799d416b26b
--- /dev/null
+++ b/dev-util/ninka/files/ninka-2.0_pre1_p20170402-makefile.patch
@@ -0,0 +1,33 @@
+--- ninka-orig/comments/Makefile
++++ ninka/comments/Makefile
+@@ -11,12 +11,13 @@
+ #DEBUG = -g -DDEBUG -DIODEBUG
+ 
+ 
+-all:
+-	g++ $(DEBUG) $(OPTIONS) $(DEFINES) -c io.cpp
+-	g++ $(DEBUG) $(OPTIONS) $(DEFINES) -c dformat.cpp
+-	g++ $(DEBUG) $(OPTIONS) $(DEFINES) -c func.cpp
+-	g++ $(DEBUG) $(OPTIONS) $(DEFINES) -c main.cpp
+-	g++ -o $(NAME) main.o io.o dformat.o func.o
++all: $(NAME)
++
++%.o: %.cpp
++	$(CXX) $(CXXFLAGS) $(DEFINES) -c $<
++
++$(NAME): main.o io.o dformat.o func.o
++	$(CXX) $(LDFLAGS) -o $@ $^
+ 
+ install:
+ 	@echo -n "Installing binary:   "
+--- ninka-orig/Makefile.PL
++++ ninka/Makefile.PL
+@@ -13,7 +13,7 @@
+         'Yuki Manabe <y-manabe@ist.osaka-u.ac.jp>',
+         'René Scheibe <rene.scheibe@gmail.com>',
+     ],
+-    EXE_FILES => ['bin/ninka'],
++    EXE_FILES => ['bin/ninka', 'bin/ninka-excel', 'bin/ninka-sqlite'],
+     CONFIGURE_REQUIRES => {
+         'ExtUtils::MakeMaker' => '6.52',
+     },
diff --git a/dev-util/ninka/metadata.xml b/dev-util/ninka/metadata.xml
new file mode 100644
index 000000000000..c665e48637be
--- /dev/null
+++ b/dev-util/ninka/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild b/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
new file mode 100644
index 000000000000..56bd4273a95d
--- /dev/null
+++ b/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="A license identification tool for source code"
+HOMEPAGE="http://ninka.turingmachine.org/"
+# snapshot of https://github.com/dmgerman/ninka
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+ myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sqlite test"
+
+RDEPEND="dev-perl/IO-CaptureOutput
+	dev-perl/Spreadsheet-WriteExcel
+	virtual/perl-File-Temp
+	sqlite? (
+		dev-perl/DBD-SQLite
+		dev-perl/DBI
+	)"
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker
+	test? (
+		${RDEPEND}
+		dev-perl/Test-Pod
+		dev-perl/Test-Strict
+		virtual/perl-Test-Simple
+	)"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-braces.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_compile() {
+	perl-module_src_compile
+	emake -C comments CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	perl-module_src_install
+	use sqlite || rm "${ED}"/usr/bin/ninka-sqlite || die
+	dobin comments/comments
+	doman comments/comments.1
+	dodoc BUGS.org
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 1fd149d7b8e8..77a18d4810dc 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,5 +1,6 @@
 AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b
 DIST cuda_10.0.130_410.48_linux.run 2020126691 BLAKE2B f784f41c06d81b6f89d07e756347fb94148f79e5fd50650fc340feb6b49dcc2bedd05cf4c7c2662da39955f9393efc048aa17fa921aad86e182186fb6d98ec50 SHA512 409ea4cc6aa0fe7063450e77c3b67b9b41aab1bbe556db673fb1a80610b20bd52e2020bf94034a92ab68c721d3d5739500bae4bd7a3558b2d8e73730a3b4ea25
+DIST cuda_10.1.105_418.39_linux.run 2423314285 BLAKE2B 924872eaaa4e8ecd6b81765c91d5e538d968e4fc88792a805339dd9cae15dd70372f310d39b9668d76cadbab875e3c4abcfca5a5cf71e4d83c9db056dc02f51c SHA512 07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622
 DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
 DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
@@ -11,6 +12,7 @@ DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3344 BLAKE2B 37bb588383fdfb0ec480c8ad961d0faeb6fbce7159ffb6ce47efa600ade12c5f04598dc053dc44ff469ff9afabecfd31b00d04501ac541ea72378884a2f19475 SHA512 aa9e7a8afd6f3949006e3b1dd03db695126e77f01a38d1ba77ce8dc94137c9c89b7afada7f6deaf5dc160371f5ee0c61bbc3d09002169d5900b1baa12a870d44
+EBUILD nvidia-cuda-toolkit-10.1.105.ebuild 3702 BLAKE2B 55eee9117901646d47ab9e68f7a9c401a4acf456463cc079dcc11f066fa68e68dc5d687da3a4e918d689713df8add5beab1649b81b597e3fc054b5e3c0dcf7a4 SHA512 96e57036194e6fc074b72b588f182a7edf1b42eadab71f0372dc47fec17d65c8814aa09ff029debd4cf769d4de3110ac589864c736f78b3c306932d780dfef5f
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild
new file mode 100644
index 000000000000..7030ff9fe1de
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="418.39"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-9[cxx]
+	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses:5/5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6100M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	cd builds/cuda-toolkit
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins NsightCompute-2019.1 NsightSystems-2018.3 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		remove+=( extras/CUPTI bin/nvprof )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir} || die
+	# Install binaries separately to amke sure the X permission is set
+	into ${cudadir} || die
+	dobin $(find bin nvvm/bin -type f) || die
+	find bin nvvm/bin -type f -delete || die
+
+	# Install the rest
+	insinto ${cudadir} || die
+	doins -r * || die
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(${EROOT%/}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 145c684fcf8c..feeafb7e41b1 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,6 +1,6 @@
 AUX patchelf-0.8-dash.patch 1060 BLAKE2B 37361c4221be04e4a8e672578e8414bde1d03e39fbac60e9dba20ed407347e1e84d193469bc0fba6744953fde4cdf04c807135465edb5519f7b970189df9d7ab SHA512 35f32d43a85ddcfa0a1c3879b0a934dea8c58c7121d3d86157183a175bcf64fc0d4aadf96a91b5e4d5aeade773ff3145c683378fbee019f5293bc0f636104a7e
+DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
 DIST patchelf-0.8.tar.bz2 119369 BLAKE2B bfe7dceea9a79845c61bc7490faad5cd4d5e83bc0be4ec7e3b19fbed91ecb7d15e0a0688d4914731b94f0522c80ea9f940b6a8ad5595931df8826ef43f2fd209 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a
-DIST patchelf-0.9_p20180129.tar.gz 99490 BLAKE2B a5372942f7f400085a1d5e15701a25f916012ae6afc90cc3065aebf6fd0fc7cae3a626496cae4a7ce7320e5c954b0b11a14defae0bacf3350bf6b201db952eb5 SHA512 eabeb34dbef68dc6e79374f46bdbe473ca3c21515962c684f3368fdf7a1dbea75ec152fdb7796f9d22c2f40da25e3f9c181cd1a29e52fbe5843a8cd02acb2c75
+EBUILD patchelf-0.10.ebuild 531 BLAKE2B ed3e41b15075a0cc7870e31552f771bfc88179ace0ae3686af5a750bd6f221f8bbe0db73ed7996c9f7301a24695b0fd1f2afbb8a3054a5861c6f0af3e6921978 SHA512 9bd402f545efc25cfa3dc4df0d6710e85b0f406a22d6ff1c20aff284c315e06f98a3a82f7363e15d4d716580491f05525a4b50d9ed59a57a97ed3752bc1f4814
 EBUILD patchelf-0.8.ebuild 795 BLAKE2B 92efb5ae34357cbdc5676b473e89b3411241c3f506ee6904b6f4b69c974370c3d9a69c66c9413f573aa9c736236b31c436b063b9dab1a24419f955dfcb8e2f4d SHA512 ab5ab9ce393c12b5439646cda2d25226a65a9f262481357dac7c4fd12133790b6623b4ca8fd939306b6fe31d10082597e1b28319f9cc26b66b23316443eff191
-EBUILD patchelf-0.9_p20180129.ebuild 656 BLAKE2B aea76418c2d25afa969de73256da20c636cc26514c8aa1de5e36410217d1c56e188dde980ea926c6958ee35d924d401d8caa9b63fd3a7540f2c6c6cd8d4a2834 SHA512 3e03ca019847454a3da5f6b9e6908ab0a71d9a45137aaafa4413f53620cd005be71e60606205857f6d0a763a89de4c9908423758cf2d3f22fba403ae36e54a0b
 MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.9_p20180129.ebuild b/dev-util/patchelf/patchelf-0.10.ebuild
index 0efbab73c0ab..dfc0d88d15f9 100644
--- a/dev-util/patchelf/patchelf-0.9_p20180129.ebuild
+++ b/dev-util/patchelf/patchelf-0.10.ebuild
@@ -1,14 +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
+EAPI=7
 
-inherit autotools vcs-snapshot
+inherit autotools
 
 DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="http://nixos.org/patchelf.html"
-COMMIT=1fa4d36fead44333528cbee4b5c04c207ce77ca4
-SRC_URI="https://github.com/NixOS/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://nixos.org/patchelf.html"
+SRC_URI="https://nixos.org/releases/${PN}/${P}/${P}.tar.bz2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
@@ -19,7 +18,6 @@ src_prepare() {
 
 	sed -i \
 		-e 's:-Werror::g' \
-		-e 's:parallel-tests:serial-tests:g' \
 		configure.ac || die
 
 	eautoreconf
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 35cb7aa7565e..7a77630b9f23 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 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-2019.1.1.tar.gz 332489780 BLAKE2B 2cc7dcbab5fa321e423991622b4e7c9e41c184312a4b3c3a8b900b1ea2436d9f6009e26ffca12f3335be8bb520941c6ac6b579f3e6f2fc0f1b148a9a00ab1868 SHA512 28d7a3353bec271f0a57bea3c44fc788a5b3a5215dff737ba293c2ce73509d06b217ee1615901c91e5895d61a58a2b696c50ae760b6b3a88b472f3746f28bcbf
+DIST pycharm-community-2019.1.tar.gz 330592651 BLAKE2B 4165a1bd9cd63e70b9f982bca4324b2aa1db32bc73bf30e521ed5921eb4b03ffe98004d16600c1795cc974d5188c24a17c988c6b37a90a5d038b0492a692275a SHA512 aa411f7354c7954d22e51246349b66a13cf0544a00ee92945ceb072f3636a020b0ee812a84d49c74e2121561af4f96e9fb6f7b26f69bc473c15ed15614fd16ab
 EBUILD pycharm-community-2018.3.4.ebuild 1060 BLAKE2B 6ac3d2db2453ee6199d90e16a1cfebb303e36d85c86907ebe0c1c765b785e30e68c6d2f942e2ab9409b64688215a30b3707a2251d765d75972b921b921e57a5d SHA512 9417eb41e3ee6c142a90abe8363074023927c644c687022dea88a0aa6d35c2d771ec493abd9e0ce8e345eb8e150a969178f09c9d5bca3117a718a96d3a557bcd
 EBUILD pycharm-community-2018.3.5.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
+EBUILD pycharm-community-2019.1.1.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
+EBUILD pycharm-community-2019.1.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
new file mode 100644
index 000000000000..3bd1b2cb4101
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
@@ -0,0 +1,55 @@
+# 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-libs/libdbusmenu
+	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-community/pycharm-community-2019.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.ebuild
new file mode 100644
index 000000000000..3bd1b2cb4101
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.1.ebuild
@@ -0,0 +1,55 @@
+# 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-libs/libdbusmenu
+	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 d0b8349f5967..bff8384627f6 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,6 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 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-2019.1.1.tar.gz 433810320 BLAKE2B baba76f893ca92990241de495f0a00029a135b890aeca067fdb699ffc6f4e7042487ada452f7fb793731b0ec303f0e73baf2c76da8e0821edcf195c210958b74 SHA512 d4419fbef02e3c8a6c3820da56f089a5630ac2c94dc701854f0ea03a5797f7489db6613a8426cf89a4c6c5259b44d589846b04e36051e44641845a32d81b368e
+DIST pycharm-professional-2019.1.tar.gz 431555873 BLAKE2B c222d81a342055111455b749100392b17409c998d539bb3d64d4d51d155df07062f05057194c79da9ccaf00888e0238731f94651fbae8e92d11ae6fd8e5d3f6d SHA512 20b60f9c97cf3e8b31534c79775a2cff4a9a1281faa75cc7eb236f860a315b0c1d232356b648778499ebc5ab49cc737911a7e1d316d6f375d865ee9e5042b7f3
 EBUILD pycharm-professional-2018.3.4.ebuild 1203 BLAKE2B ca69d0047d4998c0ce5143b86187f1c04d879857ab738c45783ba8f315ab2434ec659e6400be6265c4983eaf653d9053396c6378e832c45229a431c5085cb2b2 SHA512 c02ed49d3a9616261b0fe5d0868aecb5e5439ee8d5789f7ed1c5c6e4ac33100e957b11b1e674aa2fbefbc61939bd7f466c6ff478dcfe8c7a9a7985bc08fb1d60
 EBUILD pycharm-professional-2018.3.5.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
+EBUILD pycharm-professional-2019.1.1.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
+EBUILD pycharm-professional-2019.1.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
new file mode 100644
index 000000000000..9196130c9fd9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
@@ -0,0 +1,58 @@
+# 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-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild
new file mode 100644
index 000000000000..9196130c9fd9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.1.ebuild
@@ -0,0 +1,58 @@
+# 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-libs/libdbusmenu
+	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 a115dd037cfa..ec8ced9d591b 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,10 +1,6 @@
-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
+DIST radare2-3.4.1.tar.gz 7034801 BLAKE2B 7747af8e51c1120ef683884950e0e9e7581627906487449c81decd25b4d4a8ee5222892c42ba66d1a1d0b373b71ee6bf967df6ef117d30b171cf31740ac3058b SHA512 8803d54a8158aedd5900792bd013dad440a14abbb6fcbdf963e5d9031f30e66865479f29877e6f656ab01b59b3138458daf52f1eaeb462ec767c128d0b12640a
 EBUILD radare2-3.3.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.4.1.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.1.3.ebuild b/dev-util/radare2/radare2-3.1.3.ebuild
deleted file mode 100644
index ccba9bfa0ed9..000000000000
--- a/dev-util/radare2/radare2-3.1.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 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/radare2/radare2-3.2.1.ebuild b/dev-util/radare2/radare2-3.2.1.ebuild
deleted file mode 100644
index 0b3f4cfb432b..000000000000
--- a/dev-util/radare2/radare2-3.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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/radare2/radare2-3.2.0.ebuild b/dev-util/radare2/radare2-3.4.1.ebuild
index 0b3f4cfb432b..0b3f4cfb432b 100644
--- a/dev-util/radare2/radare2-3.2.0.ebuild
+++ b/dev-util/radare2/radare2-3.4.1.ebuild
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 2b4367c7c0a7..b055587acd0d 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -8,6 +8,11 @@ DIST scons-3.0.4-user.html 1127751 BLAKE2B 5bafa81d075c063cc8c0c4d147fdf7573834e
 DIST scons-3.0.4-user.pdf 2561758 BLAKE2B aefd100912345f399e52d805bc2f01846f0bcdfb31524212e69fb41713c193a233a30dcea9133e35001a145ce62b84c648b6d57856c0d5dfa019974546cb4d82 SHA512 03b9e1e8b60ca07986956f1e5c63d56573222ea303bed1976167239b4e9ad73056776a80c7fe2529987aa90856c35bc1c858d1a445f34e7964b675e700845e71
 DIST scons-3.0.4.gh.tar.gz 5500498 BLAKE2B 2157141d70f0f6d80606a0d53e0b6b99f72ac6d5f8b63e8825c1f484eb5c92979b50e897d2aadc2b201ee6f06a0d1df00ab272b96cc303c34f75124123f40a90 SHA512 d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
 DIST scons-3.0.4.tar.gz 652334 BLAKE2B 742909dcc598780c7ca7884c2403d9fa0cab44228c6597975157148f460dadf789d3c6aaa36125815ea8fc5ba70538ede56542cbecc656c2918341e2827657b3 SHA512 064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627
+DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda738246ddf5631ee3f0f49c3c44a53916a8cd5bd075bcffa350e1b5c99f53f81f229d4f74bcc871572a02a0dfafefada SHA512 1b9c965fac6b792e049ad1975e104d40ff6b99fe4bd247aa375955daaebb46e2ed42afb8484dad652df71b695b7db2ee92df34dc0f1d3372d55fad0d27c4b78d
+DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
+DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
+DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
 EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
 EBUILD scons-3.0.4.ebuild 2088 BLAKE2B 987963a902a594266fa6a1da0e2e06f96b439da4ac05b36243a1b02d5f66ad92951cbb0497a41f6bbd9f6d36cf504c8b2e97529c59151584618f8b2813ce614c SHA512 37fbbe605dea48e5d60a29260c26a6040c25ecb19784f631a3f46e68fbe2c9da74ffd66eefa7ea7413c02d6724dcf462ba1046ff62ac1023c927996987648ad6
+EBUILD scons-3.0.5.ebuild 2092 BLAKE2B 40a899fc2889669146e1bdfa5a93e3625c2afb639b8c5d7d2627312b34b3be085c7299b63a82c26a6b4de6a2d89bf3387f9e9d21efc5305b4dfb1a89c97065a9 SHA512 32b0c21d3e3f202df7d3a268d91bd8e945e7a6badbad6529366f3f82846fcc19fdd7b74dc85c587310727a9cb62c06ee93165a4c7a95a854647a8ca2dfcf4fb6
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
new file mode 100644
index 000000000000..7ba0a5a8dbfb
--- /dev/null
+++ b/dev-util/scons/scons-3.0.5.ebuild
@@ -0,0 +1,74 @@
+# 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,5,6}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+		rm -r "${P}/src" || die
+	else
+		mkdir "${P}" || die
+	fi
+
+	cd "${P}" || die
+	unpack "${P}.tar.gz"
+	mv "${P}" src || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/},$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -as \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+	rm "${ED%/}/usr/bin/scons.bat" || die
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index eb31240fa3a9..47de6e1b334f 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,3 +1,5 @@
 DIST stripe-mock-0.34.1.tar.gz 340357 BLAKE2B 127d39b01bbd883141c75e63dc5e0b8834dbc86f375058768072b3de75d3f9e3fabebdfdd9d872c51ad52fec3e2057ae342887c25b496b987d64652c93b204bd SHA512 c9e35867c44bd7d127f91d0f668d39ff67ca9bb2937428f808122555360a77b91f9f5d5648478dc2c4fc04a7b9195fed0a927868fdd22b852022ae2fe0f1e695
+DIST stripe-mock-0.47.0.tar.gz 371383 BLAKE2B 0d619e62c9d071cd0706f0deeab5cb659d994f02df87fc638e319b346cda83548bec9a6068814b7c17a8f62e8f9c2206003bd62f66f844e8f38ee96b10f099fe SHA512 b387556526eea8b02fb3df74b345f5447bc81d7cc9e7f9fe9cd59dfdef7895bd31c882bc3c96c6815c69cc1e1fc3bed8390beb107ecfeb79e69aba4bc115a17e
 EBUILD stripe-mock-0.34.1.ebuild 579 BLAKE2B bee1b559fd7bd252da8bc9cf95b221c3359841d9653d83add51098699e2a5e44cee1f16d30278270ca6dd5a0a1721b1757be88ce498bfe09622d8c81ac39047e SHA512 c94a200b1976687bf500a5f9a11ab0dc21eaf06aaec2a3d469f2275f3fc20779677c7d679ea220a6f7a8b72061734d215cdfe6bf2f39f6cd79a7b28b10b011aa
+EBUILD stripe-mock-0.47.0.ebuild 579 BLAKE2B f34d8724d7b65618e078fc5dc038619fe5b7c911993bb4699819aeb815689c5dde30f7cd143f2005d393549632e3635482d279ad1d469ac795ed9298c08c4327 SHA512 4ba06e10f94e1923fba546f1963d4c4e6c6d29d2c7f039e8bb529b1b749aa69befc338a79a5e4a2e7b7df258fbce4174ea683209216b0110925901520c0230f3
 MISC metadata.xml 478 BLAKE2B d9507af9f6fb1e2aefb92dd06000d1043d1f3e022c3c1538cb59da9e8ae79afbcc9485bc7ccb3f607704c9db9cd927a944e85f96a8fb8603491f7e464345fc0f SHA512 9f8e49eaebacbc8dcde06ca7650654f95e33e3bef44e7eb6106e128accb4a809a364c0c3aa6cf93be2ea0e8510774c8f5bcde4cc72af269e6644dde44f21b5b8
diff --git a/dev-util/stripe-mock/stripe-mock-0.47.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.47.0.ebuild
new file mode 100644
index 000000000000..466e59347a0b
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.47.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D%/}$(get_golibdir_gopath)" || die
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index b0c2f10f748d..ea1fe2b94d73 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,10 +1,6 @@
-AUX 3.28.1-fix-nosystemd-build.patch 1336 BLAKE2B f6292baad803ceca64be6a3b32793ecc4c1f99a946f247af7e79ef3ec421657230a7c473b219e9286a385c5ca25826aa192275ad1a3e1b78f2badb45a97e2c80 SHA512 d9a5c46b778835ba15c349e8458cb2dc6d950f1ad3008d0d089b5bb2235b15c4e461f9bbeb54a76085f59bf53873e671cdfcbf09c5f6f9c99251abef236b2aa1
+AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
 DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
-DIST sysprof-3.26.1.tar.xz 609076 BLAKE2B fd10ce27b224100558ff5bb9c75cfffcb76b2331d2c4056bd73a9ace1ea155e61d705240acf6fefa805fba2333f6d439369d5b1cc16e0c537ab9fed408bf6d85 SHA512 ee03360e4971cd91129bac3cc9d2cf292d29aafe1cdacd078e404ee15c3ff02bcd0c0159502605c00eb2abd3a46917cf70458ad05e48b594eeb2835ead55c34c
-DIST sysprof-3.28.1.tar.xz 380720 BLAKE2B 0a3b93659e421b717230bff6e90d20b28f8abc8491fddb51bc3f106b6cd8b038254e1fd0260c6eee2c2b83d77765be43f394d49bd34c054c36d6427ef419fefa SHA512 ca75c279bcb8cb37bffdba51d5b3481c3ece104847b64c0b8cb534468c9350a96c7224bf261ef892817e53aff2cff90a2b808f5db5a9afd6230721664b83809b
 DIST sysprof-3.30.2.tar.xz 393420 BLAKE2B 5e86a78c231d2d2c601198e066c463d8bec95ab1ae6d0f6678e6e80305b8a6d53c604ce54d9fc2a473e4679695cef709f0e1a9514f1091719f33a58b92c896eb SHA512 70c49f7c20742aad82c8d9b1e303d06ca5fd2d27a6868872d28affea22278d381bf3eb0d181cbd1bfa490bda2878c52748ac29273e9e608452e9bf4f29fd9e2a
 EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f1215320444c23559e6e553125700e31df955ec542b9ee04ec9a12a0bd4a669eb23cd4fbf96de6fb8d3562cb2c258c2b SHA512 24b82366648690bd9a4a03e04dc14e88d23c177c75dcca745a816213cf018ea4a959bb733da54ae0b1cbe85706df63cfc79140744716300a457c348eeb57982b
-EBUILD sysprof-3.26.1.ebuild 1764 BLAKE2B c3afd518bfb3a05f88c51a4f2f43834ddacaf6ce62701a4ec828623d3adb733a59b4d67f5952f740a72ff261e6a27464bd521fdc941cf83386d1c583c28e8453 SHA512 6c627f3dfb0f5bf32576489b6a03be94c54faf192df73be2fc39fc5bccb98e2c19a99f5d303e1b663e28d2df5348a411d40f633b259f1244e9b63857293db2e3
-EBUILD sysprof-3.28.1.ebuild 2125 BLAKE2B 3b0c90203488837b33015d2048cbd066bf7b0800f1135f04c810885c6d336ee9bab33b0e7e7730e01681a4cea77101b87865e9c85a5c51a85496d408519f80ff SHA512 02a7727f8a58712bf3fc9c91c41a0a5ddedeaa513c69ab9d5a0c5487c10d9afcaa8cbc35065b5d477378c71a919bafbebfe5fc1ce9cba1ed64e072f130c902f8
-EBUILD sysprof-3.30.2.ebuild 2078 BLAKE2B 16e63e53f4669f64be0e1d1d9e1dafbc5d04f65962a3f3e4ddd3015cb87dde0c1f53ea78cea895ccbf222926c05620fd2650149c701e0743326f5d6a88ab5777 SHA512 376ade85ba12c517d755535c16c23181dbe4b8ecb383bdf511d94074b8c09809d791a90a96bd42cadd571af6dd96e3b3005c6c0a8dea8d6d6ece05ef26bf92fd
-MISC metadata.xml 729 BLAKE2B 06e0c5194be5a6241062ee78bad2d2b5d0c58643657b2626c644d9f4aa14880b97340e2c87480a3e23eb297c3c3d08bba74ad45cee4b15d248bd0bb647cc7bac SHA512 4aa6b8b04ba7f008bc5e4de81cfed88efe2714c4330ce3d02433fde3d253063f5a7e17e6384ba2213d0e6421f15875943133d670b6ba5effb739d81914b3f0de
+EBUILD sysprof-3.30.2-r1.ebuild 2213 BLAKE2B 746f85bb79f993ef84c21c1e882fbc74ad2b0eced6c5b7e5a1ee1c495ae9ca49cc08ed2022638f4798bb8178ae0e6b87214993d5f7ba2b0f700c81db27e7ace5 SHA512 4ee7b8b74ba7f3a23f3020a3860e79b8078b80bc0fc4f9f995ecf760b3bbe12eed7a5bf71be82ddea97df79650e05c1187ef37203d4d3f70c2f980925280b620
+MISC metadata.xml 886 BLAKE2B 31416bfe6eb56d58ae1c1953d19cc59ee0cff0c0aa7d6c28f6b95b7b4c9038ea9a8af5025e64f29612b6b919953671eb4940ff60d6baf1c79b8d33bdfae2beff SHA512 5514125c6a2dcb55a06bc81e52bb6c94a804b0dc41ce7d7c83e9ee94f06ddcd585716c12887a6428e1afe3a9268cdc4cd0596d7a036de08f0e70ae3d6366f502
diff --git a/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch b/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch
deleted file mode 100644
index c83a951d846a..000000000000
--- a/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 28c28eb11ac1696ce08c9c90e8a7a7759bc5c50b Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Tue, 28 Aug 2018 12:22:57 -0700
-Subject: [PATCH] kernel-symbol: respect ENABLE_POLKIT setting
-
-This fixes the compilation when we have sysprofd fully disabled.
-That is not an ideal configuration, but keeping it working
-ensures that some of the code is easy copy/paste'able in the
-future for some situations.
----
- lib/symbols/sp-kernel-symbol.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/lib/symbols/sp-kernel-symbol.c b/lib/symbols/sp-kernel-symbol.c
-index 8eb8087..14e026f 100644
---- a/lib/symbols/sp-kernel-symbol.c
-+++ b/lib/symbols/sp-kernel-symbol.c
-@@ -18,8 +18,13 @@
- 
- #define G_LOG_DOMAIN "sp-kernel-symbol"
- 
-+#include "config.h"
-+
- #include <gio/gio.h>
--#include <polkit/polkit.h>
-+
-+#ifdef ENABLE_POLKIT
-+# include <polkit/polkit.h>
-+#endif
- 
- #include "sp-kallsyms.h"
- 
-@@ -87,6 +92,7 @@ type_is_ignored (guint8 type)
- static gboolean
- authorize_proxy (GDBusConnection *conn)
- {
-+#ifdef ENABLE_POLKIT
-   PolkitSubject *subject = NULL;
-   GPermission *permission = NULL;
-   const gchar *name;
-@@ -113,6 +119,7 @@ authorize_proxy (GDBusConnection *conn)
- failure:
-   g_clear_object (&subject);
-   g_clear_object (&permission);
-+#endif
- 
-   return FALSE;
- }
--- 
-2.17.0
-
diff --git a/dev-util/sysprof/files/3.30.2-elogind.patch b/dev-util/sysprof/files/3.30.2-elogind.patch
new file mode 100644
index 000000000000..2a57fff3a9c6
--- /dev/null
+++ b/dev-util/sysprof/files/3.30.2-elogind.patch
@@ -0,0 +1,35 @@
+From b30057251d3f2b5860b36505fed440a6bebe0359 Mon Sep 17 00:00:00 2001
+From: Shiba <not@telling.you>
+Date: Wed, 19 Dec 2018 00:37:57 +0100
+Subject: [PATCH] elogind support
+
+---
+ daemon/meson.build | 11 ++++++++++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index d0cf87c..c7f85d7 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -11,8 +11,17 @@ sysprofd_sources = [
+ # NOTE: This is used in data/meson.build
+ pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')
+ 
++# Check for sd-bus support either by systemd or elogind
++sdbus_dep = dependency('libsystemd', version: '>=222', required: false)
++if not sdbus_dep.found()
++  sdbus_dep = dependency('libelogind', version: '>=239.3', required: false)
++  if not sdbus_dep.found()
++    error('sysprofd requires sd-bus but neither systemd nor elogind were found')
++  endif
++endif
++
+ sysprofd_deps = [
+-  dependency('libsystemd', version: '>=222'),
++  sdbus_dep,
+   dependency('glib-2.0'),
+ ]
+ 
+-- 
+2.18.1
+
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index 5ea946de4371..70135f654431 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -12,7 +12,9 @@
 	In fact they don't even have to be restarted.
 </longdescription>
 <use>
+	<flag name="elogind">Build the sysprofd daemon service, required to run the UI without root permissions.
+		Relies on <pkg>sys-auth/elogind</pkg> for sd-bus API.</flag>
 	<flag name="systemd">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-apps/systemd</pkg> running as the init system.</flag>
+		Relies on <pkg>sys-apps/systemd</pkg> for sd-bus API.</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-util/sysprof/sysprof-3.26.1.ebuild b/dev-util/sysprof/sysprof-3.26.1.ebuild
deleted file mode 100644
index 144b2c9fcadc..000000000000
--- a/dev-util/sysprof/sysprof-3.26.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 linux-info systemd
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gtk systemd"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	gtk? (
-		sys-auth/polkit
-		>=x11-libs/gtk+-3.22.0:3 )
-	systemd? (
-		sys-auth/polkit
-		>=sys-apps/systemd-222 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.6
-	>=sys-kernel/linux-headers-2.6.32
-	dev-libs/appstream-glib
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	kernel_is -ge 2 6 31 && return
-	die "Sysprof will not work with a kernel version less than 2.6.31"
-}
-
-src_configure() {
-	# introspection & vala not use in build system
-	# --with-sysprofd=host currently unavailable from ebuild
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable gtk) \
-		--disable-introspection \
-		--disable-static \
-		--disable-vala \
-		--with-sysprofd=$(usex systemd bundled no) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-}
diff --git a/dev-util/sysprof/sysprof-3.28.1.ebuild b/dev-util/sysprof/sysprof-3.28.1.ebuild
deleted file mode 100644
index f6664d0b9fb6..000000000000
--- a/dev-util/sysprof/sysprof-3.28.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk systemd"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-auth/polkit
-	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
-	systemd? ( >=sys-apps/systemd-222 )
-"
-# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml translations
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.6
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix-nosystemd-build.patch )
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dwith_sysprofd=$(usex systemd bundled none)
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-	if ! use systemd; then
-		elog ""
-		elog "Without systemd, sysprof may not function when launched as a regular user,"
-		elog "thus suboptimal running from root account may be necessary."
-		if use gtk; then
-			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/dev-util/sysprof/sysprof-3.30.2.ebuild b/dev-util/sysprof/sysprof-3.30.2-r1.ebuild
index e3dd7be49675..11bffd1beddd 100644
--- a/dev-util/sysprof/sysprof-3.30.2.ebuild
+++ b/dev-util/sysprof/sysprof-3.30.2-r1.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
@@ -11,13 +11,15 @@ HOMEPAGE="http://sysprof.com/"
 LICENSE="GPL-3+ GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk systemd"
+IUSE="elogind gtk systemd"
+REQUIRED_USE="?? ( elogind systemd )"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	sys-auth/polkit
 	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
-	systemd? ( >=sys-apps/systemd-222 )
+	elogind? ( >=sys-auth/elogind-239.3 )
+	systemd? ( >=sys-apps/systemd-222:0= )
 "
 # libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
 DEPEND="${RDEPEND}
@@ -29,11 +31,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PV}-elogind.patch )
+
 src_configure() {
 	# -Dwith_sysprofd=host currently unavailable from ebuild
 	local emesonargs=(
 		$(meson_use gtk enable_gtk)
-		-Dwith_sysprofd=$(usex systemd bundled none)
+		-Dwith_sysprofd=$(usex systemd bundled $(usex elogind bundled none))
 		-Dsystemdunitdir=$(systemd_get_systemunitdir)
 		# -Ddebugdir
 	)
@@ -42,7 +46,6 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 
 	elog "On many systems, especially amd64, it is typical that with a modern"
@@ -54,10 +57,10 @@ pkg_postinst() {
 	elog "means a CPU register is used for the frame pointer instead of other"
 	elog "purposes, which means a very minimal performance loss when there is"
 	elog "register pressure."
-	if ! use systemd; then
+	if ! use systemd && ! use elogind; then
 		elog ""
-		elog "Without systemd, sysprof may not function when launched as a regular user,"
-		elog "thus suboptimal running from root account may be necessary."
+		elog "Without systemd or elogind, sysprof may not function when launched as a"
+		elog "regular user, thus suboptimal running from root account may be necessary."
 		if use gtk; then
 			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
 		fi
@@ -66,6 +69,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	xdg_pkg_postrm
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
commit	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree	c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-util
parent	0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)