gentoo resync : 12.01.2019

62 files changed, 919 insertions, 448 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b2aaf2f5f39c..6bd9f1294ec4 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bingrep/Manifest b/dev-util/bingrep/Manifest
new file mode 100644
index 000000000000..65fce7d98cb2
--- /dev/null
+++ b/dev-util/bingrep/Manifest
@@ -0,0 +1,76 @@
+DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+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 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
+DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST cpp_demangle-0.2.12.crate 67328 BLAKE2B 21147d1c7a2214e501b676e3a8c86cdabf5366539df2f8306e1c15cdf52cff1280946a7b073ed8c043d6157a6ff1cd790abeb3f28a23d935a7b25462af7b803f SHA512 0e2d3cb4cb90e156e02db6b09c26cc51eda999b6badda4095bb1be5cde2e144abfeb2ec85aa911650e6385eb9920b83c091c51aeb32770103a475c514c2e96b5
+DIST csv-1.0.2.crate 888793 BLAKE2B 12dcb63b31e8bbff21120288b1f8db8c036e83a9f82b0a317def7916797712390cbc44c36ad55b42c13fa7980dd3c66e2d7ef883ef6dfecbe6ffe8aec6766320 SHA512 37ed9432d7362374648cd0cf3470cebf7baad57400f56635e68c28c576f7a8fcb8350a3e420079df329e4c290e816f181712f04dd09e5101600dd4615b4e0afd
+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 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
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST goblin-0.0.19.crate 125517 BLAKE2B b66a5a7b85b544d73450f223a3ef74809989dd9bd278bdcd671ca59cc3226b23247654fb781bfa6ecabd53a72598ba2b1e49080e71d2ec583b313532fdb34295 SHA512 50758bd04e31fee5023fde437833ff59a55d717a79a447190b114bdd81794664b3d4be948b62cf5c6243a3d02b28c54f82d6e3da4ee021fb76e6626ebc29d8fd
+DIST hexplay-0.2.1.crate 10043 BLAKE2B 37251bd8ae4c5775b4671266b21441d9a21fa30dcfe95d6d0cec606bb114b5fde9ca25c8d1e5f316f1960b2e5e888c60bcd519811d7543b40a1fd0830ce01af0 SHA512 0c5097c05eb99f4cac11cba11143ade1446035d771104a676860773914f5d1cdbf921d56eb7ac15f00ba63233df03d6c64ae7823891ffc77bf268f6042671e5c
+DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
+DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
+DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+DIST log-0.4.5.crate 22221 BLAKE2B bf60a62e0fcef107e66cb0f673bdc2d6eabd364424ad82488fb09655258855401f394c4c5fab584560798953e188591524d9c3044d8b42d16bb3f9cb255b747b SHA512 19b1d82ccd929a63d661512dadbb0ce11f6e3679431a40f4c0139d0c2f68d77dcb05be71605eaa23c01c920a38d11e588339ab6d3982418ce61c9df55a4f2b11
+DIST memchr-2.1.0.crate 21479 BLAKE2B ca97d105cc780f2a22eb1eb7d6bf6755f012b1d15b5c55cffb9a63f3faaf48b5285cc7b4edbdb933c4e81565da163b325a4d570aee5cb479496d8b74c3d52d8e SHA512 6de3056b5fcdf08fcfda34be710d2f4ea326f056450a78a4fd096e5742cc40662d3003f3ef6ced26687dcee7591f5a8323d14df2cc286d732b1b22f05424c476
+DIST memrange-0.1.3.crate 14013 BLAKE2B 61a6dd89d36cc88bd79d225f1ebd37a906ffe6710e7f93467307b8f42c638642903ad3469fda94166a2d4ddbab59378787c04098748aa40f811947b12581b35e SHA512 343c006c52c6679099b41d0debb42e1241a1b4790ac3b606d90809bc4515dcea5e7759db97e486de191955fda7801ef70c1db5daf5348c219948d21e139c9811
+DIST metagoblin-0.1.1.crate 3107 BLAKE2B 5251d61e7fe7014f414d7829012bf8580c4279de7e5ff940d30544e6db8fc9390218b93783ff65a365172e4c47c1dd2c797ff3df23809cf20e84b3154bceeb1e SHA512 a5c6a36afc4ea52894fed09295f9bbac9be02288091859e6a35bfac849c12adc5485d80ebc58ae4be225d80495503af716276f1e9d9377ce6822178f4dfc294e
+DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
+DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
+DIST proc-macro2-0.4.20.crate 30516 BLAKE2B c292c4a88dd1c8d998cd683ed6e341fb98e334e481ab91dcb5ef69fd1b83e0d5cd294a3b1221787b641a8f1bb5f51090f87cbc20944af1c41c8ab902840dd5db SHA512 40c3bc5c147325523f02832db015925b7fdbbc7c430be39c8829bf8f7e9bae33fbb3313328daa1dc7d791545df5af76d27f1ec9f44943db91bee8c729a02df79
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
+DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
+DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
+DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST scroll-0.9.2.crate 23522 BLAKE2B 48de922d9348708c63c8d83f1849aa903ca78b5988b6bb5ff56ccc1e28677922bd2eac2a7cdf1bafd5eda9b1d460d89c3f732d4b4dbd5696eff9a91df9efb7d0 SHA512 6fd5d72267b1b2840a524f2177f92d240b05b35bc345f2018569c692af8c1deda35fae25230d4652132b3003d740abb4d395aa26cabf958c9544cc5118e335fe
+DIST scroll_derive-0.9.5.crate 4314 BLAKE2B eae8b18aa6e35cc1c003870974b64114817415a4d1e45da6068e11c5132003cc9eb2ce9b538d02709fcc7f137a6c6b1058e4d5f2cdf5b443127eddc55523a81b SHA512 8db648782f4235a0eba142d37e5b60a999874b74c57009e10f4f3bca2a4f26d8eaa0cae4202b1613a98d6e70830b6d2827fb5aa6cd08c510c78079e8eb6b8ccd
+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.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST structopt-0.2.12.crate 21942 BLAKE2B dcb8a53114184bffb3782e7a896f7549a89c27a7446f5d6238a7838f51e51029bb44d60e9900906537685d41cafebba6165ed7a244a6c3b97bdb2173cf70e98a SHA512 36d24a7780332d9a6bf55f329f73b88800dcffc3e74a0c50978d223074e884f9934b8effc38bb67de747fd60fb415035cbfeb84820ecf184ba8aa00290670f7a
+DIST structopt-derive-0.2.12.crate 11213 BLAKE2B 0fd8db15e6d8fc2ebfe93f7e71a6f7a70ee7e3273800c965fa744bcae3a7ebfab226ee2e82259104e3400a5fc7f0f738971dd6dcfd1425795b5bf16af4752242 SHA512 705c0d14cd07b7d6ddf3757f4cfb4e943f9a81513f7db035c14201905be5d245834e9bdeca001b7f5ed3f3c15930c40892b0f539ab44d1139a530c0fba0a62f7
+DIST syn-0.15.13.crate 144437 BLAKE2B 260294de8d28d1fa758013b84a9a811b1e449933dfa773a8f041898c662b8776473d0e73b0042b20ed00906a2db6b801236e457b44d2d6f856ad391af4950328 SHA512 c8d837f4a3f52a527cf7d4f8b5d96bda20e28a0893cb385fedc4672e64fda5dcd8d96338aa58a06d156f8cdc54e0ffd6f999157997b857bbf28d1bdba245be4d
+DIST synstructure-0.10.0.crate 17344 BLAKE2B 6a5d2e54ff1f801858d2c034bdfad85330dae0aad0b3940d41c8b334aedd929b9679f1e0f6d4042756cb37592950c12487993e27301e6371c720a27115c6261d SHA512 573212bfba512225dadf7928172489c7d9f74baa23779831eb1f4fc042f7f79a42d78eacc467e220914885cb3b0329e3cb7b65629f60d59bf1d1e1786c2c7963
+DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
+DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
+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
+DIST theban_interval_tree-0.7.1.crate 22912 BLAKE2B a7f1a90a8a1f76808f64c013a0603f8b5f2811623511bc636f453a44b2d446bfe1d3f1257c1e20c0901b44b79c76f55145783f3d092fac947e48c909b4c0e135 SHA512 62ec06e13430c5828337300e8d25010b5a262d6359f33c689ea211798e1ba6103d144838ebf77d718e25360763f47265764e49d3332cbb05e91f4be159337f5d
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
+DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
+DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
+EBUILD bingrep-0.6.1.ebuild 1830 BLAKE2B 5cf7fe1eb18af77bcf40b1f10fcceaba97aae5ae748f4dd1ecf6cf6aee122b828bf82fb7556d23195fb8e06e1934d8103ecc69fc1d8d02218779f8d135814a66 SHA512 863d188121d89238c68ce88c70f8f099c3574727a3f57f95a946d633f6f7fa9c4a1ed4f582e5426951d8967cc118028e4119b7d503a771bd55ac77624dd5278d
+MISC metadata.xml 721 BLAKE2B 1033916ecf17446ce916c89c370bb7784c0547427b14f7cde6288f1de1bc883d04ca19bd31170308c8046d236ddacecf933b44f4cb33709327a6f2e4fe122aef SHA512 14014259f5ae3080b1362d2f73c7216bbe03321d01ba228c38e81262e9678b1056a13926515ec9f27a892335975eb7e591e851c03832a31f46449a5edb380ada
diff --git a/dev-util/bingrep/bingrep-0.6.1.ebuild b/dev-util/bingrep/bingrep-0.6.1.ebuild
new file mode 100644
index 000000000000..fde58d07e7ac
--- /dev/null
+++ b/dev-util/bingrep/bingrep-0.6.1.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.5.13
+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="d61355612f914200d422fe0fceff918b45d4bdfb"
+
+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/bingrep/metadata.xml b/dev-util/bingrep/metadata.xml
new file mode 100644
index 000000000000..e34bbaa45a07
--- /dev/null
+++ b/dev-util/bingrep/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Greps through binaries from various OSs and architectures, and colors them.
+		Current backends:
+
+			- ELF 32/64, arm, x86, openrisc - all others will parse and color, but relocations won't show properly
+			- Mach 32/64, arm, x86
+			- Unix and BSD archive printer
+			- PE (debug only)
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/m4b/bingrep/issues</bugs-to>
+		<remote-id type="github">m4b/bingrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 30b216926f30..55222c82e824 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
+DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
+DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
+EBUILD bitcoin-tx-0.17.1.ebuild 2423 BLAKE2B 78ef2d3ae7facad5d3f7130ce7051e9167f74805b2f6774b1d4bfaee918540336a0ae849ca1506674ede327b8dd0e7ec35b30a573e90b97be6d743c3b8437df9 SHA512 138de5a0154dd1f198c82d7476f3d858e6391522633d8ce044ddac9797a3224949e05b074ddfc4076ff4202b4e95928b22e4e16295a6bf17e98e2a35b11a0690
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
new file mode 100644
index 000000000000..a431bbafab73
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
+KNOTS_PV="${PV}.knots20181229"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 9fce47190030..197eaef59a32 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,10 +5,10 @@ AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.4.3.tar.xz 328824 BLAKE2B f2ff3276cbadde642a362400b32291f59f60c274861c4c706f0bced801aec7aeeafeeb611331bc23e96fc8790a1d1ffd39df58f24f6a5384d8ddda0da54c9339 SHA512 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49
+DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
 DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
