gentoo resync : 06.08.2019

78 files changed, 866 insertions, 720 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c1a5aa6e4d53..2446726c7e8b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 13f5d39e0fa7..7911431e6c50 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
-EBUILD catalyst-3.0.5.ebuild 1899 BLAKE2B 4de4d9971e7420b86257f67037ede0afdfd0a531cc1c59a588f8daeca00b624436ca650cda73b1bf6732e096b8b481bd6b8ce1e5d94a73029771058ec90a42de SHA512 771e7a8960f9783a8ac9a36a00187f10871cc3b3ac413bb4162277a29a6a086b1ae1315814f122c6072d39d8be0ca7cc54dbd2abe792a0f21a35f3733bc29cbe
-EBUILD catalyst-9999.ebuild 1911 BLAKE2B 5efac1e33f57d80c79510e6a5110c631464c197d926ee8b4362f8f36b5bd2fca844c26ac3aeb939d33154eb0007bcda2238177862312ade31a5042026995fff1 SHA512 984489ead5a1707b52c7f693aa727de8a7f8f0c79c0657d5faec883b74cb36af5e9c974556785440881e10d8e7aaa2248e1e429a42353f34a3a637874c906d61
+DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
+EBUILD catalyst-3.0.5.ebuild 1895 BLAKE2B f4663a60dc96ca4073824942212dd667835590cec1c438de659e6251655411155bde2855c7fb47517366e04bd7ac50a0070578e1783b99c9602dfd84a917ac9e SHA512 771b85e3640689425a709c7cbd69bf81db2d42b49b6178592adec4107e803191eb1fb7e4fee8e25bb82728ecd95b55d2737631409298a4a410d7ac0789e146fe
+EBUILD catalyst-3.0.6.ebuild 1906 BLAKE2B 13c1e83fb4fabc66644fa5b82fc359866349a4864f1b4e3043ce344812a7d9828bc5bea5734582b34e34fff5cbe067591bd1a5cc7de9f1642701186c20091eff SHA512 79542ae9b5ffef341570dd5b0460f85692cf05c785a5dc97b26922f3139494f97e1d0b8f55ea2ed530df01b0e0d70aaeaaedf65898600da49948b4389f43d175
+EBUILD catalyst-9999.ebuild 1907 BLAKE2B 997e4453538efdf5bb87d27f5cca2b47025d211d7a3e3b1e8e8e5f66c19c12c06a9cefe55516327be248812b5a1df29026c29cbc0769f6620e06da3cea67a0eb SHA512 d90667ec0e6d1d9d4ad25dd00c8ae8a040e843af0de43cfd5edc1e23d4c8b654e6ccbf31209def8971688e47483700d8ec0d7eff08659079a2f964294ace968b
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 0ca5875c8c60..8369b04fcc0d 100644
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.5.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-3.0.6.ebuild b/dev-util/catalyst/catalyst-3.0.6.ebuild
new file mode 100644
index 000000000000..15c75f926c40
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( virtual/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 8126cc048190..25b4d5dcd3c9 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 5a2609ac1961..3308207364ee 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -12,6 +12,7 @@ DIST cbindgen-0.7.1.crate 90623 BLAKE2B 4fa7e82ee15b89a7de678eedb6ff95c3ca36376a
 DIST cbindgen-0.8.2.crate 98747 BLAKE2B b400fa5df818760a48483883eae959de04433d1ec2d5f67bdba5c065e6bebc4f21424badd8c7598ad4aca5e1205230e79528ad9d0e1e736c2dd00745abdd058c SHA512 e4e6079170ba396f753603cd58c2a8c252e216e129cea6a0c4d82b399aea78f569d80345dbe69af509aadf207790b4d00b8f2edf500b36d54d9c095a65b9e792
 DIST cbindgen-0.8.7.crate 107774 BLAKE2B 55548bfe721ba049231318712ae392f49fcef98d328ad73a9d7af41df7c209dec1d4fcfbe0c4fe5d03abb9e14db961bfee25df79113c6f585eb5e15127161eea SHA512 0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d
 DIST cbindgen-0.9.0.crate 125723 BLAKE2B d3eacaf7715dc7528d98c8356dc797d25a2617ef1561e0cfa7e63cbe378929243da25ffc78101d29fffbbf4e50c8008bac18b855d2a0af3ff9fc22a3b0dd18ab SHA512 134a748ec781dde54d7810d6f5f98a5a84784d4acdd13a4c13eb4ae67fc278ccd2b123eea56461a124e7aa17b99e0a5a20f39f06286ce259e6e3eb24c43f29ae
+DIST cbindgen-0.9.1.crate 129676 BLAKE2B 12315522938e941c4a53033f276f6065d6e19ba7cab3ce8aabb17b2ae5fe0c7231e51be33828434d6ca039d79c9414fe8d310a12b07ef1c544ed9b5d8cee74c6 SHA512 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
@@ -36,10 +37,12 @@ DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6
 DIST proc-macro2-0.4.25.crate 31557 BLAKE2B df36d9c0f4e020d289341ec9e26cc3b4c8a5a5221e936834bdc707426e02c675ca38d6cc5dfee1a42f501619bf00a7cbc2dbd140ac523d1e99f47574ece76ff2 SHA512 e6bf37c4b990a3cc1629171c812ff145db35f1d179a40c4204857766ec4a517a7cc4342decc63026c6b891e0ff321b5fa8b5242459b6f80a9358572afc2650e1
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-0.4.4.crate 28564 BLAKE2B 56935ff3b80d9c94f198a253de77fd7c8650ec75e62df100114bbeee633941570e4525a5dabfc92c370a8770be375d1ae0a83ecc09df10c4cfad2adc55ad501f SHA512 13b74a69277bd7674554414039e79dd0ae14f6e998a46e6e587cc17b6f2c97a6dbcbc459c827888510e5aff3b79d48b11f840bc21a28ff16c0eee8a51b784a86
+DIST proc-macro2-1.0.0.crate 34625 BLAKE2B c27040190bb06af8135c0fd85fc285abc3a672e629b43968573a95966ce8beb09b93dc9076e4e78da2434a2803b33c695f71ab6df07c7030432f9863d87ddfa7 SHA512 8b70b107ee0445eacae9a3f35b5c02649cbcc41550fdf109a4bf3248eab20568ad016ccde2274b406a4631605b8414d208187f5fd0090baa182df8aeb68a2727
 DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
 DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
 DIST quote-0.6.3.crate 14154 BLAKE2B 16a31875577eefec9568e3b990ed17b0afa5af6ec936f0b8d1f05303b7e1dae1737677a86089a048cf51b602c71f4b3c7802ee40fb9caadf2e13fc0e6df134a8 SHA512 f2ff3cd617c69007c4f60961728c73a7ac7a2eaeb1d6da51218d2fbc9e85c06baeaccc9b82771a304bace04024479a192b88336546f96e17c6446ba85df94a10
+DIST quote-1.0.0.crate 23089 BLAKE2B 89bd0a0857da2c261f529ffce512ac55bcddc3d6aea7ec039a009df045709a15667e9f4869daa1187e1859eb489ee32302bdea1a0ca8010267ae7e892698f7dc SHA512 64db0b1690beb4f0a81dd77ccdf8e3f61b523674802ac657f0849b7ae653d8de41f279e55eb22c5f6080fc9787845cc6470b5486b35c3a0f44f019185db542e0
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand-0.6.4.crate 116260 BLAKE2B e16bde25b7493b0f77b897efb9281e31ff17636d0ce5c9c4bce47fd5cec79e6bd889880f371591f6eed9163ef49934ef4389c95d6a673172dc0f27c09e6abf1e SHA512 2b98ba7edce4b48833ca5d8c9cda25beb9f73fd22adb997afdfb10d5c59e9240537baebc2e7de1e0094716009f7fe2b657d1f4dcb4c778e492e49483a7e3ce8b
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
@@ -74,6 +77,7 @@ DIST serde-1.0.93.crate 71702 BLAKE2B 3f6802999b67c660b602f0c05606b0853158bba16d
 DIST serde_derive-1.0.58.crate 45146 BLAKE2B 69b230d33072d7d7e9ae17f62872560a4b919436b6e33111827597c06b380e0e43d02fa4ffafa9ed8128d008bf065165e876090c4652827ffc3dc1603a5db8a8 SHA512 6eaa57861ede4b9bbc1e0bfc561917afaa133613c4279fddc17529c291f0fb1122e0443267de9498ddd4e45ca9d13e38d88aef00864b0505a05e06ca65bb8d80
 DIST serde_derive-1.0.84.crate 47924 BLAKE2B bdc22e69da0b1c725a74966b1eb31e13475a479534e830bb1440f980e9462dc9c746470ac87e3653b171717c2e241d3005dbcd562abed7fa1f7949d36fe4c3ab SHA512 817ab7d764ef1f7781f0f01627b3c2c96797f64ce62830ec7c520e94db05b6b7efa4589a394f5375ee30cb85af6bd7a17c50b51e77d4d927ccb247c87c16b2f3
 DIST serde_derive-1.0.93.crate 48827 BLAKE2B 7e6e2a3b2c91c77882658b4f194f05e120d47a3b27a964ebee093c15009d5932184b8afef68b5c5bd2d839e76ec0ab0c44e5ed7e39f99b4c2330eb2a49f4a793 SHA512 e9ba64c934eab1c2091697d36338ea6c47d0409b0097c87376fa6b05de21391aeb228e52b1c846894c37aee44550f4059c3ee9f58840d79d4ef5be4c61293f2b
+DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
 DIST serde_json-1.0.19.crate 65039 BLAKE2B 86264040f32b0c94c1d43e55248612ec56b42406cf4501fb3288b80a5ed8a110eae47a1f2b053e2b497c92457c5bfee2ed0b5f86e9dbaabb1bd3953914dd06ec SHA512 03b760d0bfd8a49499107a4b43bb9f588b375c92cb85fd131642bd787734a8523a176dc10330329a3ad8c6d575c917a813fc513a4fb5890c11ade0d48c046165
 DIST serde_json-1.0.36.crate 68203 BLAKE2B ba6088de2f87af1f1685e0d037745ece9c4534043e748321644a111d9829034a7e972882270bc1cb8a78648a848c63e103cd7fad0c4ec618621d7ad9b970350e SHA512 08828b084d0b94c282c3e17a22f8882762f8e006bf41d5fb4a2a720eb3124f7fbd3d5c87b543bd8551813a40108105ff69824a420b4f6836d2bb9fd164100b9c
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
@@ -84,6 +88,7 @@ DIST syn-0.14.1.crate 133459 BLAKE2B 303abdde61afa57594db2b8882c86237f64b15582ea
 DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST syn-0.15.38.crate 152593 BLAKE2B 970555dae87016d4440502bad9b45d7be14d390b08ac4916f0ed7a66f24c8e6f58cd7889ef2a3febc77a99671a08c6c1380f622d076341c5e4682a2a3ef3c919 SHA512 e460d6b67e3237e8e88292e2fd170ef16f6b0e30b1c7c11b8177f36c86b083ca1de2727e75f183d2708f6839138aa73865e7944a822c2d85783a79caf3fa2e6c
+DIST syn-1.0.1.crate 189474 BLAKE2B 0d2319f149c9430787e5cf2eca01a93b5b642a1e968ec3f328c3b8e79a2b11e5d16fe9da57fcee8c06d9446f3eec6d7e82705a44ee27006b6e5d4577b8aa1c72 SHA512 10ec59186b0090f4a7302ad9504ab78c0a396ce7087b7e75502f12a1c6ba02700455a7f0910f2abfb45dc0c9b59de112a170772f4da11ac8d094a701bbbe754f
 DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
 DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
 DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00
@@ -97,6 +102,7 @@ DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe5908
 DIST toml-0.5.1.crate 51029 BLAKE2B 790097610e420241ded7a4bba3e66a6f7f7856e2e3f4f738e4edd764bbb6b5b3a0cfa10c1e1a9210ef0bb55ff67be47f3bdc129063d135daaa16d731d06fafc4 SHA512 4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073
 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 unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
@@ -109,4 +115,5 @@ EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df
 EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
 EBUILD cbindgen-0.8.7.ebuild 1126 BLAKE2B e4ba38b90ac624dd8c6c3fa781e45fbcfbd625be3477861d6390ca35821ea9032cbeb5ae06ee5e629cd191480c6f5dd530b9334e731740922b0fdea3109f7164 SHA512 81391a5777d22c6ef923075845cff5999ffc2b36d2bab5d7d79e6f3f7824eaa4d6a9742915e49adf840f38d0807ccd0d60e0049f99810b47addf4996df06a1a1
 EBUILD cbindgen-0.9.0.ebuild 1107 BLAKE2B 52c4bc8a893c828aee841f3cf46e93afa9fda0b0d991055545bfe830966c1a8a3f9541eecbb372235cc1e45073317dd8e6bc80527662b94415db0055e74a9ce5 SHA512 23106fb9ee3553c701235ae596fd890d0ac2bd560a2285677fc70ed4e58fd7a2cebbb4fc3a394a681b03fd9d8f965e0ac325fd1b00a5e224e27a3f5991e69822
+EBUILD cbindgen-0.9.1.ebuild 1103 BLAKE2B 3848211848503eb66a4e030dad7972b3df673ba0d3fb7d2ce4ab210a70b524e788012fd49766162c792e7cf6075ccf867559966d8962099420fa33fb20b2c520 SHA512 948a57870f01fdd83dada957edc7eddcf2fa8fc10c3211aeaea7873cdee5a6a2b87d4fdc5eae333a7c0720e3199c64aa2bbe554c1360998fb36fbe1c2a80d3f2
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.9.1.ebuild b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
new file mode 100644
index 000000000000..0e533c409244
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.4
+bitflags-1.1.0
+cbindgen-0.9.1
+cfg-if-0.1.9
+clap-2.33.0
+cloudabi-0.0.3
+fuchsia-cprng-0.1.1
+itoa-0.4.4
+libc-0.2.58
+log-0.4.6
+numtoa-0.1.0
+proc-macro2-1.0.0
+quote-1.0.0
+rand-0.6.5
+rand_chacha-0.1.1
+rand_core-0.3.1
+rand_core-0.4.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_jitter-0.1.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.54
+redox_termios-0.1.1
+remove_dir_all-0.5.2
+ryu-0.2.8
+serde-1.0.93
+serde_derive-1.0.99
+serde_json-1.0.39
+strsim-0.8.0
+syn-1.0.1
+tempfile-3.0.8
+termion-1.5.3
+textwrap-0.11.0
+toml-0.5.1
+unicode-width-0.1.5
+unicode-xid-0.2.0
+vec_map-0.8.1
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index f06c7782a3f0..a4c5e66ea17a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -7,6 +7,6 @@ DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e368
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
 DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
 EBUILD ccache-3.7.1.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
-EBUILD ccache-3.7.2.ebuild 2144 BLAKE2B 5c8ac9b8bea16f12337003d234fc8ce0b3416f1b4e46e3ddcfbeee18aa129066256adc77b4f1d2ff344553101f2b38bdef4ee90755ddf85d7697335d35efa8b2 SHA512 9d6b49ede8ffb44d1815cb9f6eecdd51e970a40d9e745ba22a84b3ba2d352d176b85716ed0989d4de6e30af58b07a8aa2e3b44475d22a7ad218b333128d57657
+EBUILD ccache-3.7.2.ebuild 2139 BLAKE2B 240194a3f617a5ee2915220504a7c5a61c2f086c07c595bf58b0e9338870da5a4467bf871c25a6d5ee2b31b6c3ba379d656eab26272c087461caf35d32a72f41 SHA512 a000a04d0ddf031e7b6ebbd5094a2394cf7a0e09dba7d6e7fe2df1924b7c9ce61f92cfe104a58281875b8254da537e142b5da6dbe2338577878156cef97b142d
 EBUILD ccache-3.7.3.ebuild 2036 BLAKE2B d9a00991a72a8ccf1ea4f218edd246c39dd780ffa1b435e6f311d2c7f029b3bc8a000971d1c7b05d86dafdfd63e2bd9bc66dedf1e0e32a9223b123669521bb5f SHA512 50c39ce2528656d7eae8ec9089ab1d2fa3cb33c72802c441ac14caabe23234dbaa1facd7b7569b2d95f86fb83771caf614caf002a7a78b90f211fdf5c3767c71
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 9f539b9ea7b2..9b42e14bf5fa 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index e9c42b3ceaa1..a305b7e7923d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,10 +15,10 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-DIST cmake-3.15.1.tar.gz 9268592 BLAKE2B 3b0dbca9203b1029922d06df9abc3bbfa6f7b8320e43b11b468cd7e129171e2bb1b645fc07bf2d46c9b3c08642f1a11741240d0029f96ac3b2d7a8bb44d398da SHA512 6900a84c7764034331fb6f00801841a7a3e667ac39813c35ceb3db983b33a5bf6addbbc8539c39a0c0be9e10204c79d6236886a9d50ce901a56275b53619ec73
 DIST cmake-3.15.2.tar.gz 9269449 BLAKE2B 539a1dede60741f5159fef72f6a7fdd7dd4fd457fab73d33f01b042adee7b5179b2b620ece0556f1612745f911ffe6cd714efb18a4663ac67ed6a20e09feb233 SHA512 154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc
+DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
 EBUILD cmake-3.13.5.ebuild 6215 BLAKE2B cfb13f69a7987ff65183910288f70cb3b0a10532af213fc9567ddf722f9aa5042235daa2fe093610b55b6b8f0c94937e452894edb7c54a2ddbe55ae053003238 SHA512 dddf1c391c2c9787f731acbc894e907118b83fcc1cffbb943338bb56a035b9220c7b4316ffb5bd4c411f6d0ac2b2631ed940a0760b0c7a5419fd49dfc8c58427
 EBUILD cmake-3.14.6.ebuild 6242 BLAKE2B f60aecf31afb3a1d18dcc73eb49a725692bbd2429398b05f9b241d82f9842b93aeece44624a50b8406355ff82bf2484bbae55ec863987b82d1e27d04e58b1d58 SHA512 22317c7a34fb11df8eedf9251520db7a956eb44306aa5c7c2d950de1aa0b2844043a84ede7122ea38fe144fea2f52760ac097b84063b1f2f5b8885c858d29c81
-EBUILD cmake-3.15.1.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
 EBUILD cmake-3.15.2.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
+EBUILD cmake-3.15.3.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.15.1.ebuild b/dev-util/cmake/cmake-3.15.3.ebuild
index 06184a6bfe5f..06184a6bfe5f 100644
--- a/dev-util/cmake/cmake-3.15.1.ebuild
+++ b/dev-util/cmake/cmake-3.15.3.ebuild
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index e406b1cc4ab9..59897bf6feb4 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,4 @@
-DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
 DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124
-EBUILD conan-1.0.4-r1.ebuild 1612 BLAKE2B c8ad7f6357da3783488241aedfee8414d9ece36cdd2313dc4d765413eb509f995ea1229211ef755191cec69cee6d9a1c3df64f9b49bc0f9dce7d86a790e3eb4f SHA512 0d41b2e92bcead2243fdc18181202302490a5d2a53ca660036049b46fe4b770c8e961e5872227e44f2d606d61771036a7a5a93aa894b94acdcf3bb5555956722
+EBUILD conan-1.18.1-r1.ebuild 2125 BLAKE2B 75ff8ec78323e05ca876ece3ef3d8a2c8d7b63f0f5ace559bcc1aa77e9071150dbbeec4eb853bf7b5f6c844b8b5d8f7c3ce85a932d63d5dda2d9a4f1a02ab76f SHA512 f19fc00d9b34a65a0c9e9c97b3029433dbe2471eddd91f4af119f00fc47832d1c2126194027f9f8ec2ad30e5b2fe4ef9e972e959ba00ac83d3f26f8bcadeaeb7
 EBUILD conan-1.18.1.ebuild 1957 BLAKE2B 3e33f1d58e6bcccd4fc02c6ecd6a28afe33106bf532c90e85958a385dbf610b19c3bdc4f74d861ddb9f6459a4adaa57d14bf5b88ce9f844d1d57c394aa80b2d2 SHA512 2c77ea4a0223e62a9f211b99622598becaeeed8010152fa1a469939e5b74ee3b7856cbc8b9f3da1ca1fc280c898fb6da3e1e55a8bd07a15cd06df641d8f718e1
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.0.4-r1.ebuild b/dev-util/conan/conan-1.18.1-r1.ebuild
index d851c197e1bd..35a7c3ffe908 100644
--- a/dev-util/conan/conan-1.0.4-r1.ebuild
+++ b/dev-util/conan/conan-1.18.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -19,36 +19,52 @@ IUSE="test"
 
 # overly strict requirements?
 # https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
 RDEPEND="
-	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	>=dev-python/patch-1.16[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pylint-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
 	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/astroid-1.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/patch-1.16[${PYTHON_USEDEP}]
 	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pylint-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		  ${RDEPEND}
-		  dev-lang/go
-		  >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		  >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		  >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
-		  >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		  dev-util/cmake
-	  )
+		${RDEPEND}
+		dev-lang/go
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		dev-util/cmake
+	)
 "
 
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e "s:patch==1.16:patch>=1.16:g" \
+		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
+		-e "s:future==0.16.0:future>=0.16.0:g" \
+		conans/requirements.txt
+}
+
 python_test() {
 	cd "${BUILD_DIR}"/lib || die
 	PYTHONPATH=. nosetests -v . || die
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index 62ba9a16e864..31774d185361 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -1,9 +1,4 @@
-AUX conf2struct-0_pre0-cc-and-cflags.patch 894 BLAKE2B 9c710bbb0096952e4f2646b143e2750c96c42c2cfa569419b876e284d2a635d53e7e62ed4d785486b77b08755f3a8700451772af4dac9c5464014545e090ee0b SHA512 734614dab00dae640ab88402299619581e10efcab26b8f86948848e9159acff182118409e371990fdf91a908628dcb6c4e77e46283020283d43ae33a4329d756
-AUX conf2struct-0_pre0-dest-exists.patch 555 BLAKE2B e64a5abc9baabc94e236b9990196103681a4679956286cf37ff0c7250fb9973b3bfe2b099867fc90159083510ec579733aee348a348836a17b9eec7d8d9a3e99 SHA512 0b650abfa1723d736b9df22c5fbe5a0e56a6910a0ec90da96f90f8cb03331d585b35174547830579601e67a9b2d8d2410a928bb7e1e3efd453dba66dcde86251
-AUX conf2struct-0_pre0-destdir.patch 1351 BLAKE2B 5c4665b981a146d52fcc04762efac2b8ffa2367f4543607d7d7071b43fdac8c2ec727b4b0ab3f6d2f05e6bea85c2adf214dfd9040713f2ed170a7e30b8dad713 SHA512 3dfcd71ae92aed31e20f39c8d3fd591b96b938967138b267cba89e7d7ae122dd14e8fef9b5a562c0cb9f0ff141f34a343ca4b677df0410ed00840d4a60503b29
-AUX conf2struct-0_pre0-install-and-uninstall.patch 777 BLAKE2B 3d2ba3033a69c15ded7125c5351b188f00599a2b313405fed5dcf5d637daa9ad309524fa75736e5a6267cfa40169a6fb3c1b5b6ac54ce0d4af51f920a04fe08f SHA512 6b2f80bc05a384146c3382eddfe169484f251afde790cf37aa65f6d745e78aa7255f01e3af302dafb1377a9bc7e79ce094abc30d4d48e84f96f8104215e06689
-AUX conf2struct-0_pre0-install-not-run-all.patch 599 BLAKE2B 47d6ba694800d4fbd1b13ddbb09b544fda9e4f1f3b9b0d55b5fac38ead760effae165b7a35ec436a200fb2a891744818fdc139f792deb066c30c595de95d5755 SHA512 17defb200110299a4bdb7f28ad20520ec152edad306212875fcd179e4aaa644196c9b7a166dbcd8eae69a88aec8b4548b272798f078377b22427f5df68376a39
-DIST conf2struct-0_pre0.tar.gz 50851 BLAKE2B 21db6cca56ba18a48c65395fbf3def5de6190515be46ca2e7113c17c9b874cdcc7fb72b06b586c57a1803e98b56df5decd10ea1dd6dcc4144a78d6a0ff6bf9dd SHA512 e0eb1d43ec1375e65796197c16246a2cc38e0a4d078c4028e8675cc1ff6ef08c7802ec18f57232d91f2d4133573129f7a2b05a9f1d8b74bbddd072550f846b1d
-EBUILD conf2struct-0_pre0-r1.ebuild 1179 BLAKE2B db6d315e1528ec47f709bae67a85ed5c9006535f63fb0ad7d90c8524f61b85a6ea4c0e62e1a5e43afcc0d4635c9bf56b46d0675006153a9bf5512d8722570a78 SHA512 3e30072b2ad4826e398c7fed63231f116c035d3b8d872f36bdf02fceaf4016f751eddeee1e58d5138dc9da60fd63a7f1208a1a5bd67476273174f691d26c39d8
+DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81
+EBUILD conf2struct-1.0.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
 EBUILD conf2struct-9999.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
 MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7
diff --git a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild b/dev-util/conf2struct/conf2struct-1.0.ebuild
index 631e635694cf..b853d93f1b86 100644
--- a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.0.ebuild
@@ -11,20 +11,10 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm"
-	GIT_COMMIT="10ea3356b65e712fb000f4d37f00e1dc09c1e722"
-	SRC_URI="https://github.com/yrutschle/conf2struct/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-PATCHES=(
-	"${FILESDIR}/${P}-install-and-uninstall.patch"
-	"${FILESDIR}/${P}-cc-and-cflags.patch"
-	"${FILESDIR}/${P}-destdir.patch"
-	"${FILESDIR}/${P}-install-not-run-all.patch"
-	"${FILESDIR}/${P}-dest-exists.patch"
-)
-
 LICENSE="BSD-2"
 SLOT="0"
 IUSE=""