-EBUILD ccache-3.4.3.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
 EBUILD ccache-3.5-r1.ebuild 2046 BLAKE2B f5bd4d9cf89b0896d51152614c47f329e29d084c371b4fdd0291d2d6d1b2d880af38358a6ffbd620b9a8d1f3ec6a95d263ce2f8fa202955c2cb32c77cf33d758 SHA512 a90b898e8e261afe126321d7222ce41d4c91e068ce5baa15927a630ea66d141cce95f87b826c85b33599f33b0584055d22af6dd358651daea29487800f0cf2ae
+EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.4.3.ebuild b/dev-util/ccache/ccache-3.5.1a.ebuild
index 25d07d629e1f..7491315da2e2 100644
--- a/dev-util/ccache/ccache-3.4.3.ebuild
+++ b/dev-util/ccache/ccache-3.5.1a.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit readme.gentoo-r1
 
@@ -22,8 +22,11 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
 )
 
+S=${WORKDIR}/${P%a} # 3.5.1a->3.5.1, bug #674516
+
 src_prepare() {
 	default
 
@@ -34,6 +37,14 @@ src_prepare() {
 		"${FILESDIR}"/ccache-config-3 > ccache-config || die
 }
 
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
 src_install() {
 	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
 	default
@@ -57,13 +68,13 @@ ccache now supports sys-devel/clang and dev-lang/icc, too!"
 }
 
 pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
 		eselect compiler-shadow remove ccache
 	fi
 }
 
 pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
+	if [[ ${ROOT:-/} == / ]]; then
 		eselect compiler-shadow update ccache
 	fi
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 64ee02976017..b1185c81e99b 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -5,6 +5,6 @@ DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B 73a1d4e1fb0770103c8163f35b9e710a586356
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B 1eb2f1a4a41981bb77cbb125baca20ced0c3cbbaab514fba64183780f80dfb148cf6c84a4471c20f276a11a79954b52adf7f0d3861e172ec2eea32440b14470d SHA512 b62076fa8e84ddf38a61ed396fab9d4ee91cdc668e8b9ad8ede52f8f7e8451e3e8d38293adb221585baad7caf2ea810dd8add22ce200b9bda499aaf71495a581
 EBUILD cppcheck-1.85.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
-EBUILD cppcheck-1.86.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
+EBUILD cppcheck-1.86.ebuild 2339 BLAKE2B 453ea3e5775928f7919e3528f9b4d15ebee3e91d20c6d0322c686205ce47f724ee02be5ea91c6b4a2c8b08cd3cd4c47c60c268898f7b2676ee8f095ebc1c0fc1 SHA512 6f8f66ceaa041b1bd722d133504a814ebfeea6c5217ae3faaa1a2d17f0e023c36b776e8651ea9a57f2016e8650c0fa7d7382f6cf692d0bf60d0f84f455f4457a
 EBUILD cppcheck-9999.ebuild 2276 BLAKE2B fae2869f37c66579e943a6d9ba6cf76fe8cee7fff3da469b0a56b2bcd04d36fe1fbc9054642f2e3cfd5f2a4cba6de8fc9fe1000bacd327e27d8909fe1396d2b9 SHA512 71f7c9dc55fda1199755f4826c4d070abb52b4e9f7bb090fbb9801dfaf37d3c54fb480e32e674b67dc6089a4a6a0f58df00cd26c2447f57787fee3f912fe92d3
 MISC metadata.xml 321 BLAKE2B d5a81f7f1cafc279c08bc120e0feef7d74e2aa5f791a0c11df2a55738b18e35a4eac03f508501ffaf82e23c6f14aae441d2861a7b62bc5a3d8801941aa391b12 SHA512 c28c3db16b406dce013d82f8745530f7970a03738f89b418b0fae2a6cf0056dad078b77d5acf976403efa71315a33eccc8ab5973aa04512c41cab6c4e9f6ad79
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index 87931e60c7b6..1bdbc10acd3f 100644
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
diff --git a/dev-util/cpptest/Manifest b/dev-util/cpptest/Manifest
index b13a56b51dd4..09c40eff2a65 100644
--- a/dev-util/cpptest/Manifest
+++ b/dev-util/cpptest/Manifest
@@ -1,3 +1,5 @@
 DIST cpptest-1.1.2.tar.gz 458982 BLAKE2B dbb144196ec5726822f859397f5429e743bdc9bd840c2dab198f19512d2d0ff66b33e8b1018be2616944e300b0bc0e2fd247b7c7a5a290096f8d402592f1441b SHA512 da1030c69a5886e752b9ae08b65c501334c7d2d4abd2174190209ce11ed351239a615b9f7c5019ee601289523b2c21a1205d2042e59aea6c2882d77d636fc57a
+DIST cpptest-2.0.0.tar.bz2 440323 BLAKE2B 7d703a9a41c6fc355f97d2074b71fc5c700ee2483386984147c399c096eebeec7f2a980f0678e1a4d9979a7795d3f7ff7d70cbf8b483e055a420de985aa40f2e SHA512 41b5f7989198a79dca29f7d579c4d3918e5c3bbc0f91f77317ae074af8daaa8e5ee8add7c29c8e345cb95b08524839cecc7659a8d95ee95712e205b8838c5029
 EBUILD cpptest-1.1.2.ebuild 585 BLAKE2B 88751b5235040b917f4c0b84064c3e6db41cba60c4daca8405140874359906c8c623008ae88b337e57c27f4e213ba00fd3c56df9819821f5e8c28adb93452763 SHA512 52b488314d202a8e067fa7dc0c6e67c7ff70981109031795288e21aec233c38d5531d79a1ab7b17ca40667b4bbfbb5e5dac11a729e092d1662ef5040b2f5a60d
+EBUILD cpptest-2.0.0.ebuild 669 BLAKE2B bfc57524c0fa7474f796a75fd507072344feb0438b68584d6874d73bebc71da8c1055a5139a24b3e5b18ccf14655974175a0f547b50e177ed6f8f1e21d21b7ab SHA512 a6d9d1ed8a8544e3f258ead5a53d21cc51ab3e2ae53153867361db033e758cc3ace48363796bfd0880156f2880dbba611a9837727b5632b7c1b41be2b60e08b4
 MISC metadata.xml 604 BLAKE2B 2d0f5d155ead0d2035142bd395d1d057a4473d6d724b287bf6429a0c120eb340c16e5626929400acde2377b4c34de6fbb3016021f0b759b6fd16265ed67be017 SHA512 7df99419d82f5c714e2c941f810e3a930569045299b63dd9c2eb851628124c410afd30cc1aeac52ddb651e1e48ae8f41727f02c856b0f5a01d16aec318aa82dd
diff --git a/dev-util/cpptest/cpptest-2.0.0.ebuild b/dev-util/cpptest/cpptest-2.0.0.ebuild
new file mode 100644
index 000000000000..8369dad2328c
--- /dev/null
+++ b/dev-util/cpptest/cpptest-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple but powerful unit testing framework for C++"
+HOMEPAGE="https://github.com/cpptest/cpptest"
+SRC_URI="https://github.com/cpptest/cpptest/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1"  # for soversion 1.x.x
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="!dev-util/cpptest:0"
+
+DOCS=( AUTHORS BUGS NEWS README )
+
+src_configure() {
+	econf \
+		$(use_enable doc) \
+		--htmldir=/usr/share/doc/${PF}/html/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 9a4a7a12f2a2..ea6e8d9ea7e4 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.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
-EBUILD gdbus-codegen-2.56.2-r1.ebuild 1309 BLAKE2B 7a02615b7a8cc26cd9be1b2452800628152914ce889ee676df75f245784f03aa0ce6a4a45bcd73f13e3976fc0ff762e18e360e2f06b2b63fbdc9580e3674ce08 SHA512 d9e16e1b9c6f9075bff59b0b8210d94ff67090be24824bef8bdb5305221fcaf486d3b74f36c2541674c40c5cbddcf5af120b6c30255677201c281e7b7b35750b
-EBUILD gdbus-codegen-2.56.4.ebuild 1308 BLAKE2B 3403601f6a6d85176202a1d9a7bfdd27d4d1f3594c40283c7fd4ff8cca417f8e0fc3f6caaa6c4e80b11b6823d121d44e3fb8d988adcab7ee87fe65552d4137fb SHA512 6433269396322e2bab671ae69d08c1fdded1edc7d351bd0ffd31d20f8547cf6a821242e102fa020218edec469cf622c68c8eacc11752f88714b137b771bc98ea
+EBUILD gdbus-codegen-2.56.4.ebuild 1306 BLAKE2B 0822701e68416ff599d2e5980ca176a10841b74a99f036bc4e4fb187cfcb865b99cbe312af75ba208e959d3a765d0d8beb7ad620475fead87087cfb6a5e51b56 SHA512 f671799d602017a6df349a00711edd80136021041e08c5349844ac94c2b6e759ea3160d2b72ed3a1cbc866d2549cc8fbbfe2bad3053804affd8276aaad225015
 EBUILD gdbus-codegen-2.58.2.ebuild 2130 BLAKE2B b58e9658ecdeaea3e5db2006133bf957993e3d74f98b66f18cd65ebfee45252f8e3bf2c357c44b7128f61da4b041716b42125fe5a50dad05d5d109ee73de9c62 SHA512 83cbd6cab6a158de848b9157a356fb0dc36a68dd4ad04605935a08b4254885e29f6099b858e26731d70173f7501382ce46f4aea9f18eabe0db0e89d79bea368c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
deleted file mode 100644
index 91798e300e68..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
+++ /dev/null
@@ -1,47 +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}"
-
-# 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
-	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"
-}
-
-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.56.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
index b1373d2fdc64..cfa3d789588f 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.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
@@ -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/geany/Manifest b/dev-util/geany/Manifest
index aa0598ff8ecc..b9e28d35aa34 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,10 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
 DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
+DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
 DIST geany-1.34.tar.bz2 4474601 BLAKE2B 92a2b8343512317ad90cd10bd58b2aca77d7f58dff3548cfdbdab121343b67dcaa7a9d5b57cafd196d599d8bb6a121fa5e49d65a69fa7fd87fe7703be6b8d5fc SHA512 ef506880fbba9acbd2003b207c9897e115d398e716631bc1e164e3455aa9172f34b9955c627fb2f2dd3a3cba0926cce0a774d641517bc94b700d866be00db1a7
 EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
 EBUILD geany-1.33.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
+EBUILD geany-1.34.1.ebuild 1744 BLAKE2B b20dd575bb8fa54293f09f4257b24ee6cacf30a80dc9f3f34cb90002095d81c64325cc54cb3260390201a0f3e5ba3996e5af6a17e8955b1b9c41f07abaec25d3 SHA512 d3c462d73371608807c2c391639c290b3c2235b6d457dc6e3d327236fd1b5d4a588a0edcbc40fbda35d20c4c5d5349fafc40693eb6d8159a96ff1e7f660f5797
 EBUILD geany-1.34.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
 EBUILD geany-9999.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
new file mode 100644
index 000000000000..416007a6e5ed
--- /dev/null
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="https://www.geany.org"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	SRC_URI="https://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="+gtk3 +vte"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.91 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	default
+
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-dependency-tracking
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable gtk3)
+		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index ec8f0a35c68d..03f61925114e 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
-DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
-EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
 EBUILD glade-3.20.4.ebuild 2387 BLAKE2B 003c02a10279cb52ddc2ff94a990bc126439f7ef5f8fda5033a05587701d4b6de31b661cb6c417ec1b8aff5c55da73e7a4609df693951be702d39a7854a8446f SHA512 2619096c3f62994aff9022a68987f09c409c213e6cf076328d805915fcb183283c2fad7de4c5c4091573c4417fc94607c32f7e7013041a8582b45b304effb6a8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
deleted file mode 100644
index fcb9aec14d78..000000000000
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE="debug +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 01b52dbcad32..00f59ac37071 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,5 @@
-DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
-EBUILD glib-utils-2.56.2.ebuild 1412 BLAKE2B 19d1c079c16b76facbd3e3660257c407b5e199a34699f2cdb8ce96994a2583dfd711e4645cb2dc7105fd93144a4a45c8549ac6c79b0b60f38412485219b776a1 SHA512 6877ea1e614ba2f94cae7f70793813a1e43195723cf469e936278996b9039f4890520c9df6f57297015f6cd07d1ea58ab248a4835edca66857938fc8f2dfcf97
-EBUILD glib-utils-2.56.4.ebuild 1411 BLAKE2B d0cf30d9beb3e100198a7898fe52111feeb6220e04b168667e4353d91f68b5dd26f5239dab6e594d1588426a62f6c9dd1c2a887d239756f8a5afd322ed17966e SHA512 53054e7cc6cb8bc04e2b6354b7e0fe791cbab45d824914880eebb385641d3b9f8ab69b3fe6d822694cbada77181d7b1706eec0207c0b9612dc7a92ad5f31e5bc
+EBUILD glib-utils-2.56.4.ebuild 1409 BLAKE2B faac06d9c04b56b3566a3227a3b8cbe8170c3aced4cf1ab2fb2fde119e2423cf81fe6a06c5b147f4154f44ea17bf4d1b2149dc9e5580dfb4dc13b59e35ed0020 SHA512 8f6a3b9b1d9bd0f7d1b393122545a0922b699a7c5a43a3c4a1d14390b92e2a7bbd584eb4970f8554c38827585b1d6ae0220b7f67f712105cdaacf87f03d0472f
 EBUILD glib-utils-2.58.2.ebuild 2411 BLAKE2B 3b498ea0da25ed833915203ac8f4cfa736b46fd8d7d389fb9ca59369a23c1ff04638a50b5ca24fb5db2d7812e68a1051428df0829afa7464739685c7a0ce4558 SHA512 b505bcee6d11c9fba2c05db68959c38456c58d5cb30ee66849e484844f94f1b691d9933f9b702c1afc0610dc52bbec525b23116ae26460dfbf453010a3932305
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.56.2.ebuild b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
deleted file mode 100644
index fb0510c85f1f..000000000000
--- a/dev-util/glib-utils/glib-utils-2.56.2.ebuild
+++ /dev/null
@@ -1,43 +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}"
-
-src_configure() { :; }
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums
-}
-
-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.56.4.ebuild b/dev-util/glib-utils/glib-utils-2.56.4.ebuild
index 337ac0b5df29..7fbd4e170b8e 100644
--- a/dev-util/glib-utils/glib-utils-2.56.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.56.4.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
@@ -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/meld/Manifest b/dev-util/meld/Manifest
index 1f4c845607b7..394e5b39852f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +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
 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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.0.ebuild b/dev-util/meld/meld-3.20.0.ebuild
new file mode 100644
index 000000000000..5620f4667736
--- /dev/null
+++ b/dev-util/meld/meld-3.20.0.ebuild
@@ -0,0 +1,36 @@
+# 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,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+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.20:3[introspection]
+	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ec6b61ab55dc..3f9ac150ce7c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -11,7 +11,7 @@ EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152e
 EBUILD meson-0.47.1.ebuild 924 BLAKE2B 8d581fd6b067bac2f1df75966404c52965200621efaf1e9c2ba49f66370c19bc28808c7bfd1e8f425f8a3417f140a906bd1e4705e64bd3dd220e18768e37ee76 SHA512 d4f8e48e3cec8dd09663ddf9a85bfa4b2e4882633d68f0a4f2766938da90aed1bcf84cc4a167fe56782258f9d5162f0eb6d24a59af311daeebe9913d18b1a61c
 EBUILD meson-0.48.0-r2.ebuild 1205 BLAKE2B 6b7b273e23e9e28e8fe78d20948802ed6834d017930bd8ddb286a0c01af68fb9d91443bbebbf8c1a82433759a6b74be85c744fb1fd812d3e2b2b8e3bdefe2105 SHA512 f107c74333c075cccae7e91afb465ced0c7f8d21b5c13849b425c6581567d854a663f0f452efb7ba7ad6bc145c2d8c8e5bdef80a12770c46fc7fd9e038646420
 EBUILD meson-0.48.1.ebuild 1139 BLAKE2B 813a717e745a1adf42be7e66a7fda714b9244a80859b8983470ae34abaeb4c1e09c28d8538ca7a9560131609ed5408c7f9699f92200847341d06ec86b6e02882 SHA512 ca5ce3d1069263b4b4a88535c15e768ee7131e0a8a1155c39c614dee20a8eac7f598ce7daa270853fa968ad0e2ab84078bcbff251d4744c0de7e9f91c433ba96
-EBUILD meson-0.48.2.ebuild 1743 BLAKE2B 70620f06993a47ea4ba4753f50a96d8d2923fc201e2142acedd03928639a14b36130442cf4a8fba05b0e1d9a78f7a2ee41679ea70b41da0aee92016d348495e4 SHA512 bd44ceb5b712fa9a0f9ed7166d16a4e183ad085e13101448ea27dba89510b9c8ee63c86486a7705a9be1f6fa750adc0d80fd1dc4548fb73ffc66d097f20a1e7c
-EBUILD meson-0.49.0.ebuild 1750 BLAKE2B c7d068fab223b88dbae6d6cc32291b1f3e90b4304dcc5d0e0b21d9d07c59eafda94805c8a2576d10a8e7512c59164ad976fb10bfb7721e426c217fff1c225ef2 SHA512 3a102c115b36fc3c06e2abbe0e565c1a26ec80535a3d42f1c5cd21835d5464a5136dce25b17f33960ca8548b6007d5ef8b6822fa74c88d5d50f4cca700dd3c28
+EBUILD meson-0.48.2.ebuild 1740 BLAKE2B f5796ae34849fa395b91ebd0d8b7c539a5373ac0e1a541a4bdc8c40ae5bf5f858a5d8799cd3e284bdcf34e30015e36174840772c3da327dd2abc9bb9b2e92b9e SHA512 8a95f4befb2a9a36e878f43be64cdbf12773419008ff351d4da908bca91d3da2c1c24325187613d695379eb704b43b1249549f283efdf59eef62f9999e4b6e6b
+EBUILD meson-0.49.0.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
 EBUILD meson-9999.ebuild 1750 BLAKE2B c7d068fab223b88dbae6d6cc32291b1f3e90b4304dcc5d0e0b21d9d07c59eafda94805c8a2576d10a8e7512c59164ad976fb10bfb7721e426c217fff1c225ef2 SHA512 3a102c115b36fc3c06e2abbe0e565c1a26ec80535a3d42f1c5cd21835d5464a5136dce25b17f33960ca8548b6007d5ef8b6822fa74c88d5d50f4cca700dd3c28
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
index 89e757ea3551..faf11d7681c0 100644
--- a/dev-util/meson/meson-0.48.2.ebuild
+++ b/dev-util/meson/meson-0.48.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
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.49.0.ebuild b/dev-util/meson/meson-0.49.0.ebuild
index 31b02901a507..6149ebc1ee51 100644
--- a/dev-util/meson/meson-0.49.0.ebuild
+++ b/dev-util/meson/meson-0.49.0.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
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 17ec74303364..898ee5834578 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,5 +1,5 @@
 DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8
 DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5