@@ -34,8 +24,7 @@ RDEPEND="dev-libs/libconfig
 DEPEND="${RDEPEND}"
 
 src_compile(){
-	# -j1 due to parallel make issue reported upstream at: https://github.com/yrutschle/conf2struct/issues/10
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install(){
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
deleted file mode 100644
index 322e8724e6c4..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8c68116a9c2e086e83075f46a1b21de218c2dd2e Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:31:59 -0400
-Subject: [PATCH] Add CC and use CFLAGS in Makefile
-
-CC is necessary to specify the compiler to use (default to gcc) and use CFLAGS to specify compiler arguments
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..5b7212f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,7 @@ all: example checker
- CFLAGS=-g
- 
- checker: confcheck.o
--	gcc -o confcheck confcheck.o -lconfig
-+	$(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
- 
- 
- install: all
-@@ -18,7 +18,7 @@ uninstall:
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)
--	gcc -o example $(EG_OBJ) -lconfig
-+	$(CC) $(CFLAGS) -o example $(EG_OBJ) -lconfig
- 
- example.c: eg_conf.cfg
- 	./conf2struct eg_conf.cfg
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
deleted file mode 100644
index cb345f3588cc..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f4bc59c6cad87f6a237f92ea4c54e38705beeaac Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 16:24:14 -0400
-Subject: [PATCH] In install, ensure destination exists
-
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..8bebca4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,6 +10,7 @@ checker: confcheck.o
- 
- 
- install:
-+	mkdir -p $(DESTDIR)/$(bindir)
- 	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
deleted file mode 100644
index bae336e10854..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f3724170ae5b5e750ec5482241add97217047eb4 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:33:49 -0400
-Subject: [PATCH 1/2] Use DESTDIR in install target
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..fd2f21b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@ checker: confcheck.o
- 
- 
- install: all
--	install -c conf2struct $(bindir)/conf2struct
--	install -c confcheck $(bindir)/confcheck
-+	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
-+	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
- uninstall:
- 	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
-
-From fa13135f93435de520480be9c1a578b20d538f55 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:36:24 -0400
-Subject: [PATCH 2/2] Use DESTDIR in uninstall target
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index fd2f21b..ca1e673 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,7 +14,7 @@ install: all
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
- uninstall:
--	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
-+	rm -rf $(DESTDIR)$(bindir)/conf2struct $(DESTDIR)$(bindir)/confcheck
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
deleted file mode 100644
index 79269d628839..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9c0e889e29944428106c12ee28ce0074a29eae50 Mon Sep 17 00:00:00 2001
-From: Yves Rutschle <git1@rutschle.net>
-Date: Sat, 29 Jun 2019 18:41:20 +0200
-Subject: [PATCH] added install and uninstall targets to Makefile
-
----
- Makefile | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index b03aab3..bf9bae3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,5 @@
-+prefix=/usr/local
-+bindir=$(prefix)/bin
- 
- all: example checker
- 
-@@ -6,6 +8,13 @@ CFLAGS=-g
- checker: confcheck.o
- 	gcc -o confcheck confcheck.o -lconfig
- 
-+
-+install: all
-+	install -c conf2struct $(bindir)/conf2struct
-+	install -c confcheck $(bindir)/confcheck
-+
-+uninstall:
-+	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
deleted file mode 100644
index 5eca0a1de7b3..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b43351d0fdd687ed39b38531f673ba634aca5fee Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 16:22:49 -0400
-Subject: [PATCH] Install target should not run all
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..8943248 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,7 @@ checker: confcheck.o
- 	$(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
- 
- 
--install: all
-+install:
- 	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 21f8f2e45543..1f644b11a0dc 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_12.3.tar.xz 493796 BLAKE2B 65ed2b494bd7dc70ecefe1a999681af1648385ec4addde8dbe39a650e37d4613c1712ba8005dd1efc8bcc688c02f23d02afe661e6126d29d8855930a34ed74d7 SHA512 94abe39f4df1d0b95b49fc20141f46f8f0438de89f904556dcb26f9ddcb6530d04d92c2c719549c0f1f5bc8c5edc395fd770e74097b353ec521affa227d77f4f
-DIST debhelper_12.4.tar.xz 493916 BLAKE2B f1478c30a1043f66eea4aa3bbe0cd5bcc10b9d8d2a2caf9ec82b6eaaa4bff03ee7c72ee2aa87ff96827a09b6f33874fd85d7743df2f5c8b1eaaf957c3cbc4066 SHA512 82897feadfa953d12bbc6e5e8fb1fbccd4de9e42cafa5c23e188960ff11e7c14a5db0ba7a5a50873b2f399da71580a36b27156c03a11d418c58fbe5cc431b006
+DIST debhelper_12.5.3.tar.xz 500304 BLAKE2B c73d0aa6069b3c85511196e50afa73c3303a23503ff13f748fbc58ee26911b3845742ff9d37189a5373b4d05958912b76681f8fe1e02b44256cf29c161ee14c7 SHA512 920fbb44f1ec63a90d85f4814f5826a446262a54a2e5209adef902f32965e88080908445586bbac86ba1aa1152f894e5e33369d4fa604084aafb4666b7f3cd38
+DIST debhelper_12.5.4.tar.xz 500788 BLAKE2B ce562d57a0f96de13499a6aa78993dc40dacb94ce34c18d8ac81c7345f25e74407b4368c207b6837382540ecaf943bc1e51bc0032fde3d30d1988906d9fe8b12 SHA512 411dd16b779cf7e9cac76aa571d44e3c78cdc2de129d861eb6e30867ab92642f0ae070b3df8990cf02f37f3e24e127743ab92fd85f05a8b705a43a543c81e4ab
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
-EBUILD debhelper-12.4.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.5.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.5.4.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.3.ebuild b/dev-util/debhelper/debhelper-12.5.3.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.3.ebuild
+++ b/dev-util/debhelper/debhelper-12.5.3.ebuild
diff --git a/dev-util/debhelper/debhelper-12.4.ebuild b/dev-util/debhelper/debhelper-12.5.4.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.4.ebuild
+++ b/dev-util/debhelper/debhelper-12.5.4.ebuild
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index b93a25870f32..ac07d9d46b7c 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,5 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20190728.tar.gz 534764 BLAKE2B c38df2a2a71036a60c08b2f9caa0cb0b6be9f07ed0137d592ed48c6f3e57a0d24760ff85df44f0fdb4cc690b47c6a206f6eaf84a7ea7e71366424dedb7a9e1d6 SHA512 e539f9691fbca289192deec87439b9d6a463b875b24082f6684c2a1c7f7b46bed1ba29a5380dd93dadd800a99bc7c60c9d065d7230bf21dcfbb8f361d7d15de6
 DIST dialog-1.3-20190808.tar.gz 537376 BLAKE2B 38c849ef12ae6c5fc703fe5f8d172c92ba9c6d498e163d622b5dfc7c638a7058fbca79ecfbf1f3e4f274fd53c6cce0d4ef0f67fc5efb8dc16b451064d609e214 SHA512 780cecaf68616723242426f9e78c772f81ec63f0761f67061c4fa06510ba9ca229c921ee15443b63c1581726751f79bf3e6d3b6b8148bbbb3a986043b6b82f86
 EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
-EBUILD dialog-1.3.20190728.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
 EBUILD dialog-1.3.20190808.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20190728.ebuild b/dev-util/dialog/dialog-1.3.20190728.ebuild
deleted file mode 100644
index 021642f25719..000000000000
--- a/dev-util/dialog/dialog-1.3.20190728.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	prune_libtool_files
-}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 82e08e0cef0d..6139e20176f8 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 7a07be31d76197c0d4472e5e36a141944df7a6f0aa28bef8e41e8324821eec7ec8b4279be123532ffbe4b46b65f7fbfbde1638c623ba10fe535739c5bc64ef60 SHA512 3d3b02b4fdbcd3000e7778a37bc6d1c647fbb9dba7a4b097b4d921472af379bea326aff1f3c0bf21711d9cd9c9cf5e9cba1f60a4a3c2840ba38eaeb3ee494ac1
-EBUILD gdbus-codegen-2.60.6.ebuild 2054 BLAKE2B 98c1af744514e90c1d868cca51bb8bfee22f0b42075836614ef148ed15a0ea83da32c9f1b98cbd252e094e1f59156c5e13411f446af19ff9daa5ef52be5723c3 SHA512 afa27bc27c59b4e355f1c7c8aef4045b68c7ef26b47cceec89366cde559db3771c0844d37de5306843b6d70eb8202bea520278ecab46f5e31e1c9f9580d3e821
+EBUILD gdbus-codegen-2.60.6.ebuild 2048 BLAKE2B a50962cd741be429374ca1854199c02ae0fee5deba37903da653376cdf395bde1e44b2afde0795154f5038760ede015cb5614ca8fe0d0d819850e2ecd708a079 SHA512 2203f69b88acfa0192f646826ae9ce41822cb25f7e2793fbb2ed295efca575023d23cbdc7e9d266afc183c478fa04eb7cbef2f610cd48b371d2742c3b7b494b9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index 04ecd71de65e..eb44d7ca49dc 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv 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/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index b7e4bb63ca07..3ac87aeeb0d6 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -4,5 +4,5 @@ AUX gengetopt-2.22.6-no-docs.patch 247 BLAKE2B 7d703bd0224aa6ea25095eb36902a0969
 DIST gengetopt-2.22.6.tar.gz 1056293 BLAKE2B a99fa2ee362fc7b01ebc4c81f9daa17592a30b63f63883b73ca67885fa39f2ece48bda3f04ed5b98e74785c4030f94cc139df93a847e8789962e51d0950de0c7 SHA512 dad5baf1b6c4c76ae7f532dd63c6aecdc30f31d68a259b6a26a10197f1fe42dc9147a52ac12a0c3fc4b7cd61d288a343a9223f967a5a9a15a0614330b41f68dc
 DIST gengetopt-2.23.tar.xz 584860 BLAKE2B efd94e28d35319f3a04af4f97b87fd8a07bef93856da0dcfad54ab4800d43510f7948bbb7440f39abfe242aede5657abd874bf4ab4dd311336e10f37e7960cb5 SHA512 3749191d35acbeff6680f2a4d0516706a0491053f632aaa44ead7c3a42e56f9870bd7c4a85a1886f2052e17d86a2853e2f65d445e0c9920e41f1dc354f003712
 EBUILD gengetopt-2.22.6.ebuild 801 BLAKE2B 53d523dc4b84feb8d86bad53e7b2eb0654e0ec252732bd893b8f10ebe29d6179fbebe00faa4729ef2f9ce33f59ec29eaad2f2117165b941d3b7a0a341d24dea7 SHA512 20b5852e27a6075403100c80d678c0c4066c6b0f7db7741321e5b099c7980f1b93d01226a08599bfbc2f965f3744de4e67461fc45dd71a8d5335d6c186079dfd
-EBUILD gengetopt-2.23.ebuild 714 BLAKE2B 20954e78eb6083f97351c7e835fe812932413996e71e1ba67094c0a025392810f69ddfcaea3a80884444348271e94c69fc6924e728e9ccdd7483ae3169bbbdff SHA512 81c8a361ef1e5f0ca609422b20a76ed92e8a4424083e9448353bd8cfa961618d5b85f898b3189a4b344cc832b74e401ef446c790aef37b0916e2ccfadee901bd
+EBUILD gengetopt-2.23.ebuild 720 BLAKE2B 1ccdab18dc10e9a6c3bc54da0ddf8520dcad90cde4eab6cd4c0debba3978ad69fd6e6ec8654bc277662d4506f40e0a08a51d500d7351df645e0d459c5d071a81 SHA512 6915453a64f4f6031822fa3bd0edf3347febe78b2fac47136aa698fb6e3909de900561670982dc3970615520ecee0ea689f8404e1be29a17013a08dc272cd2be
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index 23b2c1fa86df..d2f7836b3a84 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
 )
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index b2cd91790d84..5336dbf236aa 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
-EBUILD glade-3.22.1.ebuild 2334 BLAKE2B e7309513a932bbcbbb039e45e9afca7cd15871132dc73ad8aa006b88d699b3d7830641c5b6c535968cfe08eeec6c542182e278be6ca1e001c8c1eff96ee91114 SHA512 ec1856591b08f2bf06840e0bdcccfe745097476f78c5b5d740d97651997c41714357b6a6e1acbb53c3618102938af4581dc6ac65f92d842f00e3d102628bf76d
+EBUILD glade-3.22.1.ebuild 2329 BLAKE2B c7fb05647f04c8a74e85703873620680bee94cfa5f43f227602386eec4b9cbc97745ac2d9786fb61527d93fa2f03eb0640475433f9fb4bdbb56ed20884b25a47 SHA512 f86f398a1f87d6debe5407f5b6ca6d5bc4114d0d937464260ff4174123052ac70207153c81e50b4754524dd573eebdac93060104c920a57032f6a29ae9df8284
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index 0106822b04d0..77500747cd9e 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 854b144fc104..320fcd3e1e2d 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,5 @@
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 EBUILD glib-utils-2.58.3.ebuild 2407 BLAKE2B df14fadeb6dece6527b3c6fcc9a851dc662b2ff59842c83c3ca57007575575e80176bb42b6d6e0f02e9dc4598c7c0605c5bc0855427bb48dfd8417b9c2847582 SHA512 4d57615eee2d86c75b33f4c8be6a8076ca0be894dea5e5e3f2858346b87ad4c2545fc9c639f8f8f68c4816bf147ec73e1c38a243588c9a4cf72c5cc3db0fc880
-EBUILD glib-utils-2.60.6.ebuild 2429 BLAKE2B 43565d10ebccf632edfb09b0ede6aef02b3f4330d12d415c72b54e88d11d9f2e524c1bc4c92b0bb9565700159f477baebfd8f15c10f3d5f1f849f68fb0f449b7 SHA512 d75f3ac2ca4dfe56482fe602b47c9eb300500d31563f05d74c8fa5c8e5724e6d96e5ab3232785cdf3940ccaa01a191ee79fdebc8edae10c79f2ad00d46f06339
+EBUILD glib-utils-2.60.6.ebuild 2423 BLAKE2B 8e274dae1e4bcdc765dc8e47cd0fa6d03d824d8b3ec0d32f131460ba4703fdbbc52195dd3e73fc5d8359db560cb1589cdfb31d3837cf3c005d61558841cf1b5b SHA512 312b5c2d139b7c334452b47caa066603ef281e792e0937324ad193e5a637e0a54f449c719d1ebbd09d1cdb3d2155a9cbbe4496b739b918126c3eb50b9c8222e6
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index d181aae83011..16b0d8f4047b 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv 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/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index c4d5ae748ef3..c3cf4f05c6dd 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,7 +4,11 @@ AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.176.2.war 77379386 BLAKE2B feb66ad7042ab38ecd75c31e11587efe32d06c799e6f7fd46453969faa5edc241f99d844184e8f53dbde3bd05aeda676622baf2440eccd6c721300d877acb3e6 SHA512 8e53637a10942e7cb5907a669b72bd200369c65b47a8c3a050f356887cc65e8e2a0bab7b7a56d78735e5a2da77395268f4fbf4f6d5b219f9052dff72a96c6f05
+DIST jenkins-bin-2.176.3.war 77364728 BLAKE2B c80f54999faac0a740a4030498785f5caaaf9dbbd077258a767f2b23fefdcb32892865d256a46ca9afa015a5c035ae05605ecaf031017d350684e3b199f11517 SHA512 dc01c28abe624165c8fa63534a6beb8489ed73152dcdbb1cdb0bbb2e66492583eefe3b62f7e804089febc017de61535c336aa26835501759090f9cfcbd6f2e91
 DIST jenkins-bin-2.186.war 77649944 BLAKE2B 8247cae6d25c6b24cb7b874c3e9335cfe8b82d54406a3b37a909a2cde7178f38da8312ce89b63d4e6833d7c5a5369350c97ea5a785412b4acd5ebc5e40898be6 SHA512 70140e5bb199ca1b801763ca1440d41a96dfbf3f1df0d0aa04d00e81be42616464626ed808205e7353e476dc4aa7d320c85b141ec07448b0ba2251449d0c0c28
+DIST jenkins-bin-2.192.war 78257602 BLAKE2B 09f9df5f0394fc5a8d45b4b11a53b7b110d99275ce8e2ba7a984592bb2f883fbf8f1da45903a28fa20c18ab285a6a3200077784436716cab7a5f47ef7f3cba09 SHA512 f60fd5a74cd05a755dd85ee2be13f9f473a9fcbf3d3400df17b840fe88025b8311cee2d5e9e6c6dafcc8d268fac245a519078911e600d9af5580d228bba773d9
 EBUILD jenkins-bin-2.176.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
+EBUILD jenkins-bin-2.176.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.186.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.192.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild
new file mode 100644
index 000000000000..323b88955105
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild
new file mode 100644
index 000000000000..7d232cbccacd
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 6015bd487d4b..62510b00322c 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-php-5.3.3.tar.xz 1043652 BLAKE2B d181984e0c8c6b77502529dace0cb2b13afa417e98149a7caaf379fc5c27e64f7928c4232489a0e4b21af6500636a71b7217a56e500c367a579585dca6c447a9 SHA512 8a478e6170ed63ccd82822a5281abb63f70d959ae945b730d2d707efd104b0a3475a66ddb637f134d1eed90173342c1ecf42e7b15947b96c141e6228ef96a009
 DIST kdev-php-5.4.1.tar.xz 1042236 BLAKE2B 58c0e2c1d8cf0732bd4114e2c20c35076233ca1d1b6920de43abfd804f03468496596e2b061fcc8b9b8a0e9e7a10630a1f6b2f2271b33b702dc91852dfbccb48 SHA512 a6dc4447be0148956fa805a45a73bfd05311b08f6fb3beda486f2703753a1825de97b81f67ebe6e178acf5ad238f6d6708704c04ede3bdefad19ec36d467ff7a
+DIST kdev-php-5.4.2.tar.xz 1042248 BLAKE2B dbdbd12de37a3d37b96530a25db46daca7ad7c09854ba08417abe19f5136331091ef6ba977e2eca46b423ace167bea0082e71f57d9d9b41b2f9908856883f3c1 SHA512 c805431aa4efda12d15898dfe33d8c096e042fbf3077d377eb524c59b9da14c0930fbc2c456e5760452ca238b5269f360741998af0b429096ccd57fbe6575a0a
 EBUILD kdevelop-php-5.3.3.ebuild 1184 BLAKE2B d0ba9ef4a008f121bd3254b7588868161cad6c0f6687d38928241eb08f70d0f6efad87871ba83bde7c41428983f1f6aa72dc36b7765ddfea10fb053d878d4214 SHA512 70939ab2e3b29b4370ef5b7916149f4a87aefd201110581b7c8821d25593cd602bf3f147a9ebc8e9366061886c1f15e8413c042f006afec146970eb68c752887
 EBUILD kdevelop-php-5.4.1.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
+EBUILD kdevelop-php-5.4.2.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
new file mode 100644
index 000000000000..736a5e6971ab
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	kde5_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 40e0eabcda46..ed24d6ca3b80 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-python-5.3.3.tar.xz 1082448 BLAKE2B 000d0e54c5e2b5eb41c6be0f82d7b6ef476bed3175f367db11fdcebf2f7063b322ac0901059a2e17391904f2ac5cffdcb48d3015665d697e89aa6e0be1ae550e SHA512 4d388b20588b4032efd677e9f152be53739a4c5c5bb3fcf37b5289da418c47281b6a545ae5825f9674b90333e69f2949e6e9b4d6704010cbb878d2ce8b3ee384
 DIST kdev-python-5.4.1.tar.xz 1074132 BLAKE2B d2f21849e14ef9828085b4fa9fe8a9af85e71f59263be7295a76932801700730ec3bac147c287ed400515e0552ee79a5f48ae96398820f0000951abf82fc83c8 SHA512 156ad0af9fbd3e5845979abfa68329de4228edabe68e0765ebde2821289d2bb027d46623be2bc805cea6988450d594d94c1b497ce4ee1b8d86a88cd7ff1eebcc
+DIST kdev-python-5.4.2.tar.xz 1074220 BLAKE2B c2c6c1bfc0ebf3d0950740f11dd881830a3d5d9e0b331fbb16f14995b2f49f3a86293189409f005c582b9c0ed9de4a92682c53ef0145cd3200310092792f022f SHA512 fef69a4afa9539e719d4808c272d1c34f4b56c33eba355f3bd0de87a6614912e30233ae7f48e9821acb9f25f2c3bd3776f4965f777fabdde21fe48d0b7baefc8
 EBUILD kdevelop-python-5.3.3.ebuild 1122 BLAKE2B 06832b22adea00c8f98753dd9c05d5a43975b9118facfdece25a61eec6caeed77a9e555f92b76351f58f67f799d9dffc8b6b5c953eb105f50f5ce968886df5e4 SHA512 5246a39dc49dd41596a34bcc6327f28eef52fda72fde17c26a08c5b2fc2165bafa3d4864e93c67a6c2d0e93ec3be8d2472844734e9748fae1b768ffce688c364
 EBUILD kdevelop-python-5.4.1.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
+EBUILD kdevelop-python-5.4.2.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
new file mode 100644
index 000000000000..4329abd3e932
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index e6248891d995..c553d07b9bcf 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,8 @@
+AUX kdevelop-5.3.3-missing-header.patch 752 BLAKE2B 1932cc385d7de6f45160215e243e978248dd07abfcf6b4ff162b4cc056713d40c6f80b84b2582cd0600100444e006b0b378bba8d93d3190d5d28a010e982d227 SHA512 d511f6d393c5189fdd2e980f8ad1be96e8b6ce7d19e4f51bf8a85ce79d9bdbe1a0e9f8bcd5ca8609b907344bcaded083851a1bd5ed1fe96782091d94d6df89d0
 DIST kdevelop-5.3.3.tar.xz 6977420 BLAKE2B 8cccce2b7473551dc4ee9b9b06e8777e7f98869870ed7ee797b0e3a7c27f68d75b7af0f030dc9b0302a44ff246f69ec9125994cd72e6020e2778ac55f6d593fb SHA512 a089763045f02ef3167fab1f663503cc7a6e29cd8a42d3caa8b3a71fc1b2150162504bf4404ea070f73b3786a7389b6ee5af9ff922515445b57a0041b07e7d5d
 DIST kdevelop-5.4.1.tar.xz 7006564 BLAKE2B 98e76daca0f124f0786a0cab5a3575548ad0d2e157c72ccbe2ebee2dc1f2fd98f6d7d803991b4c426e65d16c5feb41f818440443c00b9bcf472d9c42fbdbd2fd SHA512 096d6e1d93b4faff5988d92381bea9c31048cc686cb71c52c66d54249c8cdae50dce03f63b6cd2a6ee1f15898f619ab7307fad58281186fb6d410b2ace2041d0
-EBUILD kdevelop-5.3.3.ebuild 3743 BLAKE2B 8a6890151d7ae15823f0e30baa0c85e08f3dc1bae68dd199eb2969dc396afed40d1080535f487a54713660810e565bfe0c91488d17ab84ac2c687b05aeedd4a4 SHA512 068b4849fd58ab629b427c5f445f2c7ba933d4ab109d6a2fa83caa5e0401950ffd2e59fa234d1154891b3ae058102ca222197bd77fcd5224399ee31bf3a62913
+DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
+EBUILD kdevelop-5.3.3.ebuild 3796 BLAKE2B f0dd1488afb9408bcf6f44f1dcb0c948ad69e2f6c89e2328a9fc00c43295acef256d1d9527a0e576d8141ad32d99502e26944dd1d2d4942b1753e404b2a38455 SHA512 98fbd77a30b1e1623116c36f0098527126119cf27e982ea02c3bc9d4cd1e9a344eeb8e01853ce4cb9fb468dcf087ffa92b6c15afec38eecadb6385aefe9a24dc
 EBUILD kdevelop-5.4.1.ebuild 3841 BLAKE2B e8fa0d79c9fbee238100926098fc5c79d7f6a732f67772bf7721472a21694cdec2cc09bb64ac6f4b8c99f6d2afe886f866782e0398016778a8aef44e24a3a480 SHA512 91d50b6cf5f6e0391e104b5156ea0a9e919e720aa16972d98a5132573c466300a4c44a8998da6626c874c19c58dcc8495ca58b344a8a311c89f8a3791c7eb2f8
+EBUILD kdevelop-5.4.2.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
new file mode 100644
index 000000000000..39b1122f7189
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
@@ -0,0 +1,25 @@
+From 125259eab4ddc525e816a9479d93038bffb73353 Mon Sep 17 00:00:00 2001
+From: Tomaz Canabrava <tcanabrava@kde.org>
+Date: Thu, 18 Jul 2019 18:07:39 +0200
+Subject: Add missing include
+
+(cherry picked from commit 8a3d8936fc4fce7eee1bcd62c0eb473ef908268d)
+---
+ kdevplatform/shell/mainwindow_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdevplatform/shell/mainwindow_p.h b/kdevplatform/shell/mainwindow_p.h
+index 3020957..1e915a0 100644
+--- a/kdevplatform/shell/mainwindow_p.h
++++ b/kdevplatform/shell/mainwindow_p.h
+@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
+ #include <QObject>
+ #include <QPointer>
+ #include <QWidget>
+-
++#include <QMap>
+ #include <KXMLGUIClient>
+ 
+ #include <language/util/navigationtooltip.h>
+-- 
+cgit v1.1
diff --git a/dev-util/kdevelop/kdevelop-5.3.3.ebuild b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
index 9f502160d9d4..0e818dc362fa 100644
--- a/dev-util/kdevelop/kdevelop-5.3.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
@@ -93,6 +93,8 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # see bug 366471
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
diff --git a/dev-util/kdevelop/kdevelop-5.4.2.ebuild b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
new file mode 100644
index 000000000000..5ed1e8f93f5d
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qthelp)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	>=dev-util/astyle-3.1:=
+	>=sys-devel/clang-3.8.0:=
+	gdbui? ( $(add_plasma_dep libksysguard) )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( $(add_frameworks_dep purpose) )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop-clang-tidy
+	!dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package hex OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake-utils_use_find_package reviewboard KF5Purpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+	)
+
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+
+	if ! has_version "dev-util/clazy" ; then
+		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+	fi
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index c2db450b7710..b03e50f44506 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,11 +1,8 @@
-AUX meson-0.49-python3.5-tests.patch 1228 BLAKE2B 1cf444e239ec6c24f0fef9d20edf92e364c5c55debf61c115559cacb676596e98a9e01970661b16c4a95bfbf161d6c02e314bbe746979cb77c8f7f6dc5ce7fa6 SHA512 c856436331f6d80912e0519303051e49f4c2c08d348e575ff71b2628621ce752148bccf7aa348d0f27d7df11ff15ee96439d4438d0a2755e1f6c66d2be0ac942
-DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
-DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
 DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