-EBUILD ostree-2018.5.ebuild 1183 BLAKE2B 749134dbf4e826fd6535cdd94ff66704d136404a1864d8dbbb7bf075cc42d89bd7091100d31fdc0a81b13aa452075c3ae3f4c6fe9d4931ada5e20a6a9d6cc65b SHA512 f1bb169d68fc6658b986b6d443537e6e1a7a05386588a966de08ef9c6da370524abb11ce6b8b95e94a7eeec7cefa4ced461526ffd8abbb1ee123457cc5de02f6
-EBUILD ostree-2018.9.ebuild 3219 BLAKE2B cfb584f4e3e8e38eb9df1016aaf7778eade21b6570d39c399c22facfd5dbce1c9d7e5e0db920820c645e0d9c2c04ca4b9c22668fa39bb0e499ad1e176592903d SHA512 8f32a3f915b1222850b3c1cbe75af5dff6013a38b6c8c3510aa4e5b27f8553fc9122c7df164bd30c96be832c00c695ab5dc7d8a0c881c96fbba077efc693257b
+EBUILD ostree-2018.5.ebuild 1181 BLAKE2B cf819151f25f2a120dc83de957e7d60ec96eaeb95fc0dbfac7b8a86f374acda1e84c23f76156a9a60808a5a45ba99a27ffe5439900d630b1b2f9f213ba3f51f2 SHA512 1a6c195dfdf50bbd810c44b725bf74339bf82e3beec9dbda68d01ad0cb08064b0e0955985149242711015cac7553fa5d31b176db9255124af9237ca2712ca2ca
+EBUILD ostree-2018.9.ebuild 3273 BLAKE2B aa9248a88fa9cdf9a3e8bc9ca9094c14414e5e89eb1da4417cd4aa8b2ff4f1b4f8e524f9d8622f528ff3fe5a08077258af41963ef9566d3a231e44880374218f SHA512 a615a7e34213dd06c1f8bb65c2e2d26f070609c7a3b607c29f02d892650a99ece6b196893983276a12e4ba657a6acb5b247ac5faf692f88ef9d2c8f860040535
 MISC metadata.xml 1733 BLAKE2B 81ec9a732f50e49d589e385e6f88a99a629098d2f172aa398ac819fb4e343d2c172c86f92c778d402623f8b7b1143ca8f19f3f3c9ff30fab7fe89dd20ce1428f SHA512 56f083cd71d111275d59dc2759da9ec7685deb01890476da499b56ed82d873bdbe0a0e76f5c07a8c9f2efc3219c34884df2fe4c6b7407363abcc2b6ce066ddbd
diff --git a/dev-util/ostree/ostree-2018.5.ebuild b/dev-util/ostree/ostree-2018.5.ebuild
index 3c2aec24a4af..a625a9af6c8f 100644
--- a/dev-util/ostree/ostree-2018.5.ebuild
+++ b/dev-util/ostree/ostree-2018.5.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
@@ -21,7 +21,7 @@ COMMON_DEPEND="
 	dev-libs/glib:=
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	net-misc/curl:=
 	sys-apps/util-linux:=
 	sys-fs/fuse:=
diff --git a/dev-util/ostree/ostree-2018.9.ebuild b/dev-util/ostree/ostree-2018.9.ebuild
index 495e21ac476f..a0ebb8afb288 100644
--- a/dev-util/ostree/ostree-2018.9.ebuild
+++ b/dev-util/ostree/ostree-2018.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,10 @@ S="${WORKDIR}/lib${P}"
 COMMON_DEPEND="
 	app-arch/xz-utils:=
 	app-crypt/gpgme:=
-	dev-libs/glib:=
+	dev-libs/glib:2=
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	sys-apps/util-linux:=
 	sys-fs/fuse:=
 	sys-libs/zlib:=
@@ -42,6 +42,7 @@ DEPEND="
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
 	dev-libs/libxslt
+	|| ( dev-util/glib-utils <dev-libs/glib-2.56.2:2 )
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
new file mode 100644
index 000000000000..6be5fc118308
--- /dev/null
+++ b/dev-util/packer/Manifest
@@ -0,0 +1,3 @@
+DIST packer-1.3.3.tar.gz 8988302 BLAKE2B d6357624f7aa8af73961be9b8f75ec36650d3ccbf299ccdb85776699332fcaa90ff38349837f17962b9587cbbd051a75b0f3429b4459ee9aa46f2a897a3511ed SHA512 fc8965fc4c71d12e2d4bf0c2c7cb565834205749390cdbb879acb23143d4b7f4c566b6513afbec61ad73bf3e08a551ce001367ffad105dba68b72f2092d4bb97
+EBUILD packer-1.3.3.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
+MISC metadata.xml 1367 BLAKE2B 30b2ebc8ec0449bb63f4bf97431bf841a09ef98dd7bf59064bd3d6ac8ed697d254de3ed940274795fd35e56ebf582a3880b4e0a3063074b7fae04bbcc07396fa SHA512 dfb93bd681962fc8290c886248021e8b281c4b184acba7133824a7c00eb9ca03a378769329469ffbaa1559ff6427988d925acbcd68cbe76518f4052831e2ac2b
diff --git a/dev-util/packer/metadata.xml b/dev-util/packer/metadata.xml
new file mode 100644
index 000000000000..bda27c75a682
--- /dev/null
+++ b/dev-util/packer/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danmolik.com</email>
+		<name>Dan Molik</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Packer is an open source tool for creating identical machine images for
+		multiple platforms from a single source configuration. Packer is lightweight,
+		runs on every major operating system, and is highly performant, creating
+		machine images for multiple platforms in parallel. Packer does not replace
+		configuration management like Chef or Puppet. In fact, when building images,
+		Packer is able to use tools like Chef or Puppet to install software onto the
+		image.
+
+		A machine image is a single static unit that contains a pre-configured
+		operating system and installed software which is used to quickly create new
+		running machines. Machine image formats change for each platform. Some
+		examples include AMIs for EC2, VMDK/VMX files for VMware, OVF exports for
+		VirtualBox, etc.
+	</longdescription>
+	<upstream>
+		<changelog>https://github.com/hashicorp/packer/blob/master/CHANGELOG.md</changelog>
+		<remote-id type="github">hashicorp/packer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/packer/packer-1.3.3.ebuild b/dev-util/packer/packer-1.3.3.ebuild
new file mode 100644
index 000000000000..8cae3f47d007
--- /dev/null
+++ b/dev-util/packer/packer-1.3.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+
+EGO_PN="github.com/hashicorp/packer"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=">=dev-lang/go-1.11.0"
+
+DOCS="README.md CHANGELOG.md"
+
+src_compile() {
+	cd "src/${EGO_PN}" || die
+	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
+		-v -work -o "${S}/${PN}" ./ || die
+}
+
+src_install() {
+	dobin packer
+
+	pushd "src/${EGO_PN}" || die
+	einstalldocs
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+	popd || die
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 0d353b8d1bde..61923b5a3c37 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.5.3.tar.gz 80896 BLAKE2B f396d14c95f8b9eb652fdc3073be942bc271f67116c081818ae8d769ca492f201a1da206d9ea4d0011e01790ce54a1d0c0e174de966938adea46ad526652f766 SHA512 39804112b70bb90b655754b78d87a23906b749622083534dda1cb7b7e381c61f95c41c02fbfc6f8dea075bd3665cfda93f565c5d896779d5746ac71b74878df9
 DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.3.ebuild 1208 BLAKE2B a9a4d89c04ec512be71d2adff1638f6d2daec7b929da8d2fc719fead0337b4e4a58e7b1a80544ec025af96edd8c05396fe4984db5c33ecc79b48f8763cf0e8cb SHA512 5f88cbd4c3162a3e6cb02e8710464c10384268564428b4dc713f9b9d122909e8cce9ed086648c5238a1b1c6092d78abbf248e72b764818b1bea687f3886706d5
 EBUILD pkgcheck-0.5.4.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
-EBUILD pkgcheck-9999.ebuild 1247 BLAKE2B 8da15077358e5e18dc8caf985d2e9930a7324512c82f52053cb4926789562d0624d7b393bd16fcb9d32e758b5f4b3573c98e070f2a2b3d5b369f84da00e5335b SHA512 8209da6dbc589c4e4be06678388cb9050fe00046381eb7d606a00249e17c6e549cd8347677216bce762c8092e769404dc04cc98937463b18b805e70befff5788
+EBUILD pkgcheck-9999.ebuild 1308 BLAKE2B a9c60ed56de7e719a3accb8919d854a300b3fd04a058e7d76fe51fce5a41e10dc751fe896ee33713620b0e787c7e9f1bc56b1fb2657156e3ffc25f9c2353c5ff SHA512 11235d5c364fcd3f7edaaefa3a46826a80f1ce18e1357fc5e8fc6f293cc562cc3783b1e3ca335caa5356a8752720490dbd6bdee5fa24bf71e0766cae9e37ec6e
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
deleted file mode 100644
index 7f6377c90e14..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/pkgcore/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/pkgcore-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.7.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 2b1a33742b3b..898fbc5e514f 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,8 +1,8 @@
-# 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=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -19,11 +19,12 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
+IUSE="doc"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
-		=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
@@ -31,11 +32,11 @@ else
 fi
 RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_compile_all() {
-	esetup.py build_man
+	use doc && esetup.py build_man
 }
 
 python_test() {
@@ -44,7 +45,9 @@ python_test() {
 
 python_install_all() {
 	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
+	esetup.py install_docs \
+		--docdir="${ED%/}/usr/share/doc/${PF}" \
+		--mandir="${ED%/}/usr/share/man"
 	distutils-r1_python_install_all
 }
 
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 06779407c8c3..39553279985e 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -2,9 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-community-2018.2.4.tar.gz 260812419 BLAKE2B 2274d8af513535e4c5b3b69619c944f503dd9f2248a43cf3352221b34c40604f409038d85366321e858037e3c9c63dc838c046917c3102a2d536e4aef05c1636 SHA512 aca812b3355552c6a65865385e82c96fbca06f9caa39fd21723710922865f7aeb38de33eb041efb1e3553e161c34de6d8b8ed724d7c91ba16f3a818711ca9468
 DIST pycharm-community-2018.3.1.tar.gz 310702122 BLAKE2B c54153b9529bf03a09d92eb8b139da45bfb047cb1fdeacc9b64f17982edd237ed0633c391c15326ecaed7d9e599b3f87c0a16a2eb1302ceb37dfc1e0329693d0 SHA512 8d1f418bd97d8249481ad63fa699c141e498820698485b74c6f08674e4b0eee6054e9ad1e59260342fd615a5030ed932d1177ed8173ab9cf6026561c10fee9d8
 DIST pycharm-community-2018.3.2.tar.gz 310664794 BLAKE2B 2dd7e59514909da3e319b1d8eb8b3e24e8dc7d67868ffea621b1c3273b6daa32459f09fb2d2e5b94d8044d9c2a0ea55d5940551bfd945e3ed8dabc200bcc2927 SHA512 613c1556dcf86f448cb496cf492ee76636dfef22cc4eb55f57ca1ed91a53f8a78da6455cc6f49becaa6250e136d786c92014e23a4333fbf0a6477a2f1e67a21c
+DIST pycharm-community-2018.3.3.tar.gz 310740450 BLAKE2B 53552c228c81b17833d02a18f21838e768fdce3de8595a32fa832938208520306c1858d1e3ca509671e0412f2ec3b70acdf802a8af38816d91970f0c08b93147 SHA512 f1e774633718361fa623cb9810cd23be5da98f1bdc6cdfb01ef0980aa1163e0dea1e6c4ebbd1496ff903d81fec744f022a7c7854e29302c19d503541565dd1a0
 DIST pycharm-community-2018.3.tar.gz 310642963 BLAKE2B b32f3c9a3c28bc1ee4658c1ef60cbbe2c4775b310512b3a7fd1b28839bf1c69a566198808b128d18cbbe2d987f61d80bcbcc590177b25d8e9c8fce5fb1754d49 SHA512 00121b4ee9daae92d5c389913f4dd9efcd634f9888b21f6bcae10a3a67cc4bc36a5012590e6836224168053521edf5ba848080f4fc1060df04dc4c58cfdd9fff
 EBUILD pycharm-community-2018.2.4.ebuild 1060 BLAKE2B 4f7fcf4d1ee8cffadac3b12f443783e65409292b46da396d9e7ed5de664c4e6af8275c9091e8c141b42e19d761ebac97adb7ae0fe3a76985164e4625bc67ece0 SHA512 b93caf199b4ba30b5cf1c3dd090acb8239dc75e4a9e449a1a7558ec503bbd31b573872dcf84e37ff54650f43f0e93c09939ddd29141e92857414a2760c804868
 EBUILD pycharm-community-2018.3.1.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 EBUILD pycharm-community-2018.3.2.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
+EBUILD pycharm-community-2018.3.3.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
 EBUILD pycharm-community-2018.3.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild
new file mode 100644
index 000000000000..476b12dea206
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index b46dcdb33345..d62509e93982 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,9 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-professional-2018.2.4.tar.gz 343705704 BLAKE2B 69cb8a57f8daf8d986c201e549bfb68b048a2f78e819aeee000bab836c5a25b50d0d6aa9870f6ff8b35907ba9bd69fef7071d421c74970f68496e4448495d43d SHA512 3bc35cfeb1f1d4b95bbc490bfdb724ab76757a5f819c7acc2cbe85688493a9d8dc57cfa179a424fc24679f2093f55d5417a6859001093d58518a8b330d60f7f4
 DIST pycharm-professional-2018.3.1.tar.gz 397871775 BLAKE2B e9f950125c5c1f355e48e16a8c047751a88c6ee6e4862c6dbb8df12aa3e0e57a3d0d61c2cccb5995f2763e0d99eaaa967c19c884c40a350a7148dae71a66be0c SHA512 9324315f865bce9b379ab9f698eb6e97917aa3cb4ef90612b22d33516c18cfbed9fb806dd9bd4884ead6e7a72e2b481e5636956630ac7da75234ff8ba4975878
 DIST pycharm-professional-2018.3.2.tar.gz 398099987 BLAKE2B 68ec7f409335b5f9f35f623fd962c2f975c6e1fa844b8f142ab3d4604e1e0a1f10c361d95281a414b1e15e60f6dfc0d1b061c1512533d5ce171f0ee34872f538 SHA512 69dd521a44a971f6a5620d879234a7f788ec44a94fd2793df41b8765c5e239ff1d04364172b53750cdc248a945f2f6df02e1b5687c61156286797441ba7fc9e7
+DIST pycharm-professional-2018.3.3.tar.gz 398193313 BLAKE2B 14445d3c3cbd7be865569971d37943caff56a14198c9e81708d692110e4abafdaf10700c842f72f54fe252b2e211b46aa4336f583ae548e0d65ee3ceed4ce95f SHA512 ba8807491a78c0da2e772724c15c9aab6e48383f5407adb98a34d5196e2a1015f52f3eef9fb20c0da9115e3d283ed115663a732fc930cbc2bfc8f63d4ce0af5a
 DIST pycharm-professional-2018.3.tar.gz 397608153 BLAKE2B 7130533fb3721d1f573105dec2289091cab23b6438acadda0c62f945e7a9b2a0a55b4d55260e1f472ec77d1fd8dbc9ac9e7f7220ef26424ffbe918874049071e SHA512 0e83fa9117d46a503a3afd790fe2512cf04abc327ff7efdf46e40a24bcd028d6d2033ce56cdb1c4cfd1a8552d7d31af6e97a203c6273a5fd1b79263575fd2ee7
 EBUILD pycharm-professional-2018.2.4.ebuild 1203 BLAKE2B b87a534b51b301a4bce7b3e954daf3637f83708029dd94e2383349e5af411d61fbf6ecbe894b2711a1198e957f7ea8ee4f5fdbd8d61b0ed8df999eb74db7ed3a SHA512 fa3a1e8dc8b969f3b84365200fc6176c6813fa825c692ca6b28743e8b4b653e6efc456013de78463f026099060c74a576d44fe71fff9c6aa57e17410d9577f82
 EBUILD pycharm-professional-2018.3.1.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 EBUILD pycharm-professional-2018.3.2.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
+EBUILD pycharm-professional-2018.3.3.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
 EBUILD pycharm-professional-2018.3.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild
new file mode 100644
index 000000000000..4b028da13f8f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index b463f6d44946..2995eb94044f 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -2,9 +2,11 @@ DIST radare2-3.0.1.tar.gz 6638512 BLAKE2B 1051e2d948bf312a5d54d03fa20a2fa6954f0e
 DIST radare2-3.1.0.tar.gz 6652526 BLAKE2B 8da52e93263b47261cadc28e0de637b177943ce978ff342e305c7c924c062458d4eee18d05a21c9ca5153b7ede13332c87e9cd2f22c6880d47fd8e05db21036e SHA512 ee31de49ff83ca1ed093eaf113201cb3709adcb3315671d88413aa4d5c80c37cf9e981c33b4f472b9aa5f67309cdaf9577c2085a8c58e4faf86b37d1ee19866d
 DIST radare2-3.1.2-r1.tar.gz 6664607 BLAKE2B a04bc70eee438e00b59ec0e699b9a4d56091c9698d0abb965a65c20bd28ee604f154f50d8e18d9233594aaf77c72708e864b7dbaaefc7ed7c300f46ef5e02311 SHA512 365d45b3b82551e4e146c5872d0d502f0daca70286682053f8fb4f61a6771d91fd1b1eda34b113125dcfb06e957496f07184a74c532b7872f37fbb305dda52ad
 DIST radare2-3.1.3.tar.gz 6662694 BLAKE2B bb4cec7fd05e4d43473ef2e67e8284c4b6a856ca1ef312153fbb236b800ed3e369ac9833d87e00e2aa5a560c7d8f7f9433d4b8aa9a3f01e7fabe3c26c3f3d60e SHA512 75b4966e8d64ffd341c50b22d12653e4ead23352d25a7a1f923ee6cb177bd0a9a16e7c02cbd5b58cf3da03f415168606cd67ed19f594dca75c66114e9c35903f
+DIST radare2-3.2.0.tar.gz 6690470 BLAKE2B edfa7d03d72ab3b7ebda6a2c860165c0c53836f4141674581c0f5f5cc1d6dc7a4ea48530d4825342268e057aeca458a0883f6fd70fb4a2d5d052634f32555442 SHA512 9773068568cf71797b0c86837188604130ef9d63e7b7fd115820d8979dde37d259aaea45002c9984e8c3599e9bade53720d3bb1b3635bdad5a2dc73aff54f048
 EBUILD radare2-3.0.1.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
 EBUILD radare2-3.1.0.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
 EBUILD radare2-3.1.2-r1.ebuild 1156 BLAKE2B ff6f7b0bf53f2960cd2b98e8721cf6f25650e740c5bc4e621e3d7dcc44a25da12cac1492ae22c18857b21c7b66a66c913043760f55ff948d6847d215fa91b65c SHA512 a3451ffe1c3c5dd75dcca3f25ea54b4eaf29f0f2889b40fd5b943b63b9bf1f3f84d1a420d420b6e5b987a48e04c95d5bd47e603a16491f28af0aa36c7980d00d
 EBUILD radare2-3.1.3.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
-EBUILD radare2-9999.ebuild 1192 BLAKE2B d6dc77b0fb62846880aa347fc742a8962cd9cfb93596a82bd49c912525d4f5dd4a3a0a9478de900b0c0fa0c2a547796c69b20e9ba1d77577373e4dddf4d8d0ea SHA512 b7af1fb1648b78d52e0d16b99ebba8b70ceef1372ef389e082cf8e4c275e0afc1342f80843e8cc163d3188587cddc4ffd7661769d8c37be1ba50255e62283e75
-MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
+EBUILD radare2-3.2.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index dc1faaf6b746..45f16b33e569 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/metadata.xml
@@ -9,7 +9,4 @@
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<use>
-		<flag name='system-capstone'>Use <pkg>dev-libs/capstone</pkg> instead of bundled copy.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/radare2/radare2-3.2.0.ebuild b/dev-util/radare2/radare2-3.2.0.ebuild
new file mode 100644
index 000000000000..0b3f4cfb432b
--- /dev/null
+++ b/dev-util/radare2/radare2-3.2.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index e2ecbd2ce570..0b3f4cfb432b 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.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=7
 
-inherit eutils bash-completion-r1
+inherit bash-completion-r1 eutils
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
@@ -13,27 +13,28 @@ if [[ ${PV} == *9999 ]]; then
 	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 ~x86 ~arm ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ssl libressl +system-capstone"
+IUSE="ssl libressl"
 
 RDEPEND="
+	dev-libs/capstone:0=
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	system-capstone? ( dev-libs/capstone:0= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
 }
 
 src_install() {
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index f626f4880a04..904e7e69c274 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -12,5 +12,5 @@ EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
 EBUILD re2c-1.0.3.ebuild 766 BLAKE2B 17750d3d69f2272944e09c049520998ec7fe92ec92bb793beb18514f880fd01652d88846ccb8637dca995bacbc70c01ae8862b4dac56a25b3730fb0368f6974d SHA512 c565b69bbe3302a6f9f30dbc68caba388ddbcfa4f131c5accb3fc2bbef3489b623dcbab741e449486e39974510c2e52381c4cb569fcd77efc1fe3d4f5a0e24d4
 EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
-EBUILD re2c-1.1.1.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
+EBUILD re2c-1.1.1.ebuild 778 BLAKE2B 37b6b62902098c402bb2e2f6df3624a89f4254c09d8597d68d583a22d284720a84fb1cae52783509713bfa41d69e0aaf45d4ab8127b175a1acd0ac4a4a37009b SHA512 b7aca0793473f8e35208dd79e689292048ea54e24e0c4da4b5170c6fb6c6ca87cdb0a4fd7537e58a4566b4353da615681cd9bb6ad3960b38970517a922c6a7c9
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
index bd4ecbe5865e..55d446ebb198 100644
--- a/dev-util/re2c/re2c-1.1.1.ebuild
+++ b/dev-util/re2c/re2c-1.1.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 2f597c9082bb..4f7f6694d757 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,6 +1,6 @@
-DIST redo-0.21.tar.gz 87347 BLAKE2B 1d97f6b4f862e61f9074d0dd57293b3ab61a4f3f26781b242450bd1e194b941a8a169767739ddfffd0a8d721a95229637e8c6d9083d2c67d664b19551db0bc6d SHA512 8fe9ba0a5b0b4bf9073456a4b4fa7bebcb51ceb4fb06a16dd671fc48ba480f2ee4ba1eae48cebc3c15687de43833324eb6f98642843be71ab7aa2fe471ab7958
 DIST redo-0.31.tar.gz 105335 BLAKE2B 76171a4e7112c7478fcfe8d6f19ffb27660fa8566be3c2dded0026a993224731cdeb43c5cd7226b5537f69dc9de982e0dc9a95ade49809c93c81474879de8590 SHA512 c049a2eac7385813fe7ee8fb15f7b7de1fe1572071de91c8ebaca868d7b4ceec73d6433f1ba37b129ce7eda577c5823a5483ba69bf457cc3295d7fb9c23f42b2
-EBUILD redo-0.21.ebuild 770 BLAKE2B 0c7aa63ec92daee1ba01a118230a93a3f0a15f17521c04e1797856a0ab3cb5f937b36b069640fe02766d691a3de1e99368053a9628ba9e1ccad16a47d17b1d19 SHA512 7a6f55caf81a0fda662b32092c93aa3ffe827f4c517e672239130def5873ddd3dff6a3e346b607cb89a846541f38e240ce44d812f27b0deb99a73c952e2155d7
+DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
 EBUILD redo-0.31.ebuild 918 BLAKE2B ab6e9c3c0e9bb68bb23cd6171fdbb9f34787e7f648529c9f96ba8753cea215999620707a34236a80bc9c78de2bb61aa17a28991a28267e621aec84c5508fae99 SHA512 c7c652dabd307403f8748639dd4b6542b784c258964a9247c3e7a7b20ef91913ce32ed275c4981f385861182e0511edf7e7d54ae467407716bb1cd0091605055
-EBUILD redo-99999.ebuild 870 BLAKE2B 1976d982532c6d9581a4ed881bdbf0e2ac6c11131dfc5d2ceaca40208d3083b85720c9ff10880d132d4392be4131d8f525ce8e33a37148952f4f1bf83d1ea524 SHA512 5c15ae10196eb447bb8ef142367111d2fde7c783a1f0d02bc66f4e5d5101e475c4ddd7121104d6e18de588bcf2b3192318624ed664a28a1aad182e7f8286efb7
+EBUILD redo-0.41.ebuild 923 BLAKE2B f6e13631931a38c159cf0e8341a422dd865878a5ac2abd4be9363ea1e3940972bd88d1fd26f12fbe4089e1a9b0c4cc0a57fcc50523a327ee1bdf3c1841d392ea SHA512 0b2fc82c7831774fa11ff3cf5f4425baf7e0fd3a711ac6d058901a9f1c7db0e71084c03308893d3fe01a1706461bba3dd3739b159bf40267c3a107ff8e0eb38f
+EBUILD redo-99999.ebuild 875 BLAKE2B 943e09e0eb1c5f18c4a961c081fe1ec8d4de8e1ec49fc91500707c107bf60688cf92dd5e6dec3a0cc40df376be4ba75e7389d7b3ecd1ee4ce213f6de5f749924 SHA512 5bac30d82f121c5853627ac72d1d8d3733793c086efbcee50f11c5285412bad40684646426969a46429b3833c600df51f4408124f8059c1a2accf40505683869
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.21.ebuild b/dev-util/redo/redo-0.41.ebuild
index 4c828aa449f5..8cafff06ad92 100644
--- a/dev-util/redo/redo-0.21.ebuild
+++ b/dev-util/redo/redo-0.41.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
-inherit multilib python-single-r1
+inherit multilib multiprocessing python-single-r1
 
 DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
 HOMEPAGE="https://github.com/apenwarr/redo"
@@ -19,12 +19,20 @@ BDEPEND="
 "
 S=${WORKDIR}/${PN}-${P}
 
+src_compile() {
+	./do -j$(makeopts_jobs) build || die
+}
+
+src_test() {
+	./do -j$(makeopts_jobs) test || die
+}
+
 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="${D}/usr/share/doc/${PF}" \
-		LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-		install
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	./do -j$(makeopts_jobs) \
+		install || die
 
 	python_fix_shebang "${D}"
 
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 574d038e33d3..c136bb836dfe 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,18 +19,18 @@ BDEPEND="
 "
 
 src_compile() {
-	./redo -j$(makeopts_jobs) || die
+	./do -j$(makeopts_jobs) build || die
 }
 
 src_test() {
-	./redo -j$(makeopts_jobs) test || die
+	./do -j$(makeopts_jobs) test || die
 }
 
 src_install() {
 	DESTDIR="${D}" \
 	DOCDIR="${D}/usr/share/doc/${PF}" \
 	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-	./redo -j$(makeopts_jobs) \
+	./do -j$(makeopts_jobs) \
 		install || die
 
 	python_fix_shebang "${D}"
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 0fd2ed79aa42..e3683d27cbaf 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,4 +1,5 @@
 AUX rr-4.5.0-sysmacros.patch 788 BLAKE2B 0df763a64593b6f37b324f48864d88c105d050b5192e3e1baca36b8b6aa8e35254191ffa783aa8a2b3ee504f85baebf50fdd5e8534a443a6363d73a82108f9e5 SHA512 57c802d02ba6d8e9295300fcc0156670a3fc9b35dbd05d594eff95481eaa746d7715d9b493190c94833cb331e45cda71f5574b0fa5aed06991b1d80fd4f9bae6
+AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95
 DIST mozilla-rr-4.5.0.tar.gz 683371 BLAKE2B 1654de3811be4eac40ed751b910aed0ddca2100147e47e2e068f625c607964f98d33033c38cdf3a2146284bc477b08299e3432389342e7b058e331f0b924686f SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6
 DIST mozilla-rr-5.0.0.tar.gz 1143119 BLAKE2B b08f8ade8856b03fa94057a8c850000cfacc0722090ac3f7d1c147a3c4e7c2bbfe58a740711495e88476d90eb02c6e9a5b85078dcb4fcf3ed107ad281dd3dcf8 SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2
 DIST mozilla-rr-5.1.0.tar.gz 1158274 BLAKE2B f150e9d05b0a6a32c818f968879d0a394beb6524469cad905a21024e0d79e229f261c766f17aecbacdb81cf8e7408e62d1fdf8677569de8ed4d882b91f93b83d SHA512 8cb7da20ddb2bfbeaf57d9bca76a3b5495d4bd74a00092c40c948570a2cda3dca6cb1e73ed65af099fe405a4d29ff1a852496baf0fcb6119258443649a65766a
@@ -6,5 +7,5 @@ DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a
 EBUILD rr-4.5.0.ebuild 1074 BLAKE2B a48f08be7e4e8e825dae4084a839dc7a2c3709a19bdf01de77452e450352e5702a157a150ace3f68cd70b1d0540f735839a1aa0e15b32ba99051ffa49dcfd5ac SHA512 23234a47fe276a584c72279300beeaeb8c407b4185482cd73500113c08411b76fc267e0c703c93c8704e16a94f58496167d3f076e7377909de94e43846b82084
 EBUILD rr-5.0.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
 EBUILD rr-5.1.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
-EBUILD rr-5.2.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
+EBUILD rr-5.2.0.ebuild 1090 BLAKE2B 5ba79ce017668a7fc79d40dffe54f3e9b8f34fd2689bfaebfdfb937d792d03df1ff3d8eae706f4fb8c587de101f9e751a237743a436e5a34452a317dffbe2165 SHA512 f539d0afcd1fede8a38eb496015cf2c53131b2640e4c6f77a84ee53bb443a86bc76c73ea3b02f92f968ce2cd77c1458fb4a1380f3f94122c930162b14675b90b
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
new file mode 100644
index 000000000000..0015f0b150c0
--- /dev/null
+++ b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
@@ -0,0 +1,65 @@
+From 53c5bd72bae089616a3ca626b8af240481d70e6f Mon Sep 17 00:00:00 2001
+From: Robert O'Callahan <robert@ocallahan.org>
+Date: Fri, 10 Aug 2018 15:17:55 +1200
+Subject: [PATCH] Remove ucontext_t/rt_sigframe from kernel-abi
+
+These were added in 18bb097736a1b728f1e5bfec972ca10f6e763d82 to help us determine
+the sigmask effect of rt_sigreturn syscalls, but they're no longer needed
+because we query the new mask via /proc instead.
+
+Resolves #2237
+---
+ src/kernel_abi.h | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+diff --git a/src/kernel_abi.h b/src/kernel_abi.h
+index e73e49933..29d3c9242 100644
+--- a/src/kernel_abi.h
++++ b/src/kernel_abi.h
+@@ -1609,23 +1609,6 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
+   };
+   RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext);
+ 
+-  struct ucontext_t {
+-    uint32_t uc_flags;
+-    uint32_t uc_link;
+-    stack_t uc_stack;
+-    sigcontext uc_mcontext;
+-    kernel_sigset_t uc_sigmask;
+-  };
+-
+-  struct rt_sigframe {
+-    uint32_t pretcode;
+-    int sig;
+-    uint32_t pinfo;
+-    uint32_t puc;
+-    siginfo_t info;
+-    struct ucontext_t uc;
+-  };
+-
+   struct _fpstate_32 {
+     uint32_t cw, sw, tag, ipoff, cssel, dataoff, datasel;
+     uint16_t _st[40];
+@@ -1806,22 +1789,6 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> {
+   RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::user_fpregs_struct,
+                       user_fpregs_struct);
+ 
+-  struct ucontext_t {
+-    uint64_t ucflags;
+-    ptr<struct ucontext_t> uc_link;
+-    stack_t uc_stack;
+-    struct sigcontext uc_mcontext;
+-    sigset_t uc_sigmask;
+-    user_fpregs_struct uc_fpregs;
+-  };
+-  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::ucontext_t, ucontext_t);
+-
+-  struct rt_sigframe {
+-    ptr<char> pretcode;
+-    struct ucontext_t uc;
+-    siginfo_t info;
+-  };
+-
+   struct user {
+     struct user_regs_struct regs;
+     int u_fpvalid;
diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild
index 330b1821df13..8a48df5899c7 100644
--- a/dev-util/rr/rr-5.2.0.ebuild
+++ b/dev-util/rr/rr-5.2.0.ebuild
@@ -31,9 +31,9 @@ DEPEND+="
 		sys-devel/gdb[xml]
 	)"
 
-#PATCHES=(
-#	"${FILESDIR}"/${P}-sysmacros.patch
-#)
+PATCHES=(
+	"${FILESDIR}"/${P}-ucontext_t.patch
+)
 
 pkg_setup() {
 	if use kernel_linux; then
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 5dabcb145f01..b0ffd5ef21e3 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -2,7 +2,7 @@ DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a
 DIST strace-4.25.tar.xz 1425268 BLAKE2B 896685589686864316940b8493e481f5e37d1c2f536551f79193bc851d66614816abbc989dbff2b18e38f5bff535315ca732221d520f282227b74a4eab3ebb4f SHA512 1465ef5ebc77cee73ebae5e12c72ff1826f48cdb2b36bdd5116380fac3add73f3ede3ca2694358bfb0c3e3141be5b747b353749130a366c81d05709b2d7bb879
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
 EBUILD strace-4.23-r1.ebuild 2250 BLAKE2B 646df74a9667e4855d3e116c96710dc5f5dbe4e183be4a7517707d1644d8bbd9f6cbb7414abd1296f7949bbb96eff265b07df8fa7184902362194b8d15e08c29 SHA512 6491184f507bfb9b39e17a30bfcba0f1677d0d9a9aebade5f70b58b94551e46bcd00ea4eeec0e90a473c0ae3dd5547c891ef4b7ea2f178900e8d701dce356765
-EBUILD strace-4.25.ebuild 2297 BLAKE2B ed94fba799f9c5b87db09d7f4f9265e9fcdd290e63d6388e8b4e6ff087f30ac303cc3e0166235519f08288fc9344bc472c867b98254d9b98d757fea5543fa577 SHA512 93044ab85cb494ded02eb3670e295943cd77b8ab185c42eaaf20078a323e844ca7d52ec521475b1ec56d1cd296d8dbf1e4a3da89e4a417d707d619b1dca95fe7
+EBUILD strace-4.25.ebuild 2294 BLAKE2B 635320e7e10bbbc5e01976655df861456a313321d5581894faab9c8b4c8585d81ca242aa2691882c84aeb69b6e7d8957cc917cfd69d760d31d537cd2d0714dc4 SHA512 570c4c507643c76dda22545bbf6b863a4aef988d91b7bb2e1c0f64151bdcabac4e343c95becd415f4c7110949892a20f3e60925b456138f6c84d6f2c2b850a87
 EBUILD strace-4.26.ebuild 2301 BLAKE2B e082ebd9683bda40d46e8438ca7d6d3dd533ca5db8882e3e301b2073795bd1067037cf052e434ca002d7f80d0c7c174a67fbd30bf2e9763e3ba2eb88bad68bb5 SHA512 14afc5fc20b55812801485d2cfedc9c49c9b5a8e3855ef08b1bbd7b799f05dd2b35d6714ec9d2af4d5ffbe740bc7f359add9df4d66af2f745809f4ed06a2f2fa
 EBUILD strace-9999.ebuild 2272 BLAKE2B e1f86bbddaacfe0d7c531dd871cd9f0f365d3f02dfce6dee388a4f89b0a5de0963695358ce3716b8c1bba366cd7fa5bff9261524d53975d540be2ad85244139e SHA512 372028d8e3ec29deabee8834187c3730d5fd671caad95246ea09d96030295dd21a4d1085acd6488e8219f0b44a2ef140e46390052eca150031883b233e9f559d
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.25.ebuild b/dev-util/strace/strace-4.25.ebuild
index 34102322dc36..dac4087dd3e3 100644
--- a/dev-util/strace/strace-4.25.ebuild
+++ b/dev-util/strace/strace-4.25.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
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 16c9634c7e2f..e595d28d603e 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,9 +1,8 @@
 AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd
 DIST systemtap-2.4.tar.gz 2664988 BLAKE2B 194ad2489482eb926188fde700f43a35301214cf062ebd4d101776f09a23cbaf502f592ce0eecb297d1ffe9bf0ecf103c29b55a8a1afa84b56b9b5a0a4dd0cfd SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c
-DIST systemtap-2.9.tar.gz 3258026 BLAKE2B 92f4fcafcc3f4d517a631950593fc53e31ca25b0d956560e77e216d5522706cea58cb0d788cc3a579b7cc290eab4c1e8dbc295393e3b6444e99ce7235802f1f7 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
+DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
-EBUILD systemtap-2.9.ebuild 2012 BLAKE2B 851defa24b90f2dcd2dd75317197b2d90933e1170d10fb51354091c204bdfaaab629fc889af8c79f9559e1eeba3f3f8432722e8d7adbe39bd814beed5a6cdf66 SHA512 dee651564fb1894dde6b900532a7d3c6c554161ebf573bd38dea24f9f54aba78b5cf2150c782105da59394bb5cb2b8d1daca8ba2f1698f0a3a7e82c917773a32
-EBUILD systemtap-3.1-r1.ebuild 2132 BLAKE2B 6e8a22cafbd49eb0f74aaccbc7b42d7aa675c1316f6560dfa93c14afc0914f0632597d97dab7fd3dd9a3bfeff7dec393e3082f4e62b5b620a898ee386886d34f SHA512 8b4a879a5e8653b231f0b2988b958b710734b3155bf20e0e1d2b6985ba04ae891ea83a7839fced9c0f0d92a5edde7f3c80fd91617c1e7755a48312b70ec50a30
-EBUILD systemtap-3.1.ebuild 2008 BLAKE2B 70a2c35653fe2e580de58e4d662f8124271444dfae7359eaa1d21430f66c2bb4d5398c989decfb4cbb76f8e1857a1dcaa3dc16f2d8a60cc8d14c05118fcd6dc4 SHA512 3becae4fb0226da05ae87e60151550c4b50d93948d0f699b6aff8d2680152e1c58aae944d5c7bb75f410f54bfe6d37dec3630e7824c2747da4d1c13b1b9fa2e3
+EBUILD systemtap-3.1-r1.ebuild 2203 BLAKE2B e2683da59a09e3de875911e9e034eadd33b1727e417017a0db2021ba04be93a191051d59be33258a849cd207274c6fa8faaa36350e3682e326e0e0bc4a503880 SHA512 18a941078d6de47680554ea2fcb46f65115d6e0e7c63ae6c261dbaff7b2910be6759b20b5a8bec2a8597cb99784491eb2f33cba62fb593b4e5da672c504ecaae
+EBUILD systemtap-4.0-r1.ebuild 2619 BLAKE2B 28e403f04559a78448dfe5425efcc4044481667f235f757f799393f2285f2844cf4455f796782207fe9c0e93c479e9a9ee50dcb480a9f03c0e66144e19cf6aeb SHA512 4a6be657da1672400a6d7e55ce96e8a0f4c56616898dd780dbb0f19bf56f1f6249574f6ba94d489d5dcc03b5ae61248a8c7d3e0a155ccd05eaf29be31bf8cdba
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
deleted file mode 100644
index 56e38eebf0f2..000000000000
--- a/dev-util/systemtap/systemtap-2.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index be6ed6219e46..66b6c5bb8752 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-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
@@ -17,7 +17,11 @@ KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
+	dev-libs/json-c:=
+	dev-libs/nspr
+	dev-libs/nss
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	${PYTHON_DEPS}
 	libvirt? ( >=app-emulation/libvirt-1.0.2 )
 	sqlite? ( dev-db/sqlite:3 )"
diff --git a/dev-util/systemtap/systemtap-3.1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index c783078d0bb5..f3f7f9379109 100644
--- a/dev-util/systemtap/systemtap-3.1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -1,11 +1,11 @@
-# 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
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
-inherit linux-info autotools eutils python-single-r1
+inherit linux-info autotools python-single-r1 user
 
 DESCRIPTION="A linux trace/probe tool"
 HOMEPAGE="https://www.sourceware.org/systemtap/"
@@ -14,14 +14,27 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="sqlite"
+IUSE="avahi libvirt selinux sqlite +ssl"
 
 RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
+	dev-libs/json-c:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
+	avahi? ( net-dns/avahi )
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
+	app-text/xmlto
+	>=sys-devel/gettext-0.18.2
+	libvirt? ( dev-libs/libxml2 )
+"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -32,7 +45,15 @@ ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) -
 
 DOCS="AUTHORS HACKING NEWS README"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-ia64.patch
+)
+
 pkg_setup() {
+	enewgroup stapusr 156
+	enewgroup stapsys 157
+	enewgroup stapdev 158
+
 	linux-info_pkg_setup
 	python-single-r1_pkg_setup
 }
@@ -44,8 +65,9 @@ src_prepare() {
 		-e 's:-Werror::g' \
 		configure.ac \
 		Makefile.am \
-		staprun/Makefile.am \
+		stapbpf/Makefile.am \
 		stapdyn/Makefile.am \
+		staprun/Makefile.am \
 		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
 		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
 		testsuite/systemtap.base/stmt_rel_user.exp \
@@ -61,12 +83,23 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
+	local myeconfargs=(
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
 		$(use_enable sqlite)
+		$(use_with avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+	PYTHON3="${PYTHON}" \
+	econf "${myeconfargs[@]}"
 }
diff --git a/dev-util/vmtouch/Manifest b/dev-util/vmtouch/Manifest
index 07fe67533aa4..a57e4bc9d742 100644
--- a/dev-util/vmtouch/Manifest
+++ b/dev-util/vmtouch/Manifest
@@ -3,5 +3,5 @@ DIST vmtouch-1.2.0.tar.gz 15993 BLAKE2B 0a8db0e1515a080b7990e38dfafb3f9e26d95b9c
 DIST vmtouch-1.3.0.tar.gz 18733 BLAKE2B 558561302f2fc4fd9ba940d766f999bbed0f471ca15b174900457aead0a5c61ff7ea40a0b71e2e471e1613af38d657367282cde21525aa0841cd595824c89d85 SHA512 ddb86b764dffea6c43a2dc5c48dc91fa862c104a2e5ee7beefb45815b60aba14d255936082593cec97534f7231d65f91f23b0cab3f985695af365c34341a8a19
 EBUILD vmtouch-1.0.2.ebuild 670 BLAKE2B 4d29eb8f74907ad1222f0342559e5b913fcba7690a6a4136dd32cd144b980bbb2382b4999bb076e01731b171df443609a76452ce3a1a46930dd898ab00d50ac1 SHA512 c4b9d5ebdb65432371fc60faa53c1aba4d9332e1363f1ff1e4fc2246270f06c6e76eefabc22ada07261474fc97c55881e276e21695d80620ff51a379ac03ef3f
 EBUILD vmtouch-1.2.0.ebuild 645 BLAKE2B 0e79d7df0057a54808cfc1f57b00ae0d24f4ffe20e5cd71b5a319b3489b19c52968eeb5dbd7ccedba282b6aea80f31083d47fdb2d9cf4a436ffa99b580d6b721 SHA512 146258289c2179a40b409195899b67a9613b63154193b33a4405a8a3b4f98912cceaa7d9db034169fb60aa11cb5c9a1d4ae020cc1657b3ee966f94fa63619d4f
-EBUILD vmtouch-1.3.0.ebuild 645 BLAKE2B 0e79d7df0057a54808cfc1f57b00ae0d24f4ffe20e5cd71b5a319b3489b19c52968eeb5dbd7ccedba282b6aea80f31083d47fdb2d9cf4a436ffa99b580d6b721 SHA512 146258289c2179a40b409195899b67a9613b63154193b33a4405a8a3b4f98912cceaa7d9db034169fb60aa11cb5c9a1d4ae020cc1657b3ee966f94fa63619d4f
+EBUILD vmtouch-1.3.0.ebuild 649 BLAKE2B 2ddeb42784d5e0809b2628e90623a8c3ce9473ab95cf8e4e766c2b5e85c6a8005b25c94d63f7de3a247f7445478926c3413f39589214791f143bdb6aab233e4e SHA512 264357a3750c59ec8ff4558107702d38d9a2f2a7a1afd16441631446b6be0d17b61f4b445ce884580e82d50b33b5b9a24bef0aa598bd8f641d08dc6c3a8b6af7
 MISC metadata.xml 554 BLAKE2B 461453a6c800b43ef294f3e1f9abf012aca9f09f29431184228ebadfa67fba74b6de87402499260b4f5dfe944e93f431be70547aa96a556fb1cdc242f645155e SHA512 b2ea2c6e314fa0f849ae17461352372b583a5b1f52ce64ea07fda64d21147b649854f54b43788396bf35b91f625389337912f31b80f8428d94fcc44d20896b18
diff --git a/dev-util/vmtouch/vmtouch-1.3.0.ebuild b/dev-util/vmtouch/vmtouch-1.3.0.ebuild
index e043a354abd7..0ac4532e6bd7 100644
--- a/dev-util/vmtouch/vmtouch-1.3.0.ebuild
+++ b/dev-util/vmtouch/vmtouch-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hoytech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 43e4b8e1fb1b..fd7603af9a12 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,3 @@
-AUX vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch 1337 BLAKE2B e649394daae60a399b2659f666ecb42aa2e6aa65b9eda372d052c6d27915a7e51b0d81d7bf1916dbab442a7ba7cd585a5fd828600cd466039f9c4a7df30d7dd8 SHA512 89c869de7a3ec1c9fe98095e67879c15f5d45337393f680812d8e55d26a970e04baa584b1dc18a5ff9b50f2d9780a7f76607f153d20cf1d5c4085035731a33e7
 DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
 DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
 EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
diff --git a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch b/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
deleted file mode 100644
index 9cf443a22444..000000000000
--- a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 396f82798a4d19b57fc9933490dc1bd7624c9bbb Mon Sep 17 00:00:00 2001
-From: Lenny Komow <lenny@lunarg.com>
-Date: Mon, 25 Jun 2018 13:59:47 -0600
-Subject: [PATCH] headers: Remove loader/layer dependency
-
-The header vk_layer.h included vk_layer_dispatch_table.h, which is not
-present in this repo. Instead, it had to be generated from either the
-Vulkan-Loader or Vulkan-ValidationLayers repo. This change removes
-that dependency.
----
- include/vulkan/vk_layer.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
-index e8300c3..823c88a 100644
---- a/include/vulkan/vk_layer.h
-+++ b/include/vulkan/vk_layer.h
-@@ -35,9 +35,6 @@
- #define VK_LAYER_EXPORT
- #endif
- 
--// Definition for VkLayerDispatchTable and VkLayerInstanceDispatchTable now appear in externally generated header
--#include "vk_layer_dispatch_table.h"
--
- #define MAX_NUM_UNKNOWN_EXTS 250
- 
-  // Loader-Layer version negotiation API.  Versions add the following features:
-@@ -50,6 +47,9 @@
- 
- #define VK_CURRENT_CHAIN_VERSION 1
- 
-+// Typedef for use in the interfaces below
-+typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
-+
- // Version negotiation values
- typedef enum VkNegotiateLayerStructType {
-     LAYER_NEGOTIATE_UNINTIALIZED = 0,
-