-EBUILD meson-0.48.2.ebuild 1737 BLAKE2B eb62b3cb156cd4c686bc9da4b5e69a4ab21dbcf61ca48740724e3fb88468c479f23c9e524825d18c528cc38f4aba067c8f5144530911fac94b0b1344d26ad57f SHA512 161336944be7a6bbe552f63d2712f24aaabe634b73a0bf5631bb73c5001164755f6488c1cf6590e5ef060cc7bd02af35863d147ea753f2ac4a090898030519a0
-EBUILD meson-0.49.2.ebuild 1764 BLAKE2B 897dc3089b7a4e645dafe38e407a02723e182f53102b6a0a953eac810124bfbf34c6495638dee835fd940957bd69dbc3887c67dfe81490282c839dc0fdeebfad SHA512 490420403cc9c56b6d652beba7f89964020dbdae40781b83385160a09d3ee797a9c2589fff2fc359fb9f955d0575b58d30b3e9ae9dd8b3b6c480665d0efe1667
+DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
 EBUILD meson-0.50.1.ebuild 1717 BLAKE2B fef0e6f1b04e505a25759907af4a0839241a0e3334ee08525f1e91f2ec47dcc36f08ec29cfc80a9b28e0863550724b19590dea1c182c079871a432b36b06a63d SHA512 81d3c76ca483b5ab174a5ba1b1b3b61dff1a03405668f0ee03ba265049684da03c3abe02241135d48d5ca957d7b94095e1749684eba258b88cb7d854239a507b
-EBUILD meson-0.51.1.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0
-EBUILD meson-9999.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0
+EBUILD meson-0.51.1.ebuild 1955 BLAKE2B 262d70d7d4321213248c7fecf2370f921d882c4571d904079605838b3d21815825e265346bfb33f115be6127264a58c495476ed335650c9345bd03433c985584 SHA512 61912689b45e4823e62da762b65d0063267fef830595a94cf29fe1a2e95cc9fca8db2fff72df70fc2abd4a68177f4d8cb365dc7dfd41d2238a3488d92d3a4799
+EBUILD meson-0.51.2.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
+EBUILD meson-9999.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch
deleted file mode 100644
index 640348b2bc2d..000000000000
--- a/dev-util/meson/files/meson-0.49-python3.5-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 11 Jan 2019 18:03:15 +0000
-Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess
- invocation
-
-subprocess.run() didn't get the encoding parameter until 3.6.
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- run_unittests.py | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 342ad883..e1246140 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests):
-                     ret = subprocess.run(
-                         ["{}"] + extra_args,
-                         stdout=subprocess.PIPE,
--                        stderr=subprocess.PIPE,
--                        encoding='utf-8')
--                    print(ret.stdout)
--                    print(ret.stderr, file=sys.stderr)
-+                        stderr=subprocess.PIPE)
-+                    print(ret.stdout.decode('utf-8'))
-+                    print(ret.stderr.decode('utf-8'), file=sys.stderr)
-                     sys.exit(ret.returncode)
- 
-                 if __name__ == '__main__':
--- 
-2.21.0
-
diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
deleted file mode 100644
index b6374c8e969f..000000000000
--- a/dev-util/meson/meson-0.48.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	if tc-is-gcc; then
-		# LTO fails for static libs because the bfd plugin in missing.
-		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
-		# https://bugs.gentoo.org/672706
-		tc-getPROG AR gcc-ar >/dev/null
-	fi
-	distutils-r1_src_test
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild
index 33a23e5a8708..74eddfbf1864 100644
--- a/dev-util/meson/meson-0.51.1.ebuild
+++ b/dev-util/meson/meson-0.51.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 		dev-libs/gobject-introspection
 		dev-util/ninja
 		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
 	)
 "
@@ -38,6 +39,10 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/673016
 	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -46,6 +51,8 @@ src_test() {
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
 		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
 	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
 		distutils-r1_src_test
 	fi
 }
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.51.2.ebuild
index 795f89a188d2..782127bd368c 100644
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ b/dev-util/meson/meson-0.51.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
 
 if [[ ${PV} = *9999* ]]; then
@@ -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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -29,19 +29,20 @@ DEPEND="${RDEPEND}
 		dev-libs/gobject-introspection
 		dev-util/ninja
 		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/meson-0.49-python3.5-tests.patch"
-)
-
 python_prepare_all() {
 	# ASAN and sandbox both want control over LD_PRELOAD
 	# https://bugs.gentoo.org/673016
 	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -50,6 +51,8 @@ src_test() {
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
 		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
 	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
 		distutils-r1_src_test
 	fi
 }
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 33a23e5a8708..782127bd368c 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 		dev-libs/gobject-introspection
 		dev-util/ninja
 		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
 	)
 "
@@ -38,6 +39,10 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/673016
 	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -46,6 +51,8 @@ src_test() {
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
 		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
 	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
 		distutils-r1_src_test
 	fi
 }
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 685ef582535c..668c820ce682 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,6 @@
-DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.4.ebuild 1329 BLAKE2B 06d0c18872ff72005cf1f613d3dbace72cab4378e1ea60747e18fa665e4314671c235d8a999beed28cd8957097fcc3cb5099e023042f1fcc8ff87f90a5410d3c SHA512 91fbef02f96fb1c3110f9b58d3ba47dcefe9fa0b0b1b434ffdb5b6f44a7336431816392b0fa38a47393e41ab22fe8d141bf184e45fe9e32dd8c36140e2c31223
-EBUILD pkgcheck-9999.ebuild 1277 BLAKE2B a51bd3b1a5edf2635fa804a1bc8ae49488d3e5a9dc22e40741e879d44f27409474872a89d5501f39e73eb1379372f1646255a03aa6ac9b3817dddc9c3f1beb1d SHA512 beae01defca87158c5a00cad2e4f22a7e537c1fb96412e023ff6e581bdbe555ef5b67f6dd6f9a582b7aa57a98d98b8d0daa3b5d03acfe0373466626f41a3dfd1
+DIST pkgcheck-0.6.2.tar.gz 169107 BLAKE2B cd7570924b6b115aae467275bc4e1b26a7c20454860d614c23f96c45f5856d6cc8874aa4ba6d250591eae2f5ef0da8102124a924dfdeba5ca75a17fc1005eaaf SHA512 8684fd40694f4348150bd10e4ad4cfb99cf4978595ccd77e117b50abb54060ef1f9d2a9889279ce139b95c39b6b755ccb8c9604a84ea62892e519552e27ca5af
+DIST pkgcheck-0.6.3.tar.gz 171317 BLAKE2B 76e74cb7b7ce093aec6eff210b4984b195adfa615bdfa9937d47725246a8f0f4074a5d7fe0537e9b556df08906cb738f109eb0bcd980966b1baba4f754888285 SHA512 888bcbe66603de97f92f0bd9a35de6b177724b752e70f55a04cb1ae17c32a476986b9d5165cbf92819c1945bf481529943ef6fe3cfd72739749149760c9809c3
+EBUILD pkgcheck-0.6.2.ebuild 1344 BLAKE2B a84d785972b55a4dfe414c9afbfcb66a436dfa3f1f05b5ac5937e3296dadd315587de3becf3c789bb1cfe2321583272923cdadf0e71490457256ca44d8627699 SHA512 17df39ba1a46e6efeab2fcc6b8188591b837e29c18a128d9b7489fcf19ba12512fbc080f93004b2f9922f520fbf51fbff24961fc35b9bd708f317ada8296e53f
+EBUILD pkgcheck-0.6.3.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
+EBUILD pkgcheck-9999.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild
index aeeac7fcdedf..f244fafd53a3 100644
--- a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -17,30 +17,32 @@ fi
 DESCRIPTION="pkgcore-based QA utility"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
-LICENSE="|| ( BSD GPL-2 )"
+LICENSE="BSD"
 SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 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.7.2[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.5[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.1[${PYTHON_USEDEP}]"
 fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND+="
+	dev-python/chardet[${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
-}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 
 python_compile_all() {
-	esetup.py build_man
+	use doc && esetup.py build_man
 }
 
 python_test() {
@@ -49,10 +51,8 @@ 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
 }
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
new file mode 100644
index 000000000000..1a07b1b270b2
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && esetup.py build_man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	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/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 75dc351a4f38..1a07b1b270b2 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -17,9 +17,10 @@ fi
 DESCRIPTION="pkgcore-based QA utility"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
-LICENSE="|| ( BSD GPL-2 )"
+LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
@@ -27,16 +28,18 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 
 python_compile_all() {
 	use doc && esetup.py build_man
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 423cceea6b91..4d979346db7d 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
 EBUILD pkgconf-1.5.4.ebuild 1393 BLAKE2B 07808f0e52d9fe36b5a3a54758d956e1fc726bcad1110cc17c0b065afd8fc3727b293682d590ab6d3bf3af35ed3112c1aad3485f37a0520e0d041056f1e19b55 SHA512 0da4bc185049ad5387261fb80979ced945f3c5f8b75d3d310f6a282bf5323035e06b345fb3c92f56cf58cdbfc9dc8b3513bf4d587c98a5265bc6df9775698105
-EBUILD pkgconf-1.6.3.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
+EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B adf15678d3c814f2d2afeafacaea8ddd636f6a19680cca166e26e7eb6822dda6832c4d29a9e81f82746d74c36ef25d8980f67686f5f8d3c81bab4ee008da3874 SHA512 fd509030288c89acb4ec955af4373b15d6311519518cf4dc0984d854ecf95ea0fcc732fb37e0dc4c044203ccb8a492f83b774e8a281aebc91c5e183dc029779e
 EBUILD pkgconf-9999.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 5f58337eda71..8cf602f946e1 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pscan/Manifest b/dev-util/pscan/Manifest
index 7f379a832363..b419922f5eed 100644
--- a/dev-util/pscan/Manifest
+++ b/dev-util/pscan/Manifest
@@ -1,3 +1,4 @@
-DIST pscan.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78
-EBUILD pscan-20000721-r1.ebuild 843 BLAKE2B 3fd9ff6066f1e57413c5c2aa1ec6e69102653d88e6713267b3e70b533bcd68ddde2b5dc84ffc5f169baca72379c116b2ab321b36c47dcf25232f1135f8bb4d3f SHA512 bd81029aeaae61446dbf2f4e8ac3b94b689a51ea30a9b0ef99c9a5435bc6aa90b2a655df5f43db91ab912e9854629fecdaf6bb1499f57e3857af376c4e05d8d7
+AUX pscan-20000721-fix-build-system.patch 380 BLAKE2B 93c29ae8c17a798bd7b0a28c43dfed21410f336fa17c7ba58c2c9b5588831ad6ca6e056d2cf9d6375bc2ba1e043665525aa58e903545691f9d6bd21616d11b5d SHA512 9c0e2b237553ae396398c0e0727b5eed7879ea112d940289c60be4e3f289dbcddeedbbfb4c9563e558dbc96d0f7420e672b9d70cc488be86b00ef42b5abbf76c
+DIST pscan-20000721.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78
+EBUILD pscan-20000721-r1.ebuild 743 BLAKE2B f7020c464af54a911d5d51d240371895799cf89d40d210b388d9c0fe568616d359187432ff4612df1ff4f0fe9addb7c68288b3346d8b7f783f9544bafbae73dd SHA512 0aaf95f7a7e037aba1d0fc24fb8045ee9cd08fbf3f27299c0ce995729519f1f788bb3d3addf98f82eaec101f79a0a82c6ee6352f999e68b8ac5b30a1e35d7b4b
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/pscan/files/pscan-20000721-fix-build-system.patch b/dev-util/pscan/files/pscan-20000721-fix-build-system.patch
new file mode 100644
index 000000000000..cd22fc2eb195
--- /dev/null
+++ b/dev-util/pscan/files/pscan-20000721-fix-build-system.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,16 +13,10 @@
+ #CC=gcc -Wall -g
+ #LEX=flex
+ 
+-pscan: scanner.yy.o pscan.o
+-	$(CC) scanner.yy.o pscan.o -o pscan
+-
+-scanner.yy.o: scanner.yy.c
+-	$(CC) -c scanner.yy.c -o scanner.yy.o
++pscan: scanner.yy.o
+ 
+ scanner.yy.c: scanner.l
+ 	$(LEX) -t scanner.l > scanner.yy.c
+ 
+-pscan.o: pscan.c pscan.h
+-
+ clean:
+ 	rm -f *.o *~ pscan scanner.yy.c core
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
index 11c078d3650b..e63242af2bde 100644
--- a/dev-util/pscan/pscan-20000721-r1.ebuild
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="A limited problem scanner for C source files"
 HOMEPAGE="http://www.striker.ottawa.on.ca/~aland/pscan/"
-# I wish upstream would version their files, even if it's only with a date
-SRC_URI="http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz"
+SRC_URI="mirror://gentoo/pscan.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
-
 # Does NOT contain a testsuite, but does contain a test.c that confuses src_test
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/flex"
+BDEPEND="sys-devel/flex"
 
 S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS}" || die
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	newbin pscan printf-scan || die
-	dodoc README find_formats.sh test.c wu-ftpd.pscan || die
+	newbin pscan printf-scan
+	dodoc README find_formats.sh test.c wu-ftpd.pscan
 }
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 1bfe1f4d9abe..f0c19c8fde7d 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -5,9 +5,11 @@ DIST radare2-3.5.1.tar.gz 7083677 BLAKE2B 3d84e79d4e20e031b6cfdbabcf80922f977328
 DIST radare2-3.6.0.tar.gz 7339427 BLAKE2B 60ecd110ac4cafa38dd10f49321e984e98f189398f15196614fb096970cc2f24981ffbbd161fdd55621b65c45a8fb9f843f273bf245ac0ea2b4493981ab0477d SHA512 15c02b744892934bd0b4beeb146d8a0289244405214b62892d7e307cd42f6706aca16c1e02b6b2beb5b6869c5c5920cc291ffec8a690b5338c6973a5e1d7900e
 DIST radare2-3.7.0.tar.gz 7478494 BLAKE2B 547efda30a65783758b132f4b241039b83bb274904a1f69616e60ec83547b22da486e97df06a74cd82f855650dbc3802d31bf3cb00ebd12d956848efd4b6ff5e SHA512 8e4d1b89d0d1e717403ba0bc2ce47e2644d12303ed5391fe4b9efc11b86a0b9c9356fdea1caecabe16d88ded9577fe77c182225adf2fdbd63b2e48f9c9c9f52d
 DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
+DIST radare2-3.8.0.tar.gz 7510078 BLAKE2B c3dcc28c0cda8c7c5f8dbc6d35c3d15fa73fec8402acfd5de0b3ea85ef0295608d2332efbb29a41e75239acafb66b1c3b946f58523d9e5bb605b70ddce3ce38d SHA512 c9a1a4e7743b54026990d7473f05fb8eb25d7a7f0fd985172587ce82b8f6fefb53dd181b0bdb8463d2460c71e4a9eb377ead4ef7379615c90aa858d8fcadeadb
 EBUILD radare2-3.5.1-r1.ebuild 1210 BLAKE2B 8bbc76b7d1097416f53e8d70c12e5460d1c2971ff2d3cbf05718be0397b014f9b456dfda8411048d48ccd28de37919a9e79e6d8970228c8a9de91ff993c73ecb SHA512 9b54f5aa235c1b693235833618e822a67790773cde3847a65216dd832ef29fba8a43db7ca770d5791f03c976fe5a8b11ab9f64c79ad374947af8b34d6e4bfb0b
 EBUILD radare2-3.6.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-3.7.0.ebuild 1220 BLAKE2B b47051fd9c3a4f0b819f86daaaecfbb95747cda74811c73d788ea055a611eb2e9248e6c80026b0f2a2958397a49b73e20f305b9cf5967522c89c26a35f32e322 SHA512 f423501872f7e672de464ad9f46d06f1fb07511c85939c015c37d89b1a44bcde0e934e324b47aadb446c6e5f8a8044fa73b751f234e1dddb64294a36e36efc84
 EBUILD radare2-3.7.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.8.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-3.8.0.ebuild b/dev-util/radare2/radare2-3.8.0.ebuild
new file mode 100644
index 000000000000..0b3f4cfb432b
--- /dev/null
+++ b/dev-util/radare2/radare2-3.8.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/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 342b79f9b920..774cf0e64b78 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,4 +1,7 @@
 AUX rocminfo-2.6.0-cmake-variables.patch 1107 BLAKE2B b613dee2b0b44cf4d31afbe3647ebc2c511903c5a6a6a0f74b6c5b419ab17f81b1d92f5802667bfce4444f839f3dedaea0785e2cdac14b7b49be6a9b97c12971 SHA512 59fcf341a381a1fc3c60c8f4f33050f6e31f0f29f53bb9abf2d0c2d0ed28c18f799ed49bf64ebe30a8e94c463aa88a735b1895df955c671f7e589350ea010ebe
+AUX rocminfo-2.7.0-sizeof.patch 1083 BLAKE2B c86e9f90660afa39b2cfcd6c5362734db31d0492ce4e9a39e9f1ca438c124f5f7e280232a1a3d0123ab2034d9fda504d8b766931638b6bba2cd883703df95183 SHA512 e32fb0cdb750780c011d032f44ae64186ad02c24cf9de8506b3224c49439d167b1c4b2f8c850765db8a210a308481bd8a69d5577bb0244ef75d68778972d791a
 DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
+DIST rocminfo-2.7.0.tar.gz 12671 BLAKE2B 6cb6e2fa458224654f4b672d117e2a6c71c7d5aeed8ac71cf7ecddb76d9209f25596521b31465a94fde1c91744fc9bf68e637f7ff4f67a000cbfbe4793c5fa4b SHA512 ffdaa3d11d85475c7600c6b25d8eb7f90cbda13b820f33c250a7ac9b90f92d4d5352d8baee765b4bd3b9c7389b5ab6d3b87df77bf62d6696ed8cd96bfc6be1a0
 EBUILD rocminfo-2.6.0.ebuild 859 BLAKE2B 4e9d3a3472d368d74969ed7bfd5d269343a9612f0ee558d201d5ba24e033c9ad62ce8717abc282147c35dc01cef93e86770a89923ea8fe434bc569a6393be080 SHA512 c10a8cd4a853d7d343d907502c0064f6453cc876e6b34f6c63aec7a355f5114f598478f83d723dcc86d45c0e620b71d6e1d7bf18da429d8619fd0d699bdda88f
+EBUILD rocminfo-2.7.0.ebuild 899 BLAKE2B d353500d57cf39ce63a8caccf6f9ed29d6181aa532a2054fb9ebab01502ac7a5a44d8b871d5763ee5af0111c7d11b7c6f3d1173eac6bbe75267a4513d1cd12c1 SHA512 57b2c8f3f806bde49656a749855c0797559d4d05800d62d8cce295292d11ff51315f871f14ee5c7d2c5294ccd065343134c8e3ba96bc1a60ccf16e03b5601da2
 MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
diff --git a/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
new file mode 100644
index 000000000000..2d96bb227791
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
@@ -0,0 +1,23 @@
+From cf96f42165fe76b98f653f979b4c182279dcac64 Mon Sep 17 00:00:00 2001
+From: Wilfried Holzke <gentoo@holzke.net>
+Date: Fri, 16 Aug 2019 22:04:52 +0200
+Subject: [PATCH] Fixed sizeof(err_val) to return the number of characters in
+ the array
+
+---
+ rocminfo.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rocminfo.cc b/rocminfo.cc
+index 9fddcfb..ee20da8 100755
+--- a/rocminfo.cc
++++ b/rocminfo.cc
+@@ -72,7 +72,7 @@
+     char* err_str = NULL;                                                     \
+     if (hsa_status_string(err,                                                \
+             (const char**)&err_str) != HSA_STATUS_SUCCESS) {                  \
+-      snprintf(&(err_val[0]), sizeof(err_val[12]), "%#x", (uint32_t)err);     \
++      snprintf(&(err_val[0]), sizeof(err_val), "%#x", (uint32_t)err);         \
+       err_str = &(err_val[0]);                                                \
+     }                                                                         \
+     printf("%shsa api call failure at: %s:%d\n",                              \
diff --git a/dev-util/rocminfo/rocminfo-2.7.0.ebuild b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
new file mode 100644
index 000000000000..6a46a0806b11
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-roc-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-cmake-variables.patch"
+	"${FILESDIR}/${P}-sizeof.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DROCM_DIR="${ESYSROOT}/usr"
+		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
+		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index d67856a63443..d670506f37d5 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -3,4 +3,4 @@ AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
 EBUILD schroot-1.6.10-r4.ebuild 3759 BLAKE2B f389b68a46ca5edb2054ecaff03d28873d689b3d6f8a8a0cce45e65a5be7cec4e78fc5346c2e4f33572d41b0b6934fb607a201bc294a47ba595211c062c171b9 SHA512 a9dd8c9c35e5d64bc0e686cfedce9295cd24589758d966dd15b9046f588973822c4f97c2cb288f9e98654e6167c4786109d7c859e47c3836d6286d35c4d1401a
-MISC metadata.xml 451 BLAKE2B c37cf286c387974fb9d4d9145724da0340d8846ee772548915fbfc24530567b7fda09fdb845a6918ff70e55c6d33621d586da51a8ed222de820035a1eea71eb1 SHA512 372b1bc77d13fde4eff8f5e45bab2a3c75152d05c7fbc272e5bb119e2edf9f8931acb426ca06b413cbcd7b4476424fdbc9eec49b865dd9cd2990bed88201d40a
+MISC metadata.xml 535 BLAKE2B d75765d4d0f53fbf6469382c1c55285343ce910b13c50997b7840cdaf1f4735af9411f76b18c048db9309f98e63906388836e15cb9cd47ce2c6c437e80220aaa SHA512 1b2ee12df6e663938c1dd3de76ef2597d82f179b3ad8bfea277094a132482b57bb5241a2001919c4b1e94c5569786f2c1d03e3aa567048a0eeaadeb483e93d1f
diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index cc3f6c238b48..2cca4eb6a236 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="btrfs">Enable support for chroots using btrfs snapshots.</flag>
-  <flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg>.</flag>
-  <flag name="lvm">Enable support for chroots using LVM snapshots.</flag>
-</use>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="btrfs">Enable support for chroots using btrfs snapshots</flag>
+		<flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg></flag>
+		<flag name="lvm">Enable support for chroots using LVM snapshots</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index d2db0db0c601..7b8c7a5f0cda 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,9 +1,4 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
-DIST spirv-llvm-translator-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz 10108 BLAKE2B 96492a7d3ab25e1fe837ced225d50c7450595af52bc3aa6c17e02dc08c1cccaf7ca8dc5949da17da7cc6ea5fcae8688a5994a50bb7693a52493520e57981bc48 SHA512 574ca7b7fe054e82ee154556555e2d184f102faa7da08ce9d6ca5d2ca37463c7a86b3861b93969f9c886544551af8c8f95e57363ea017f7fc426b56d97eb7cf2
-DIST spirv-llvm-translator-8.0.0.1.tar.gz 437384 BLAKE2B bca52bfec04d0adc08b00f5fdbcb6cf953be00f835d2a393545e77bd8776063ef91e8fb62c232b50cbeab58a0a01bea6e47b89c1756699bf35481e87823995de SHA512 85faf176d1ce79d19f10c88055f4a102a5952dcdcd6709e5e5cfdbf69eb958d51020a3ad34198c7c874b42ee8e318f1ce3169ea92853134dfff3dc5843f84414
 DIST spirv-llvm-translator-8.0.1.1.tar.gz 451282 BLAKE2B 6c1a5f7b9d280b040a48d987304f11c743180cb53d7068705a5be2c66a5235fd04344e31e3538cded1e9c5bce81155e00089de65b2b8baceebe54598a1305dd3 SHA512 b0e06b967caecf9b47921e7df1fef42c5c112ccf7962888c6e2f34358e9c27acb4a549cd855625fc942c4a6bcf0e5992e4c7e4d40ff962115733fc8901d04bcc
-EBUILD spirv-llvm-translator-8.0.0.1-r1.ebuild 1650 BLAKE2B 84b0fc6c6846382d5d172f59128f7d80d058537d4cf9f9fa4105756cf3f94e034d18a48a7f156a0976b80ae4f57e371c4aadc0975397f39efc79a5ebf39cd9ad SHA512 3a4f9e284d4007d8bae05b81ee220cd963e4e26e74fc5489d9d4de77d43409e81a18948b084f71ff2eae87d1418bbed20bddaccaf37a4972b8ac074fa97193a1
-EBUILD spirv-llvm-translator-8.0.0.1.ebuild 1474 BLAKE2B 4c0f80f4ad6ca1d465fbbbe46062f9f29cd5348deadd472e5346f56329dc3a420d98d534c2490a3632ecd199798fc79753b54aaa4a4a7c44b23a33cb93158dc4 SHA512 00070420d028527cd178430ddcda231643cbf4683fbc4c547640e2651f2bcea12f44fa4fa99aadd039b889a73011fb1e293ee3d84eb0226291e6e03e42f1aae8
 EBUILD spirv-llvm-translator-8.0.1.1-r1.ebuild 1250 BLAKE2B 568a8a0e02081fed98ea15d4056cc5d13a1f90675e48110f3b016b48fc0a27a7e5911b07eb9f285d17567fff09863b7db7a35d36344acdeef97b29c66c60e370 SHA512 644ec589dcbe8b048b38f725d870f25b4eca9e2443c3e432ac27c36bee7721e2a27b2a9546caabd8c4cc17ff589b6f2eb34fcfa469073798332609176fe6ed7e
-EBUILD spirv-llvm-translator-8.0.1.1.ebuild 1464 BLAKE2B 14a3c2e8bd66418b5d99ea983b28a83577430fd16931f4c5eb83aa8e206fc33ebf8f9bd411200d8e270e0e3e3704ceae0ea4b1890fbe210c81305071e4e9b89e SHA512 8fa0fe60fbfb0329d024733d75855c5eeae9bba1f925ffae0583b7456de4299894dcd34179d3288c9dca44f161effcf7d80f1ec23618bdd3466dee915c882451
 MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
deleted file mode 100644
index 3412d8cf4a0c..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic llvm eapi7-ver
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~marecki/dists/${PN}/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile llvm-spirv
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	# CMake does not install the executable so do it by hand
-	if multilib_is_native_abi; then
-		exeinto "$(get_llvm_prefix)"/bin
-		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
-	fi
-}
-
-multilib_src_test() {
-	# TODO: figure out why some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
deleted file mode 100644
index 9e8e3b39fed5..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic llvm eapi7-ver
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile llvm-spirv
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	# CMake does not install the executable so do it by hand
-	if multilib_is_native_abi; then
-		exeinto "$(get_llvm_prefix)"/bin
-		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
-	fi
-}
-
-multilib_src_test() {
-	# TODO: figure out why some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1.ebuild
deleted file mode 100644
index cbf22d71b618..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib flag-o-matic llvm
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile llvm-spirv
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	# CMake does not install the executable so do it by hand
-	if multilib_is_native_abi; then
-		exeinto "$(get_llvm_prefix)"/bin
-		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
-	fi
-}
-
-multilib_src_test() {
-	# TODO: figure out why some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index cbfdc165a637..9676f91dc4f4 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,6 +1,5 @@
-AUX sysdig-0.26.0-build-fixes.patch 1545 BLAKE2B f182cf721180ee624deeefafff54a48fc4e5024cff00e26f178960d9f7a3d7e8a481dee028fe1dac789f77ec8ba772cc5da82c4d0ebc388f1aa711824d42a2d1 SHA512 2d34ab81da7d3a07e9c7116dc1d25e6db93b5faf2be2a4fe1710efba43293892255591284bc1d2c39953c4cf73ebcacb73b5626cc2d649a0505e351165c9b8d7
-DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
-DIST sysdig-0.26.2.tar.gz 907496 BLAKE2B ce489d7c1a54aa2930599aa7141b1a3d4815c0395b4a444dea565334a1b39a36d339eb2bc9d0c2b3924e8c54f9c3adec6b31278017cfee955fe9ed9d3c29977f SHA512 1a2476060f43559ec89663377361d1fcaace7fe3aa3b472629dca78557e6d5868d8f5cfce3411c46804b501d6a56dcb074f6becf3d8e756b7f7fd943087cd3ae
-EBUILD sysdig-0.26.1.ebuild 1998 BLAKE2B 52ae3ad4e180a6640c613d6d5adba3e11d0485e7ee235f79eeadd19291e1291927fb6666c66555b0239d9015de9c56dcbca5f9a922a37422d155dd88e48f5097 SHA512 e6299a6be79367693680df3f2a5bc2555731ffad9dba8c333a1a4553120705a62be74127f0163c41343bf8b63d74c73d6b895a173812c57df394b64f1941368a
-EBUILD sysdig-0.26.2.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
+DIST sysdig-0.26.3.tar.gz 902206 BLAKE2B ec25d0441c69b8c4c4fc431d073d2f93e476ece7add98412e54ce4286bcd7e32d4b1ff89f75dd728dc66c7d77da157bed2182bad85557c0dcec09648f86abb3d SHA512 f700d1ddae687a3474a8bf6816d2fef6c69e963a269a90a8362287dee698ac9799da18f01f383368c906d294ceb046160a8b0792292a72a3b08fc614b5b69d32
+DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
+EBUILD sysdig-0.26.3.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
+EBUILD sysdig-0.26.4.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
deleted file mode 100644
index 8e0dfd606a16..000000000000
--- a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c
-index 452353a6..6eb7cd16 100644
---- a/userspace/libscap/scap_fds.c
-+++ b/userspace/libscap/scap_fds.c
-@@ -49,6 +49,7 @@ limitations under the License.
- #include <errno.h>
- #include <netinet/tcp.h>
- #if defined(__linux__)
-+#include <sys/sysmacros.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
- //#include <linux/sock_diag.h>
-diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
-index bc851319..ec454de7 100644
---- a/userspace/libsinsp/CMakeLists.txt
-+++ b/userspace/libsinsp/CMakeLists.txt
-@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES})
- 
- target_link_libraries(sinsp 
- 	scap
--	"${JSONCPP_LIB}")
-+	"${CURL_LIBRARIES}"
-+	"${JSONCPP_LIB}"
-+	"${TBB_LIB}")
- 
- if(USE_BUNDLED_LUAJIT)
- 	add_dependencies(sinsp luajit)
-@@ -157,13 +159,12 @@ if(NOT WIN32)
- 	endif()
- 	if(USE_BUNDLED_CURL)
- 		add_dependencies(sinsp curl)
--		target_link_libraries(sinsp
--			"${CURL_LIBRARIES}")
- 	endif()
- 	if(USE_BUNDLED_TBB)
- 		add_dependencies(sinsp tbb)
--		target_link_libraries(sinsp
--			"${TBB_LIB}")
-+	endif()
-+	if(USE_BUNDLED_GRPC)
-+		add_dependencies(sinsp grpc)
- 	endif()
- 
- 	if(NOT APPLE)
-@@ -177,7 +178,6 @@ if(NOT WIN32)
- 				COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto
- 				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 
--		add_dependencies(sinsp grpc)
- 		target_link_libraries(sinsp
- 			"${GRPCPP_LIB}"
- 			"${GRPC_LIB}"
diff --git a/dev-util/sysdig/sysdig-0.26.2.ebuild b/dev-util/sysdig/sysdig-0.26.3.ebuild
index 2d4c0de2f51f..2d4c0de2f51f 100644
--- a/dev-util/sysdig/sysdig-0.26.2.ebuild
+++ b/dev-util/sysdig/sysdig-0.26.3.ebuild
diff --git a/dev-util/sysdig/sysdig-0.26.1.ebuild b/dev-util/sysdig/sysdig-0.26.4.ebuild
index a6c3bad4d48f..2d4c0de2f51f 100644
--- a/dev-util/sysdig/sysdig-0.26.1.ebuild
+++ b/dev-util/sysdig/sysdig-0.26.4.ebuild
@@ -48,7 +48,6 @@ pkg_setup() {
 src_prepare() {
 	sed -i -e 's:-ggdb::' CMakeLists.txt || die
 
-	eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
 	cmake-utils_src_prepare
 }
 
@@ -66,26 +65,18 @@ src_configure() {
 	cmake-utils_src_configure
 
 	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
 	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
 	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
 }
 
 src_compile() {
 	cmake-utils_src_compile
-
 	linux-mod_src_compile
 }
 
 src_install() {
 	cmake-utils_src_install
-
 	linux-mod_src_install
 
 	# remove sources
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 1fb8f64baee8..cd2e16bbe57e 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -2,6 +2,6 @@ AUX trace-cmd-2.8-python-pkgconfig-name.patch 987 BLAKE2B b7fcb2f8813f924692647f
 AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd0753ac9c458fcee43056ec05e420fbeaee8b21cd0c4d38e67286d86ddeb6e478fa1e82d45203f538921bd066aa4ef2ad1222e4d7 SHA512 5446a13e82c9be3c6ed2bdc17b91495499b9f28eaa4045869bbf847ca14953cf36411e86136133b22bba05dae46325b522c00939c33943d5135c17e845fad94a
 AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2
 DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
-EBUILD trace-cmd-2.8.3.ebuild 2473 BLAKE2B 6c68ed92d821004814532e05052e8a2b883b03177d649460a22f1b9d703a893d0b2fca0fccd9d394d176857050edbc6c35098411719d6d23f3bce382f46414ee SHA512 0604c47e022cb8f24bb23cddf9844f06d354a14aaabc1ef6298af83d0640bacefdd76d586a4a78def495da7ee35efe8702b7e8712690138f1e41ed28095fe9f6
+EBUILD trace-cmd-2.8.3.ebuild 2472 BLAKE2B 5b5ba47290bb699ef3b89ebbcc9cf5c6d952584e3a6022fe905ac7a052ae426cfe08e7172c56fe0a69185b5e696ec1315cb664e3323debddf9d8f3f561cbf549 SHA512 aa4c06e10a04a9cae92c0f48f8c6a3c04ce12a857e629be55e7c6040b4646dd4c9fd407521354784fe199f51f9479ada185af5cafb861e6c02145e3007d5b87f
 EBUILD trace-cmd-9999.ebuild 2226 BLAKE2B f45c9cde1aeda622e0c6786a65bd8c92f4c2372e2b73cbb9518467e0a7b90b15e41f7df71bbd2ed8f2246d8eaed684db5af9236ccb102e9a3d2d15b5ae6ca1fe SHA512 51e521dcc22ffca22d9f348d2ff9f14ac5473302200cf526d7eff092dd0ec39e2fed52bb6f654aa3615b1b295c527e6089122930216249eaa4848bc96ecbdc53
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
index 81b74d429056..accd695be067 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index 6a700504cc4d..aef8af074a06 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,4 +1,4 @@
 AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
 DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
-EBUILD wxglade-0.8.2.ebuild 1101 BLAKE2B 25326cd03c46e54954bf83618bf898439115977fcf191a135522acd3b8aaab437d483545bf53a507da067abaf24f0347055584c843b4e7b1b65256a4424ea71f SHA512 9609d6234b87d9f7c39bdfa24b9858fd538b3b1ea941e14875871384ff294339355dbd520abf6230b24320872896035ffe5e600b7bc1a684985d8e8a65493aec
+EBUILD wxglade-0.8.2.ebuild 1115 BLAKE2B 40eb1248f22f394e4cf3f55507f8918ef3a1f24ab70ef5381fe655ea325a7f2556f9abcaefbaad14d1923ae9556f75487b539069b4e7960812d43013bcddb2ad SHA512 8148a0c55e80d6257d5dc815c64130eea2b67fe58fa65d080cfd3df0db0777dc33e0f2078d57163325461f25ae66abe812ff246419ba00108b8cba3ea29fb28a
 MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/wxglade-0.8.2.ebuild b/dev-util/wxglade/wxglade-0.8.2.ebuild
index 98df5e4d387e..2cd38d3eaa2d 100644
--- a/dev-util/wxglade/wxglade-0.8.2.ebuild
+++ b/dev-util/wxglade/wxglade-0.8.2.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
@@ -22,7 +22,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
 
 RESTRICT="test" #656934