gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /dev-util
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
87 files changed, 312 insertions, 195 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8c2c521c0682..b7da6a68a0aa 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index ddad42ad5f94..0b21b011ab41 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,5 +1,7 @@
 DIST android-studio-ide-171.4443003-linux.zip 773670325 BLAKE2B b8cff0b85cf20f9d181b4f5c29dc75385539ca2d8e2677211c6c42fcb115616c4208faa5df8cc8a8210c4e9e869d00ae42e7c9dd212756608ff9d4f47bdc8943 SHA512 ba91309c59e4f258222f5b5978bc9ea048476bab4d0662235c7900590f9d58716dc77e937464fab0e57752ee18353a13c163ee98615474f48d0b99e04dae1d34
 DIST android-studio-ide-173.4697961-linux.zip 894046861 BLAKE2B 233fefaed2a0b9c70e6cabc61663dd15d9a2486d1df17a45fc71d9c542ffd9212fc36ef54e22032ffa709a76aae796b2f14b189e31a79e96dfb0736017cacae9 SHA512 787a1cf1ab74f84cd39f663496b7b0e1cfc77130d4a7b8b732d010cf2dd553865f368463e07220144c7e9f7d5c12e20ec149ea05f5ee2f8e291537a99d678ff0
+DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3 SHA512 121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
 EBUILD android-studio-3.0.1.0.171.4443003.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
 EBUILD android-studio-3.1.1.0.173.4697961.ebuild 3074 BLAKE2B e8eaa428420dddd0e0fcd5ace1dcd0eaf64b6ee8011d2ca961e8ee166d0e1f7ace254c3b28208b1b19558910842d9c9876e8a56fc2781aacb5c15e61a4fb6356 SHA512 1c6ffdf4f63b5701ba2633ba3c58dace43f5921695c9bd3165fb0a6343ca024dad2655ec328237e22e988d45488d57256c47bcac73fa02e1604329d9bbdc50aa
+EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3074 BLAKE2B e8eaa428420dddd0e0fcd5ace1dcd0eaf64b6ee8011d2ca961e8ee166d0e1f7ace254c3b28208b1b19558910842d9c9876e8a56fc2781aacb5c15e61a4fb6356 SHA512 1c6ffdf4f63b5701ba2633ba3c58dace43f5921695c9bd3165fb0a6343ca024dad2655ec328237e22e988d45488d57256c47bcac73fa02e1604329d9bbdc50aa
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
new file mode 100644
index 000000000000..10d45b8040b7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/lib/libpty/linux/x86*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
+	opt/${PN}/plugins/android/resources/perfd/*/perfd
+	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+#	dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	eapply_user
+	# This is really a bundled jdk not a jre
+	rm -R "${S}/jre" || die "Could not remove bundled jdk"
+
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	# Replaced bundled jre with system vm/jdk
+	# This is really a bundled jdk not a jre
+	doins -r *
+
+	rm -rf "${D}${dir}/jre" || die
+	dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
+
+	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
+	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 30b59963c303..d026c18fb4d5 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -2,8 +2,8 @@ DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e7326
 DIST buildbot-console-view-0.9.13.tar.gz 640969 BLAKE2B e0c6449c8208a34e568ed632be61fda0ae6ef0b183cd53e2288e1b89e03df6a874ec363f3cfdfa15005bc2913084eaf8640e86abf1ad2d19609e7b4c818f7b77 SHA512 16a3186a97112473fa1f7e811ceffe9f829d6181544e62290172b97b898ddb189fe8e67e223a3e02c936e61fc857a05e0b353dda7e5d4a3ce782f74a32515d2f
 DIST buildbot-console-view-0.9.15.post1.tar.gz 640548 BLAKE2B d28d3fbe40a8ceeaf574d2e8a9a6938664659dc6221a9e7e288c98b771cf7601a8db125dfb3cd71c500aee470a2b476a9daa0d5ec55a83758a96e97e14441def SHA512 42ad7d9dfdf0b3b0cda8d8dcd3fb2bd6734a775755fdc4ebe79d562f5ffb45d0e25d3ece15dec4a7542dd29e45a721e683bec416582901dbfa519c8da76cfa78
 DIST buildbot-console-view-1.1.0.tar.gz 640524 BLAKE2B 038412232299b9dcf5b38c0dcc646bce0f02c817b319bc796268e0bdcd10db0a82dbeb692850ad252246a2a0b48ceca23fd5ac900d46774b64ea19839673f607 SHA512 c45962f73d8e8214518c09fc3163d20f93ac4f55ed547dc90f4116906b94a01384bdc28e52d1b850ba34077c4cd30cd3e1f2dae23c01e233e5745de181e2dc6c
-EBUILD buildbot-console-view-0.9.12.ebuild 1136 BLAKE2B fbbb319d895f74809a819447eaf9b83f9e029997c954e07b830417d6701825fe22c4c93292dd40fc3eec659d163f7c56accd0581dc5cb6485be3711fed07faeb SHA512 7866f6bdfe15209cc49efe75a7c5a4d9f9363745647a6e75467b4ea6f0e37e680a3217fd5ece318efb65593cfccc5fa94f6be337dfe8d94ce32ce7c0b90489c6
-EBUILD buildbot-console-view-0.9.13.ebuild 1142 BLAKE2B 12ac650a7f30ec0ef870ca23a3033773d8d0ff64d3d6f578e948fe885f056c8c19a927147a0fd55cd55e4e6d9a5d977e4128c231e62647896353210a7373bd7e SHA512 1405d6aae5a33ce2fc000bed67523ecc07903a6560d88c56b8e4a55e540c7a274b9d24ac8f6569e9a3cf8e95607ad700e3f241390e6259fe13ffd68bd4150799
-EBUILD buildbot-console-view-0.9.15_p1.ebuild 1142 BLAKE2B 35c970b04a13799755d849823ec8575e0a32b5a10ea98657f3df7e26f3014d2ee9fd57b373d7a7a2f45f04b5ca9607d98f73f7bbfb1d737d15b030f5ba5b1c0a SHA512 1def7dd2acb2266f0047d572af7664beb251b5ae629a27f29ee454d9787469f0476a35f89c71450dcfb8af6ee065a41756fdf0199d7215dc1492423faf5624a4
-EBUILD buildbot-console-view-1.1.0.ebuild 1142 BLAKE2B 35c970b04a13799755d849823ec8575e0a32b5a10ea98657f3df7e26f3014d2ee9fd57b373d7a7a2f45f04b5ca9607d98f73f7bbfb1d737d15b030f5ba5b1c0a SHA512 1def7dd2acb2266f0047d572af7664beb251b5ae629a27f29ee454d9787469f0476a35f89c71450dcfb8af6ee065a41756fdf0199d7215dc1492423faf5624a4
+EBUILD buildbot-console-view-0.9.12.ebuild 1137 BLAKE2B d368c831ec9a6daa68068a4c5c405c94125332203f9001decc6a41a5341977fffee31cbcd06f8d38534754cd4af589a79a66c33be3656b19e47bb25da22c1d0e SHA512 0ced9c28b66484d85cc94b0fd75003e6a27f82ddf0acfb2eef8fe74387e35c68f1a695edea9d3bd14c3ec2d385b97d60846c13e4856ecc8209d0b337afeba98e
+EBUILD buildbot-console-view-0.9.13.ebuild 1143 BLAKE2B 97ebe285e528c2ba2123f343826a4dcd33669dbe2d61ab36cc4dd7c4a1852c3dfd47ddceacad2fe1d0a7ce082f3a0d1cf06b89378413d16c6989c26df9234ec8 SHA512 4f220cbf6fb63aaac0899a9b31cc003a641c92adbbcdcd3ac091dd903324f518c585fb023bb3e69557b9c492fcecf93b2b309e160a84185b1d0ad6a71ebf6540
+EBUILD buildbot-console-view-0.9.15_p1.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
+EBUILD buildbot-console-view-1.1.0.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
 MISC metadata.xml 771 BLAKE2B ad890754ce96954df2723ffe6302a5eee847230b91df1dd3658ada80aea2d6bd92fdfe65cf21d5aff257d8e736635410642deb48fe7769a5651a5073f6ac42e4 SHA512 a8edc15d355234948b35fe2d563ddc7d27b82195f706eb935fd8145836a41b1ddf2adc40c402a806334b30a2ba0c156b89f5c355a53126f3ea69130b214bc66f
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
index 2174fb58cd4e..d81e32504b4d 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
index 5bb7e17a78f2..ea6c131f8ace 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
index 656a9b1f4ab9..23b0c0ae9c77 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
index 656a9b1f4ab9..23b0c0ae9c77 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index c4de0be1f7a2..6f1aef891c0a 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -2,8 +2,8 @@ DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23ab
 DIST buildbot-grid-view-0.9.13.tar.gz 639145 BLAKE2B 31194a53bdb60958178371e10fd2ed0ca05d112d9a3510147d965811bb31788bd432ad1ed1c4690f190070ec5dc683cc43ed8a187b26eec5b80b7f23663e7418 SHA512 2ae54f27cafdf1e4d5c283bbe60db8bcc38d3ec133069114bfa952ae2f49306c7a83d57fd4749eb923567e22fdb0577311532ef45eb8630fe01a7c3fea6e2cef
 DIST buildbot-grid-view-0.9.15.post1.tar.gz 638877 BLAKE2B 7ef5a309bebb1fed0ff1b0efd016c9d895b44a03d0c3743690d6fc04ab669d6409af93be62ffa1ef0cac9465ef7940b48984ab423a22023800211514335d8011 SHA512 741dc6ef728f291d44663bb6f031fd0895b67bb770db053695bf276ae3a6a0f2e6e73eae7c595befec2f917e766b13913486331297cb048f000a124916ff6405
 DIST buildbot-grid-view-1.1.0.tar.gz 638856 BLAKE2B ff6d055d6f0426dba6c8652da3f4dcd66dc98d6d85db19eda87e48c8107a06164ab7d6978d2aae9e76dbc3212a78d94e93598937d72e55728aae6b0bf53c50bd SHA512 64b2c3f1e45232d7dae10b4505f4aaf9ad5b72dd22ad5be4aa5c4265a6a315ae65f72b7a8006a6b0ee887e5d30b2d28fe5085afa683efeda2ede8a7c310bb750
-EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1105 BLAKE2B 1ca4d05679cb084138f54ece86ac70535acb50d6d6ab32252e9c23c378ed4160577b590863ce54dd2f2e1d875de1e83574074e7a64c931b505705d4024f84d96 SHA512 b9cb2f4f62341a400c1c4f57d2798a64513156152f547d9a95df571f61d5e8a427aa155a75210ae485464737da4bb797e76687d1c4eddd16d528649ca1f1544f
-EBUILD buildbot-grid-view-0.9.13.ebuild 1107 BLAKE2B ba6ca294b78bfda780f96a46412e14798d107df9cafba4936e8c55ae6805c3d4819cedb9f857b143465211c0e9a42e2d1fe63cd0c0027cf259b84464da9fc893 SHA512 26aba4318f783c08a1f816723881db6f5406b518d5002edbbb0a0878a4cc6a23294a079dbffbd9dc4e88a164f7c8f0b6537f23a5e89534a27caadb61c21c9855
-EBUILD buildbot-grid-view-0.9.15_p1.ebuild 1107 BLAKE2B 75d3ec7fb723914146e9f1a57cf34313b3d46ce03457f5b0a34cceda17805ea0159b4abfe6b705ced4b3147df9a91e1b8dfaac13225846d5fcd773b5a4c732e1 SHA512 4ed5e9f9969c7577341b3b75688c3036a75291e13233d20e555436fa1fb7ae7a545dacbd2170104cebb9ad1ffaf9143810550221fc0ccf29d78e5a1a1deac7f1
-EBUILD buildbot-grid-view-1.1.0.ebuild 1107 BLAKE2B 75d3ec7fb723914146e9f1a57cf34313b3d46ce03457f5b0a34cceda17805ea0159b4abfe6b705ced4b3147df9a91e1b8dfaac13225846d5fcd773b5a4c732e1 SHA512 4ed5e9f9969c7577341b3b75688c3036a75291e13233d20e555436fa1fb7ae7a545dacbd2170104cebb9ad1ffaf9143810550221fc0ccf29d78e5a1a1deac7f1
+EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1106 BLAKE2B 500344fdb38a0feff18742dfcbb7e6bf9aa05ef36c5199722761d89c67dfc6755a23c1e928cfa9ef126949c8826e7d334f49354ce7e9f1ee21c0fb4c0c72efca SHA512 13574fa3e849506836f4ab2485362724f9dd5ed26dd25439efd12b5b4465f25df6cbf51d4e8fdcd921247ded4920371955638b9c2356a0041dcdd57046909118
+EBUILD buildbot-grid-view-0.9.13.ebuild 1108 BLAKE2B 702acb9e8edca38ee219e85bfccbf81608e09cf7f217662b0983e8d3574c15d597db9c699ff3e9c6ed15327f7e5520c9ee92ea3b72f89f39647167c74762c05e SHA512 00187c14fc11f36af5594059937b9610aebe19ef96163264721098118ca09a881bcb378c7f10ba64b05c90d9a2fa8edfa076cd359c130a07eb8ad0ef07a381e2
+EBUILD buildbot-grid-view-0.9.15_p1.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
+EBUILD buildbot-grid-view-1.1.0.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
 MISC metadata.xml 750 BLAKE2B 8f279073c8c3a1f6a12ab347198a6ed24692d1ab0271bfdbe479da28aaee5c51843218a93b18ab901bbf78a2c36af5940cd2bef9273c9402076b88bb46a5a104 SHA512 8ae01c42d25b7e2d957968dcbe8c89e6b1efc9005b5021a7190c585cf586f37ce9b6168b29b58844149a8e869de9374cb611df6668476152fcaf393e55577fb3
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
index 08cbe25a4443..2da8989d872c 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
index 3844c8ba7fd2..cc4c6a14d1b3 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
index 478993869f40..e30008fccea8 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
index 478993869f40..e30008fccea8 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index eb9570ac8352..e4045bfa8efd 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -3,8 +3,8 @@ DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985ac
 DIST buildbot-pkg-0.9.13.tar.gz 4448 BLAKE2B ea270faafa4a271e11ea1e64191dac0aaf9b6bc08e4d70e71746f9e70eadbe9d70555677bf7e9b264ac9146db0cb1cc639d86194b5280ad53fbe29bf073ee718 SHA512 1cf3ea6237062a0d8c3955ae75b76dd1193ed28c32528f341b242fe6dcc50f4300366474dcdce27246166b35cc1ca31df556b5e6481f5027d073122f1c00362d
 DIST buildbot-pkg-0.9.15.post1.tar.gz 4916 BLAKE2B 17f38dd7c0d70a7d07fde7c53128901dee24bda0d6503bea1dacfbf6f14bba17b645f5067e0932a5f03660330c20f647fe6d4c2125fdbf714a5828de314881bf SHA512 1951de2df02d50ba1d7c3bc6db9084acf65f88a9f9f73bf26715c7d14521403580a26efd8294aa5f2de40b986032dd78fe52230e58ad3d298f39d229481fc286
 DIST buildbot-pkg-1.1.0.tar.gz 4855 BLAKE2B 29dddb28f8d5b3bbb82b24959077597e0832b2b85308132e2bdef03a28e84dcef400715b4d7faa33c42b3ec4085c10d825a50dc0b0d55aa23a13e1e02b0ca3c5 SHA512 e48d8086170d9c7fd8270a2401ee5f0980dcd2a4554218fd9ac1159d9f08f4a82fc03a2bbea27d169e9f0e4219d9ae8331a522cbf52bdd2e51bb13527f4dbd8d
-EBUILD buildbot-pkg-0.9.12.ebuild 1063 BLAKE2B 1afe848ef0f8bc352603fdb3b2534e7383895509812ad22db5fbc831b6e429f1e59b98ea863f7023aba4d59102aac39fba6e3ec0a875063dfc56e0af6e6320e8 SHA512 2a8373fac472b27baf4ba075f9caae9afe8f1984fe413f0c9ece00e8d4b20c0eebda153b1e7fbb60e55640522eafe76aa7f3e519bd707bc26c418b7fbfd36318
-EBUILD buildbot-pkg-0.9.13.ebuild 1069 BLAKE2B 448c7f3109cb8fd6f3421399b1e03af4f92f2bc2f7c4ee34bc80c77418eb3f1ae2dea8a70ed487558ca76d5947efbac1653df29e69dc23f2ff2cd1fc64c1fdd4 SHA512 97a401a167a5ac7ed30f4e0717f67ef1b31e71b52f49d83e8d423618bc56a4a811f287c3231d027ba741bc5344b8edf5d757e94bd17c6b940f92164bd7b6397b
-EBUILD buildbot-pkg-0.9.15_p1.ebuild 1148 BLAKE2B d84df11eef39b769686af6a754498a42cedab7174794af4ace9afcb3d7a6b61fd1858400e5e3fdb686699cb6f464d54ee18b5401da88a3545e67c1119311736e SHA512 39a5689281bb5d347ec038ae87cc7986098df157dffec6663b499dad94fbf5d1fdab441b2fb3cbfaea99ca27739ccd50120d973b539c5e63e9260aaf40d186e6
-EBUILD buildbot-pkg-1.1.0.ebuild 1159 BLAKE2B f6d5732846a6218cc126685e0b7958c2ffaf3a83fe14b4c3f773113d2bc3751aa580fce410181bd926b7fa263bb2e0fee15698e1b8e64bf20b5962755738b918 SHA512 a263e9a0a91af251d73ac08d0f11080293d18ff7cf9b3e7c2e9cc64d5c48295df19636e4ce137ce8b7cdf806a55a93c8d2761a2d625380f5c0d23c3a88bc643c
+EBUILD buildbot-pkg-0.9.12.ebuild 1064 BLAKE2B d1cf932da10b51bbcc4d9fa0684bab8707a0136839f39706f28be58c2b555c4fe4c0b95d45edc0a3159cba45595b206eb3e732aa661cf9d561cd010f7eb783a3 SHA512 99012816dde84957e7134df4bb10f93b2b513b82a28b229b93ef4bc933d79d4a1949129cb88cf786b87f2d0fd654ba9d6e4a5729764a582b97412dd0ff3f159d
+EBUILD buildbot-pkg-0.9.13.ebuild 1070 BLAKE2B 1d580c2f59c4f9540d69a1a4fb9eac94ac443d3abc16b235c71350e0d4318153955a0691e0c007d2b23f86712525fad489bc770ee2d8f2d74f993076b042eddd SHA512 a1cc5494e321b7373ce82214ee4a5bffc93848884f39a340fc7db25feb64d9dcdeb055aa5e84796dd61aa02491c5e2ac1cc7b4f260aadbabdd918f8a5a5931af
+EBUILD buildbot-pkg-0.9.15_p1.ebuild 1149 BLAKE2B 21ae9a3d626a5ffe3fa8b74411a91108f1b8b13b16d6894c6d2394809f45b5007bc084bf0c47740f5723500695e8673a00734156df91bd1ae69f22862d7ddada SHA512 eaec282d3963e29742e7f71a84593d0bd5f70314e0095631f0066bb75a898997917e97b3ae070f231e911711ed66533020ffbdaa75887a5109ebc0e1c90c983f
+EBUILD buildbot-pkg-1.1.0.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
 MISC metadata.xml 1309 BLAKE2B f2c7d28ec175efb170fc4f556b4f0d8beb8e6ca809240739ade425d6258d6617ed97a6cd5abd9a0f9a54e07a520113ad65dd2b912497adb89ef2cafa74038a56 SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
index 1e8fdab99c2f..8985c18fefb6 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
index ad35a561a800..31b0738d915f 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
index d846576354af..82c5f2ba229b 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
index d67047d35025..46595012d5d7 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
index 6798c9e30030..e50f3d398ef7 100644
--- a/dev-util/buildbot-slave/Manifest
+++ b/dev-util/buildbot-slave/Manifest
@@ -2,5 +2,5 @@ AUX buildslave.confd 217 BLAKE2B bd752869bc07ad6636b0035ad8f030536abbd9f703a7180
 AUX buildslave.initd 1140 BLAKE2B 45de77ef9400a19b98ebac2ebd7f438354466ef4a2fce407e9d57f0cef6f081683a79d7c5651c1dd14ffbc3e834e980316361ec3a2ec1c29bad8d86bd259092d SHA512 217a9e3f774bcc7e7773d6e3047dbbabe196d168f814485ae54d1a94b330616fd80ad82bfa67c9b6185c39b780eae7a71776e727810ff4df337baca44d5fdbda
 AUX buildslave.service 386 BLAKE2B e50acd31037a91f439330f09e74321e7b8eff67711357c28d661b124fbc36e434a1707629d4ffe151dbf53a7a5600004c3928b511c0aeda672be66e9e492fe18 SHA512 53d9ac95006fb4e43e0bfa82c935e17c577cd292c8fea373247e4cd9bb21843f2f82971ffd37f50aa16fe258139c22adbe24570e3017fa529f2258a1d395d8dd
 DIST buildbot-slave-0.8.12.tar.gz 118339 BLAKE2B e516a8fd212d92e1cb1ed9bc11d70aa4baaea70fd1aa7f4fa239ed1160da51b96391d252643a13a72786d0b676e0e1780d31f998da7b3f90f1b73b32adb6b6c2 SHA512 74f7f9ffab946000a5d31ae28140698ca259ba5b75815ed839d51fa5d9f702e998b61a716b66aab7946b6143d329244f2403d9b98cbbfc70223b691dcb70f0bc
-EBUILD buildbot-slave-0.8.12.ebuild 1563 BLAKE2B ea0e82904472cfa14f66a0056f0db0c4a549410e5c7f015eb5e6a6221af18a9b85a3b03217146a6f1cb3fe33f4c6d50edcdd511a4c911853cfcfe347a6a425b0 SHA512 4a95ec29abe19acef12c01aa149eeba1018de96de45b7ed14a6643066234ca716be666161d206f051172a60aa0b29e13af6ae27a7287d717b0a62908190c0d45
+EBUILD buildbot-slave-0.8.12.ebuild 1564 BLAKE2B 17ac47bee796bc8f105cbd47eaf6f781190fe3eacac607f8affb9b690c00bd70733218d4661a8ed611824dcb3c085537ed6e535a607da83f08ecf153bce375d6 SHA512 e888c3fc0525d406778e51507bffb09f63f8ce553b615bf146a24cf1d91c981e56eee6c4e60ee144d6c30089f58ec1e5559873ae35f9e02dd9bfb23224a09f72
 MISC metadata.xml 384 BLAKE2B 90622968905729ec77151f4afd2ffc7b0561ef1eecc45f1986fccaa0281ae547d3fb88a9d9a63502935070dabd9a0109aa5af76b35132d70b60455d1db8f3864 SHA512 339c2747b1d392528c2b53934ed652574db095407cba130d0c8deac06570dce89e01f5fafb1e9ebe585c88ee3cdcc9f16747c08cdeace6ad47ebdff7f9d5302a
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
index 4303187015cf..bb90f9646953 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 readme.gentoo systemd user
 
 DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-slave"
+HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-slave/"
 
 MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 0a530b47c9d2..851bb12ddb8a 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -2,8 +2,8 @@ DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149
 DIST buildbot-waterfall-view-0.9.13.tar.gz 714287 BLAKE2B addb1cbda2f751192533b7074bd5fcdd36f4d328ad555cba9c821b0648ceceb5ad63d2db85dbac9cc813d6665dad8f5725e5bb37123b6bbce8310740a3597d1f SHA512 448b1e0b63aaa1d33a7595262901373a4c9cd30e544bdc8bd2d672f8aebfb4d90aebb31ce4d78d59725bfdcba019c3643e9f6d66d1493fcb8c77fb8acbadfbf6
 DIST buildbot-waterfall-view-0.9.15.post1.tar.gz 713929 BLAKE2B 4940cf9224a1924bcb63ea7078d606ec919c0602e1c6c5d3cb53318a91e285add2a75b05ad46599857f2b73cea501754ac71e54d3ba6941a18685eb3c05e9d39 SHA512 841186372b8ada370c28bf07b2df9ad91d298913202c937e6d459dfede24293f9aef1d330ee07a6c97a91bf75b4ceae9f87b494f173082ceca1fb2c5f04abe79
 DIST buildbot-waterfall-view-1.1.0.tar.gz 713901 BLAKE2B 73366eac6a7e0c9e758209b64e2f086148612e9db3459a5babeb272f515d0aef2bf7bd3dddac6d57955a0ebb3e065fdd3eaee31196cf5bcb9afac269d154c4ce SHA512 f6151aab01b680aa77b17c6863e3d33557c2436a2ffe35db0b75416a1d7facd3927437c8bd659d8fbda339e4f77412ba6df605500e6b31559770fa3a3c0eca59
-EBUILD buildbot-waterfall-view-0.9.12.ebuild 1140 BLAKE2B 8adeab2bc4fdb5fd778e7fe5e757709370f90d69b92afe2c6377824fe95cb1f9917ba67321da1bcfe2dd01821fbbcd0262f9c1f7c69ec54cfe032543ecd7184a SHA512 2c79013b08eda5c7ece20d0de933c0482efb8662e564afd6143d624e2e2306a18e63414200036e4e5d1dac70e02d4e021cd1a004eac9aff0298c8227d381cd3c
-EBUILD buildbot-waterfall-view-0.9.13.ebuild 1146 BLAKE2B b0dac6ba2521c01ee2138b92e2508dbcb7bbed5a3d9426917b9ffce088aae744423d230070b33f3bcf329505993e1baf8d5fd299512ac9c23c1ec681e966cd56 SHA512 2fef1c8b9131e1c91b8e99c7fdb35c2dec5af7789c368f07ea973bf5c92f1ab6dfe4feb6cf76294a1de918e6acfb416f98e7c91c8a5a954617e593034a5a949b
-EBUILD buildbot-waterfall-view-0.9.15_p1.ebuild 1146 BLAKE2B 8be5e71d41f04ed56031435f3f4e330a76681b58a3785f3f6ed41bbd752e3b3b9bf04a2db0ac06abbb2b47f26e68b42b1c83995ab25e61dc75831915c6b9b11a SHA512 903c1684dbeea6844aae14d8b37334fa039036de058af40dedec5c9fd911a58c612052570585e45368d362901eade470e92b428e96aaf725e63818e7effc51d7
-EBUILD buildbot-waterfall-view-1.1.0.ebuild 1146 BLAKE2B 8be5e71d41f04ed56031435f3f4e330a76681b58a3785f3f6ed41bbd752e3b3b9bf04a2db0ac06abbb2b47f26e68b42b1c83995ab25e61dc75831915c6b9b11a SHA512 903c1684dbeea6844aae14d8b37334fa039036de058af40dedec5c9fd911a58c612052570585e45368d362901eade470e92b428e96aaf725e63818e7effc51d7
+EBUILD buildbot-waterfall-view-0.9.12.ebuild 1141 BLAKE2B d4d2282e69347e5e25cf4ed70959992fb29f4edf6b312cdb6672b6fbf0b7e4013f1efa93eb8ea212b9eac6d1d88dd4c831b2ac7633538df69e21339ab80367f2 SHA512 9b8e9c8d02d726f14a7126df8f92b73bff7715a69d49b3d54e56f9103e8311cbe2b6a9f9ecc02ab5ab69ee65b2af679b3c22e47c10c52f40b4f0919e738871d5
+EBUILD buildbot-waterfall-view-0.9.13.ebuild 1147 BLAKE2B 0d51cace1706245d4d0ae46d0fef89b176226735d432093d1918dcea5872630d9a3390a01c85a2163cafd938f9b71e95518b999c07432f2f0444126d8957cd5e SHA512 e12a6f172c48da675b169041262e1b89e51456bfb54d9391459be065105a8e927b2f5d7ed79f7fd98a7241a06d4f6536cb8bf83b85bfe8d9cdcc9dbd4ca85534
+EBUILD buildbot-waterfall-view-0.9.15_p1.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
+EBUILD buildbot-waterfall-view-1.1.0.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
 MISC metadata.xml 791 BLAKE2B 4e469a57580b4fda1bcbbde4580bdfd8e19769784a1760ddbd08b9c79ebdacab273be9871d87afe32f21f12efc2697f53f02367672660932faddb230fb8981de SHA512 0a5df49353620d0c31e66181179c213e7add694cdc141715635650a1a7962cfd96f5a965e42ca8f860d6d24ad9be08001e4a9b2ca49ef31f529f9aec0878cc13
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
index 02f64d7db13c..0f150c29112a 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
index b580a1ed6287..ec80689f3460 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
index 42f348b27429..85e04699e657 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
index 42f348b27429..85e04699e657 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 778618f054ad..cb34c585f158 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -5,9 +5,9 @@ DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015
 DIST buildbot-worker-0.9.13.tar.gz 102710 BLAKE2B ab60bc2607a706ecc760c2439655bca3f328d773fbb07e73c994f079356341a251ca23c573a71cce92dbf71ba62ceaa70210f8925fd4d1cdfac335b2a485ee9f SHA512 920f76d70c88a660b1d4c15683847a144b8dfaa01b91742ff2fedbe013ab030d3c5f07b6308f8bfb3f7bf3c2f805f7735d007e67257ca5233d2b585518f79e40
 DIST buildbot-worker-0.9.15.post1.tar.gz 100901 BLAKE2B 5e4744fcd69e2920e0ca9ba0b1aa77ea5f62ed4aecc9f00df17953dc813e1f8d61a859ab0aacc26f88f51d281574a8089b849fe063d55c8649c4a53b528d8ba8 SHA512 6ee23f1dd52672646f28978cec3fa9e29b64cae84f524bbcb6f2614a4a56e49e8363975b89cd3508e78c9779233a27403e46fc098be0808d6cfc1e6aa6b8499f
 DIST buildbot-worker-1.1.0.tar.gz 102142 BLAKE2B 144587edf2adc9d99837dc549b4d0696761f6cb3c959d4c133a5136606934ce03836cd1fcb019e7bb8ec473526c2ac07146c4820ef4d8b17ed9d843acd6c06b4 SHA512 77c46b3c9a16847eaf72de1dafa871a3242b66235c94ce8109f953db39aa4b74de2a03ca7ff06e91f8ea0751ed57e6ec1f39336912d56346f1bed171f597f6ed
-EBUILD buildbot-worker-0.9.12.ebuild 4803 BLAKE2B 663737b1f0761dccef1ea81a5af5eee4620db19e3634b6c074e83e08faea1e4aa991d686f9b9a4fbd4c9acb8440ff867ff33f82e0e357a522023cce8f34cbc46 SHA512 3d2d7a7c6d681f68ba262174b56b656e1c0c1fc7921649f71a636b15d36763218966c20a92c53807c838261e0af449c2940c2c195a012383fb69b5873eed4eef
-EBUILD buildbot-worker-0.9.13.ebuild 4810 BLAKE2B 636e429914ab2557e2ec40941cc321611da24c42f62fcb3fccf30c22ed7299538032a1f6e16051ab1182e7892644849e351bc5da04efcf6cc930995cca944c59 SHA512 861c05a7d00154763c4c26fd0076bd9f445ed43383d43ec4e96242c71f704b38e5658917a5854d55e5deebdbbbd32b1a8c94bd84ea8248daa96fa03f93aa5db7
-EBUILD buildbot-worker-0.9.15_p1.ebuild 4814 BLAKE2B e28ae116c41bc904541c19c37ea0816c826800de664a289a28f0d37531acce456f5cfe44c957fff62c14f0996415c3b88a56c835a8cee5bdb1c3cc5ac70cbb01 SHA512 78361e7cd1123ef23c928019395aca64ea81a70c71b712e2302c6c3187ab596e5ebc30ce1f95823ef3a36c2e9b3e0a81d79fd6f5f64907447c5c2e4583ccb10e
-EBUILD buildbot-worker-1.1.0.ebuild 4814 BLAKE2B e28ae116c41bc904541c19c37ea0816c826800de664a289a28f0d37531acce456f5cfe44c957fff62c14f0996415c3b88a56c835a8cee5bdb1c3cc5ac70cbb01 SHA512 78361e7cd1123ef23c928019395aca64ea81a70c71b712e2302c6c3187ab596e5ebc30ce1f95823ef3a36c2e9b3e0a81d79fd6f5f64907447c5c2e4583ccb10e
-EBUILD buildbot-worker-9999.ebuild 4814 BLAKE2B e28ae116c41bc904541c19c37ea0816c826800de664a289a28f0d37531acce456f5cfe44c957fff62c14f0996415c3b88a56c835a8cee5bdb1c3cc5ac70cbb01 SHA512 78361e7cd1123ef23c928019395aca64ea81a70c71b712e2302c6c3187ab596e5ebc30ce1f95823ef3a36c2e9b3e0a81d79fd6f5f64907447c5c2e4583ccb10e
+EBUILD buildbot-worker-0.9.12.ebuild 4804 BLAKE2B da36c63759cb3eaa6f63fe7baf895800244f7b334d794bc4527e40db94da29c89693181e6061885dfe76dc252297a6da216e72d1e5ce48c2ca575160a2816530 SHA512 f85a52be1d424547027b7ff1f62b8b68ecfbbb689222c652750ece87f6b4cc09c64a92ee7fa40b1b3c17775009a31d3c593554c5211c189c8a51754ef3646d46
+EBUILD buildbot-worker-0.9.13.ebuild 4811 BLAKE2B aa27842388456ee6deb710df750bcc84d6550b4bc67d1e37892127ae3f174fa7c170e9c07e6d3e6447abc9f2240375c8139475cb6c97d34220596dd4bb003645 SHA512 883cb6457f5f71ceff7becf1ca035466dd30ee796a1a8e0ec7bf61f5bd0fde926d21b264e3c1bc5aab8144027baefdd5ff27c55a2a669059a5a6f5e9cd3b0098
+EBUILD buildbot-worker-0.9.15_p1.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
+EBUILD buildbot-worker-1.1.0.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
+EBUILD buildbot-worker-9999.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 MISC metadata.xml 591 BLAKE2B e5b06e8136a2adbab54c70e416a7117fccf3ae0a33bab129e1b5db13096cdb8716ca09606fd67a9c82088a0e40e0ae8bc3137262086c8ebb45bbc6993c14984a SHA512 d3273df1c8e6284b75ab5cd15cc5092d10db8ab8c0126e5eb21425bf3f2cab0f582a4e1bdf1e96881cc580a13047ac9fc72e09474f03dd788f85cd7962be6257
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
index faea7b163e54..d78740f72876 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
 
 MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
index 445437167665..f1331b427b7a 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
 
 MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
index e92ba553318e..dea70dbdd5e7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
 
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
index e92ba553318e..dea70dbdd5e7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
 
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index e92ba553318e..dea70dbdd5e7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
 
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 7e8a3bf96412..3f831c8d7d7b 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -2,8 +2,8 @@ DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13
 DIST buildbot-wsgi-dashboards-0.9.13.tar.gz 627272 BLAKE2B 1b4b8b6a0eed9572923a0dba24a9194557074e84640cf57141014a92294c56f22330566ae995bfa5e6be63640549e42e5aae01911df6989dbe4861b7ca5544f8 SHA512 08eedef62e85d71cbfde0f57727974a2bc1a9d33fc3821aaeb3a003df3b212c2b1ce00afa986dad062415b0bf8d8a9c0c328810e9d3fc994cdcbb82de2037366
 DIST buildbot-wsgi-dashboards-0.9.15.post1.tar.gz 626856 BLAKE2B 13104173594f1f5326221cac1839b44e792212c772730f0632f8528e55f5249d61b72c97cce7e51b6b3a82b2490a7654b7deea04ba61da13158e6d40e0021429 SHA512 5bd089d38a87e1e1dd03343b96824dc227e35268971b9b541e761c289042412b7dd0bc42df2fc9c28da5933a995c5bdf7af7bc7aafff999ce2f9431881bbd58e
 DIST buildbot-wsgi-dashboards-1.1.0.tar.gz 626836 BLAKE2B f7323073f644e6b6b89595aa052ae1bc25d14b439c3d1d0f3601eb4a62b07563ef12a97bde8997495fe6260e31de55a29b220f48c0b794761e077de77ccd0246 SHA512 799c2a28bd874c864264247fa0d030b3335d63bec88cfc7637b8456615c0c299de4df91557178e5d3358450fea89ed0ddb82ae27bbf8304dc3b7f9711ce69e94
-EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1145 BLAKE2B 53a47037ffe661336b305c7f5b437d596e25da918bdaa344c9295a4e0bbce6ac2cef312c25db420b325009a73bef8e30d5214df2fbdfdd40edd134bb55f95c2e SHA512 26e64913eca88f12a8436cd68c6e928c679af938606aa4b328413853c21321ebff761b9ee9c5ae5f218ac464e243bf6cadb3790781a661954c85f089d5243117
-EBUILD buildbot-wsgi-dashboards-0.9.13.ebuild 1151 BLAKE2B 244bdd3021d9aaa1616c37aa6f9c1427fe63907e5502674b697aa451bb01c852873d0c716bb69d5b17309fbdf80084be189bd5a9611190a80a3f03f608ea6ae7 SHA512 ffc4b696fa3aa75de11a002928759f11dd152f74b473a52b40bf91292999768a44b252795487752e16f69c5d9ed54400ec79bf2edf054d746824c1093f10144f
-EBUILD buildbot-wsgi-dashboards-0.9.15_p1.ebuild 1151 BLAKE2B 428ab7d6f262550a9efdc53eb38afe2c274ca313d382c43cb9a25325b42340d4fc0b03ad99e64a654e7e647054be80e525e69a79cfdc1e5393e04ee9bede1f7a SHA512 9f4c60dcbea6303c9911d1c3414777be764e7184628fcecb5a8358fc3e2ad695971ba39ba78c457f5a100fc32663dbac0647a2caee45d7f8f6403624e323f19e
-EBUILD buildbot-wsgi-dashboards-1.1.0.ebuild 1151 BLAKE2B 428ab7d6f262550a9efdc53eb38afe2c274ca313d382c43cb9a25325b42340d4fc0b03ad99e64a654e7e647054be80e525e69a79cfdc1e5393e04ee9bede1f7a SHA512 9f4c60dcbea6303c9911d1c3414777be764e7184628fcecb5a8358fc3e2ad695971ba39ba78c457f5a100fc32663dbac0647a2caee45d7f8f6403624e323f19e
+EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1146 BLAKE2B 6a2f3f83b7077e3357e56b761a980f4d405b55a869bb557cfff3fc3e0129f3468534497d4e707191a42cc76ac1f7eb5fc1f2938853b9c6e4b2de6e821ed266ad SHA512 cf557d8fa36012dd43d8501d85864a7ec2f52cda4fc704980924cd7cefcfa374f29e4e5cceb225cef7a8d4452d097055f9da5b154461ded29a3a29951532802d
+EBUILD buildbot-wsgi-dashboards-0.9.13.ebuild 1152 BLAKE2B 6154f9831fe307b66f29fd52fcf6336f173d36cd5195ad89d2ff70f225baf72b22d7057d81b86ad8d98d9d17d6dc558aec78e587da7f97b8cba27e883d99599e SHA512 1a1e4fa7fb876f4dffdc6bb2095520f79e379a030060e43a74ac01582c7d04a0ee93b881cd1c56fe3e037b29e3651884c252620f21a8a11cf520885bac87c1b9
+EBUILD buildbot-wsgi-dashboards-0.9.15_p1.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
+EBUILD buildbot-wsgi-dashboards-1.1.0.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
 MISC metadata.xml 790 BLAKE2B 5441af355527235e9e12079b22918db4beca4cb79b2d479436ba050039e9d9de6971ccca8365b4fb7010408b00601b1a8095b3d8c23639cf0612a9baacd89dec SHA512 15928eff7b660deca2fa007e8924a8c878f4694880a3e0d2092a63b9fc745fbe91f77ae4af65d1ecd1f593519dcfd6b4f495cbef16704680826b00bfc5b4cf4b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
index cbf202672e24..ebf5cd95ad20 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
index ba9aa2ce56df..79aac997ef77 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
index 5224d8a610be..33206843b81a 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
index 5224d8a610be..33206843b81a 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 65d309b03195..774564940d56 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -2,8 +2,8 @@ DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1
 DIST buildbot-www-0.9.13.tar.gz 691556 BLAKE2B cd3fe546c88308debc6dd621e8979c400816a11235b67c23e539bb3525746a864d76df2c4f8e04f63ba4459d2186094543115ab51bdc35f56b20c8c1a0ed5a68 SHA512 b092014e490ed46f2551ddeeaef5364c85b048cdda298af11acdf664d799fc52ef6f8daa17cf7a98d588c59abcbdfebb666345b44d551859d3db9b4fa358adb9
 DIST buildbot-www-0.9.15.post1.tar.gz 718007 BLAKE2B af64eb2e0fabea2af3c02c294d50c924211755358187bd0d52f43821fddcd6d566f8aad1136da3ca69f924aee3bce52cde1e48af3c3f0419c23d6c1be25c17ee SHA512 749fd6e763580bb0fd27f7ce1576ee193ccf9cb42616c3b393a0bfac9469d9a42372069d087ceae3557e72540a3e0cc37087ba4b7901cbb67877f17f27422a47
 DIST buildbot-www-1.1.0.tar.gz 718666 BLAKE2B 86bc329eb80aacf44c5bd01eaaf6b8f0631cb808080fe17f667f54746f841f9d88aa7b699e6083546b6e2dfb1171333ee173c484c9fdea285bdd5769d90a6528 SHA512 8e95a4faf393a81fccab225cf33ee13947cb72e441e2cfde833843838686a888cff24e45c6085d4ac431dec177d696441cb21014d172ae23b61ef70164fccb31
-EBUILD buildbot-www-0.9.12.ebuild 1177 BLAKE2B 86e684f0fec2f66fdc6dfbb8f71db8430701f53d17c9295a9a96485b06c2a78cb7ad6f8705a1dbe618973fed614009c788037b5785343ad16cf03e0fa6c7b08b SHA512 5c1dc9a867e6ce8a9f226b0dcdb4ff4d33029ab3ef8a88377a0c4ca58eebb389ff137c3efee1983e49f9221022d8cfc316eb1af78bcc95985afad18831b0dca7
-EBUILD buildbot-www-0.9.13.ebuild 1183 BLAKE2B d46e008e5d3807ff65797b42682b12cc9604b899d1bdc3ba2ee13492eb94f9006ac09ae1ac43b9c4082257401e7c4424aa24ef93aec2b12cac44d8c85e1609d2 SHA512 b83bd34ef39e092f6f897486117bf0bb435c0157e1187723878a50f20381e45e453f849af364f7289052ae045c39249d4a4046c5a04fe417d5c2bd05c298c22b
-EBUILD buildbot-www-0.9.15_p1.ebuild 1183 BLAKE2B c547e756499b10bae43111bbb48262aa816faaab2e4e44d59340c0c8980563f8408b0739b87184bfe731fe561dfcb35f8a43c0e9a9e10ae556ca37609976162b SHA512 ddb8a9290af34014e1542ecc648c5404a156c8084f06ffa0ad823c5471fa28d12c3b7376395b03704e94215804166f1ffd40d6209fc941911eb31ffbaf3c4e1a
-EBUILD buildbot-www-1.1.0.ebuild 1183 BLAKE2B c547e756499b10bae43111bbb48262aa816faaab2e4e44d59340c0c8980563f8408b0739b87184bfe731fe561dfcb35f8a43c0e9a9e10ae556ca37609976162b SHA512 ddb8a9290af34014e1542ecc648c5404a156c8084f06ffa0ad823c5471fa28d12c3b7376395b03704e94215804166f1ffd40d6209fc941911eb31ffbaf3c4e1a
+EBUILD buildbot-www-0.9.12.ebuild 1178 BLAKE2B 40f08a24bd6ad3c3b68e90c88473635f3362b3e24a329b79d09dfc40bd20ce082be5ffe70c86c79dc6e3b3b9888ecedbd332fe1aa10061d25824d647192c0888 SHA512 9872a619e14541de57858d1566970301bd1b81dddf3b2129d5ce2e3bc2ab00e85c650afd72c2452af4336dd25ed1660632b7564af863a0a1059d35d7d49fdfac
+EBUILD buildbot-www-0.9.13.ebuild 1184 BLAKE2B b9347644e9be3d66a84c455da583ed296dbe9ae8576ea8b4d55378f5d40b0ad49cb287b6f2c611a39efd2757334d7bae49132ba7bc77d4b3b4f502fa43c6a178 SHA512 84a11c2badc1dd43caa59cf092431ae9b4737945eeda60963b88c58af09adbd8c7d40d99a1cfd09a04cb18c9f5c3b8b5d8e511dfe031413a914e38f68798a448
+EBUILD buildbot-www-0.9.15_p1.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
+EBUILD buildbot-www-1.1.0.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
 MISC metadata.xml 777 BLAKE2B 07ead3ebaabaa62d3d09fbe84329649742eb92d194eff89c94f422f14934e92130401daa97799e038152943e0055a3a4bef74815175a533d2821a07645c64bb4 SHA512 9cace9b96d46b5cf2775d4a1d328c5cfdf3448758f293c0b12855bca7f65244e34529bd51e019201f9d397cfefbeb503f6dc1e2cdc9fe1f5e456dce1dcb2a5c6
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
index f7163c0a7134..fc596c84bbb9 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
index 30a4693f1376..56bc0409643f 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
index 90a60bd5cd20..8ee469d1634d 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
index 90a60bd5cd20..8ee469d1634d 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit distutils-r1
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 27038406d7b3..d3aa0b5a470c 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -12,10 +12,10 @@ DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b
 DIST buildbot-0.9.15.post1.tar.gz 3088947 BLAKE2B c9a0265d3df2a9ac01872fc7106b5b787334bd899a43fcdb6ad06aab5e0e8f1ddb4374bf5211f251f26985c3b11a0b981bdd23fb668ac1717af36443831648e6 SHA512 c5c72132fd8446fbb14467851063d192dbb817506163eacc3022d563698453c66706a895613ca1c17502dd25957b31f6409996497d2e7646ab2fdbb3fb55c31d
 DIST buildbot-1.1.0.docs.tar.xz 23932 BLAKE2B 81da8b86bb269efd2cd3f9146f3d9b41d64b28fdd0c878708c323d040a7e773cd277a18c82b1ef3cb07759ba8aedbc604e1de84f6477205b1708c28b6e86831e SHA512 511d244ffd205989047b4514b164e194b30fe4e0513d3bda776fb4d7a1a5bf42d8b7f00540b88e427838ab43f45686a83e556687ab75ce55eae6b834426a8ef7
 DIST buildbot-1.1.0.tar.gz 3098781 BLAKE2B 5a4ba8b641765fd58c3b5e788fc20aa1fb6195655ce2d82929f0f62ff48d20672f21efe0c413387e583d095c3ffcee1055a287016fe87ec1f3eb6b0ccdefdccb SHA512 f850ba2cd93d54a8abc97503719f93f69dfdc3d03b519e2d05c02bdc11893529eb51d74b6584555689281aedb71c3aa6c23141cf5fbc68ae97e09f1c89b2c94c
-EBUILD buildbot-0.8.12-r3.ebuild 5486 BLAKE2B 77d7346835e4c99e0142788d71fc2e9da602eaa4cf4637402023c5303403b40c631b7616aca4b91a5b3847d45c4d7270f6b0599de26be2dcfb28f5c1725912bf SHA512 db19611322458ae29c58bc3792f23c433b3e3e4e49ac58d3dff8ee3774cee96de11268d6558f01330de7882002a7125f3a52be1d669670659a1600d0915c8220
-EBUILD buildbot-0.9.12.ebuild 7103 BLAKE2B 5200d62225f5295f6641f3bb0e77ac7702bee0d2a132b0827a5776385abc39d80637e423d6417a69904f6658586981dbb0184c8cbf75d9efc560116f397d3f59 SHA512 8b1c91cb12b509514817c18cf201c89a2a32c55898b430e2ae7e34bd14b080645399a20c2a0ed7de7fd1551f7af1a051c0a69d9e4c34edaf0e1002224121ea05
-EBUILD buildbot-0.9.13.ebuild 7048 BLAKE2B c19b039269d82e929d65842866e227c3d7fb255a9c8b37fb0e0d0e89b7d479acf1a3bd781f4504db631abb4303258510ee8c173ba4713f1fe4d5abd04970a634 SHA512 45a1aa2a3a25fe8aaf4d678dcd8737d32295d96b0821551f105cda95e7c01f1ec9dd0677dfc83f1d9e9a5e5641d24cd8b4a9295fdd4aa18e108f2e46cffcc372
-EBUILD buildbot-0.9.15_p1.ebuild 7237 BLAKE2B 5b032a37770d8f0a61b5167d7790778dcbe058efacaf512279df34ff6d1f4cc6b3ba6eed32de4f5cd9d72fa50963ac024e7445e02feb8a912b58a55ea0f44543 SHA512 01052e2117a951b5b57625c401022aa186eda6f28470148a7e38958e61e4ca2f8fd34a05dedf6496a0b00a30653b3634b5ea5374013bb920dc4d541ddd9b768e
-EBUILD buildbot-1.1.0.ebuild 7351 BLAKE2B 65f97794148fa683371d69038232469ba960f2e44d3ca0aab8f800a688573f44574d0406ed1344b5b6a086549ea6b203c592cdba41d9b0536fceb00f2f86b9a0 SHA512 9dc3b3c686ceb5d5f18f048a04f745c95273263d0f077d913d143a966e1a2b214e253a342f18de5a8a784cb3a8605f63256f314274594253202af724f562a38d
-EBUILD buildbot-9999.ebuild 7178 BLAKE2B 1c10baf62e09983f92ef83ae7730710fb3b3cdd517a5078715af7ced2f3f31d83c573807a0415459fe08ec19acaa0689651009350d9a88f14b7c1178d04a0e66 SHA512 8aa35ae72ce7fb626681809b68f6b8f94b71f5c088aad708d1c7d53352fce8d25470a93b7dd8f256186c08fb387476134bea62483e1f08eae3c6a25d1f5135e1
+EBUILD buildbot-0.8.12-r3.ebuild 5487 BLAKE2B 65e94e3913dfc194381b8c86b0743f2ddb278f90cf5f0d32e1ddeee50cb5da314a6c35c892264985841ebd6227453f699794db30786e329a6b5219e6ece0ec6b SHA512 b628b1cec97419b16289c219967eee1154a1b022004afb25981bc83ff60924e462cd652e2c88f51a799c8bec7acdd25dcaf6e2657f0d3f44a69a793d205bfcca
+EBUILD buildbot-0.9.12.ebuild 7104 BLAKE2B 6ca479a158e17462200c154d9cbd70508555a62a42902ec43131342fe2e19d832ccc1b2f541085edbd7349da91d6678caa31c223e1b25aacc6018fc35d44b791 SHA512 019dc2ee1fbe194e834bc3ee3d31f3ae6e3403a772a809505ae8b3f02ea03ebe5d583832d67fafc405f1271c5171c0ec4c5609f68c983a7002e0787247f8a3e7
+EBUILD buildbot-0.9.13.ebuild 7049 BLAKE2B 05ba09770db0a62bcfea80aba47362dd1ae1d76c6020c7b9b579373e5c0e7bc922a46a96aeb1508137d99c08588980f5430fd147a1852248bfa91654b344f1d0 SHA512 1438c1c66928f59421431852274fe8d86dbb70ada6b6172b080ee5851d3817edbfe643973577fe9390e8f05bb26a055656861563ba1f3ed607cb27d34993f84a
+EBUILD buildbot-0.9.15_p1.ebuild 7238 BLAKE2B f5e70ab74c1e116335aa48bbe5349f34493c5829cabbb69e98ba9971e5c6f6f1d1c29fda2235e15b3127266f29908009f292f5e3952217864b613e4a59e854c8 SHA512 73c7640b3450701711099233c2cc405ef23707bb6074c8ad4b11790d2940284aaf7eecfce6af4cdfaf7f32eb693cd1f329ab3eb1b43a8f65f8b98439a63f7234
+EBUILD buildbot-1.1.0.ebuild 7352 BLAKE2B 4565a431c481ffb3681e3fb47c54daaaf5f2c34476f41e696df012a77960b920942014aaeec8220d59ff75f481986777c0a57304f953dfbab1f5e01616334cee SHA512 6fee92726755e6c0fb6f3f55277669518c2da4435b0dbd2d09fd656613269822c80740d06b5486f6dea8e40d6731176fd61ee5cbafdfc64b10e0eb7872168997
+EBUILD buildbot-9999.ebuild 7179 BLAKE2B 8bf2ee184ffb4faebcf281f8884f8732dc51ec3e9a0293a6441f1eee85a118360750c4101b3e957616a7e1eda0858fef90db4cdaa0ff79d36ae66ecfa43b3a64 SHA512 c58491324b048e3d36c019ff9eeb226f1f1cadec45b58d6337fe2af3ded585426a1b4563069ca8e6c7528d74f1a2e520604ba8c7286fdcb8fe6e11282ad57c12
 MISC metadata.xml 1616 BLAKE2B cf5a0b7f346e9077dccbd4a9f1b9e95255f874cc8ebfdaec0a067f44c7c2b8015362cf590cb927f8ec87ca497ef38973a6acf5117968904c8762a84ef751cb70 SHA512 efb2ec3027be76f7d9d07bb19616ae4692acd07eefe79412f5983281db51095ad2f900155a26efafeeead403edfeb7fc0e570672f6b254bca83d5263c645d5a4
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
index f432a13be789..dc3c963ebc9c 100644
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
@@ -11,7 +11,7 @@ MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.12.ebuild b/dev-util/buildbot/buildbot-0.9.12.ebuild
index 9a106389b8ee..7ea786c52840 100644
--- a/dev-util/buildbot/buildbot-0.9.12.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.13.ebuild b/dev-util/buildbot/buildbot-0.9.13.ebuild
index 5c67c37ee763..632833de2f4a 100644
--- a/dev-util/buildbot/buildbot-0.9.13.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.13.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
index 3d1d553779bf..31c121b11d7e 100644
--- a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-1.1.0.ebuild b/dev-util/buildbot/buildbot-1.1.0.ebuild
index 1a698ff26621..4cdc4a28db20 100644
--- a/dev-util/buildbot/buildbot-1.1.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 0ff327306348..f52f1c9e2ed2 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/bumpversion/Manifest b/dev-util/bumpversion/Manifest
index a6aecb78dc4f..957247fe8425 100644
--- a/dev-util/bumpversion/Manifest
+++ b/dev-util/bumpversion/Manifest
@@ -1,3 +1,3 @@
 DIST bumpversion-0.5.3.tar.gz 16596 BLAKE2B ecd9e999241d0d77161529344d9f83859ab1083c323524f91f84802ff74aa8e9d4d95126b65c685e04183cf7907732f2ad734938db7aa03dfb9e334a1d24222c SHA512 2dc507be98838e4a389502cbdae08d23bad465b171923e15c40ae16da2cc9529c71dfc40213c47d23da363257b363fd5786a5661a4a6d6b568b5f8b2cf8af959
-EBUILD bumpversion-0.5.3.ebuild 812 BLAKE2B a81699a433fd33efbf1b6efbc96ba5c80cee6692ff53c5e7ac8b084e75a8b86c997b95f6d388ce6d72e9fbc9737d3cebd0037c9d52455f57f172e1345932836a SHA512 cfbb22e4a724cd2ccbc29148a03806ef910ce39c442b1170e10f93b0bb05cf8eb8d6618b7ef470f79032dd7acb9bdb60d3f61559c08abdd948d39289f2b751e8
+EBUILD bumpversion-0.5.3.ebuild 813 BLAKE2B 4e747fba1fd159bafa533e1e5e5dd492c5d861d098487395e71e270ff94fea0e8d6d510e62e1542dccb21f26c661f5fcc9da79ca2d02b68135782aaf6fe7ba66 SHA512 6109d87c14376b49de5495cbf4f18dbc890037d2b62b9fb8bd789bf3a3091ba35df22234f7442b244025a5f36ef100558e2b0f86bd9b0e340232c5e65b7a01e7
 MISC metadata.xml 300 BLAKE2B c9f5c0e8c55aabd0ff79c4ffa4d04195f6e532ebce0c697dd75fe1568399c7dfc8575d27b20781d626a9aa075226688b67f14487db0db9d081da94352eaf1e8b SHA512 de2e356433d02bc7f9b8f24f178fa1124948f9bce7475cf4fea0efc002533755b854cfb5f591343ca73c6b798cbbe15a40c0450f23d994420a9a28f9bfdcb483
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
index 66c64849538e..3109273e0b2d 100644
--- a/dev-util/bumpversion/bumpversion-0.5.3.ebuild
+++ b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Version-bump your software with a single command"
-HOMEPAGE="https://pypi.org/project/bumpversion https://github.com/peritus/bumpversion"
+HOMEPAGE="https://pypi.org/project/bumpversion/ https://github.com/peritus/bumpversion"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 31d6cd4db2a2..7ed5971d7ed4 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,6 +4,6 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
-EBUILD ccache-3.3.4-r1.ebuild 1908 BLAKE2B 0c7d3bbf0bbe923b987f726827bb644ee942c409c563e32f9c46f55e838d78e5358805698919aa6a1597253c54aed4c45400e500ded2377beecff2b3fc971ed7 SHA512 34890f69daee2428b3e5ab0c5cfcffa2d7f4b2bad1bde5539b2f099aa83b81adb9648b4b6f9483e5e5b880c63e135ec64b73807398f6401ca93876afd7361761
+EBUILD ccache-3.3.4-r1.ebuild 1906 BLAKE2B ce92764ebbcaaa535fda497bb73844f68820c822117de89d4b2cb703a23cfa7a6d0a58ad5926b677ac17e542911f14d888c6b7192f4cf11276c15926b6b31224 SHA512 50cc43456d81ce3d6b95dced71d4659d55c4b5ff0f373c055f4f945db7992c601204c303a5cc62f1e3876f9eb4cb2642811ad730a7dde0c7b6e74f658b056b22
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index c00d952d705b..38193a3109f8 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 248d5b70e96d..dd671ab36f2c 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,7 +18,7 @@ DIST cmake-3.11.1.tar.gz 7951125 BLAKE2B 157c2eac49900df554fb335c4a17484ca425a97
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.2.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-EBUILD cmake-3.11.0.ebuild 5759 BLAKE2B 4edb0b5b28b91c4399f32dcea8fcd342547c9024e0155a00cccee8e81a8f6e390c91e2c979c20094f90f1b8460b1e188d2e94cbce772a6eb5aea3b363b975c73 SHA512 6b53592c0178d0bea4905538421af0dbc69e21e913d1241cc467fb58570907a673c05e02f7c15441baa420975d85984ca4419ab21ac72d3d67cb0eacf82fb725
-EBUILD cmake-3.11.1.ebuild 5759 BLAKE2B 4edb0b5b28b91c4399f32dcea8fcd342547c9024e0155a00cccee8e81a8f6e390c91e2c979c20094f90f1b8460b1e188d2e94cbce772a6eb5aea3b363b975c73 SHA512 6b53592c0178d0bea4905538421af0dbc69e21e913d1241cc467fb58570907a673c05e02f7c15441baa420975d85984ca4419ab21ac72d3d67cb0eacf82fb725
+EBUILD cmake-3.11.0.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
+EBUILD cmake-3.11.1.ebuild 5936 BLAKE2B c4db85bb1abf118c0606643fb0a3b453d9c5df8111475e37e32c2160987244afabe83bddaeebafc92f64d8ec90726545e35cb12ab537c0949b6bd1b188160211 SHA512 ba74ae4cb1c70ba0b8206a629312c0f2e0637b2585eef0acbf692d40c7519e6abb13f0091fafebb502b216ebd8eafb383fe02d1432ef2c0ee9390416aec43602
 EBUILD cmake-3.9.6.ebuild 5953 BLAKE2B db46745391e5a79484ba90e2dfa02e9dc69de0d84996b21166b53fe427555e57dbef2f37c927afcbcea9df113917bb1548fa6be15a2cce4f881678fef86ba2fa SHA512 f8f54d756d27df0d80bb2d0280af137dd41753fe999b6598fbef1a1f47fbab5e918ec4a828d7fe909ebf355dbe0956b0c746a0eee576a02df14e0fcc1c6d4acc
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.11.0.ebuild b/dev-util/cmake/cmake-3.11.0.ebuild
index 2ceccc1ef951..6bab5d7c8c20 100644
--- a/dev-util/cmake/cmake-3.11.0.ebuild
+++ b/dev-util/cmake/cmake-3.11.0.ebuild
@@ -80,7 +80,8 @@ cmake_src_bootstrap() {
 
 	# execinfo.h on Solaris isn't quite what it is on Darwin
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
 	fi
 
 	tc-export CC CXX LD
@@ -123,6 +124,12 @@ cmake_src_test() {
 src_prepare() {
 	cmake-utils_src_prepare
 
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
 	# Add gcc libs to the default link paths
 	sed -i \
 		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
diff --git a/dev-util/cmake/cmake-3.11.1.ebuild b/dev-util/cmake/cmake-3.11.1.ebuild
index 2ceccc1ef951..6bab5d7c8c20 100644
--- a/dev-util/cmake/cmake-3.11.1.ebuild
+++ b/dev-util/cmake/cmake-3.11.1.ebuild
@@ -80,7 +80,8 @@ cmake_src_bootstrap() {
 
 	# execinfo.h on Solaris isn't quite what it is on Darwin
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
 	fi
 
 	tc-export CC CXX LD
@@ -123,6 +124,12 @@ cmake_src_test() {
 src_prepare() {
 	cmake-utils_src_prepare
 
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
 	# Add gcc libs to the default link paths
 	sed -i \
 		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index 103f57447c00..bc4ddb1b51be 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,7 +1,7 @@
 DIST gertty-1.3.2.tar.gz 92553 BLAKE2B 2e6771fcf044a8a46e91dbc6f34869be528e0aa4db8344aa26a999bfb9fe1a8e7b18346f1d90f06b7cb436c74a2c04c5528297d126e66b8f985bfc42483c53cc SHA512 b68acb801ceb225fe86d62015fd89bce7ebe34219dbb2f7fe10d991ff06b558a5ed3512e6435ef3ce13324841c473dbec565c7bef23e01567f5bdcbb6aba9136
 DIST gertty-1.4.0.tar.gz 115581 BLAKE2B af1a4ceac5b1e189305463e91d8d79246ccf16d5109b5100c0f928af42c39632d2c4b904c5586428c31d5d12985baf8ed2507c743364d6b26a4a02967b59dfc3 SHA512 9abba6271d3ec95938f07ab4ee76f0b539a7ce7f0bbf9c08509fe9516c14f99ccb7b439d29a30bff6dca99bf39788dc803cd8aed3cc03b531678225fa41102d9
 DIST gertty-1.5.0.tar.gz 119784 BLAKE2B bc563c10009c372de5a702b4ab33d9b6b26a898486fc5a1d840f298b50a779c36467ccf6600b6f29b61d3c15b1cc0bbfe960d0d6a1a71d3f8b8f75dc392ab0dc SHA512 bc47817a3ba9ccce298ee1a646cb43f8a57e9a57a40d898859836b3171abd0cf3c682a5f5811cf3d987a17dbf00dd6706a5dbc5a6a35f1d5ff3a217c68187cda
-EBUILD gertty-1.3.2.ebuild 1195 BLAKE2B 3f5614bfc14ffe389d18153c501763cc876a10bed61c5613eb0fd01c6c27124436508aaf149b8f5af845be6d7eea2017e3f158698a61a46890a7107382f64961 SHA512 e4dc524b9d5b04c36142815298ccb10713f2e932ca8108e9451fbdcb7aae359fe48049dd80ccb23177ed532d653831119cb3001b7091bbf0a1d278f1d6b99683
-EBUILD gertty-1.4.0.ebuild 1195 BLAKE2B 3f5614bfc14ffe389d18153c501763cc876a10bed61c5613eb0fd01c6c27124436508aaf149b8f5af845be6d7eea2017e3f158698a61a46890a7107382f64961 SHA512 e4dc524b9d5b04c36142815298ccb10713f2e932ca8108e9451fbdcb7aae359fe48049dd80ccb23177ed532d653831119cb3001b7091bbf0a1d278f1d6b99683
-EBUILD gertty-1.5.0.ebuild 1154 BLAKE2B b16e9a462dbd7fee9bb16723f2552ba2494360c2a1d798d1cda5f1c9bc2a41f2db26d245432f7ffdbbce1a814c9f912bce1b867244bf25327071ad4ab38ba814 SHA512 9d69fff9ca506c36fc835bda867fd30f27f1981673a1eef4692aecdcb5e2758b6ffe7c141be0e8b83499ae3cd50f2735d9e6a07869fa7051497ec792e1e27aa9
+EBUILD gertty-1.3.2.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
+EBUILD gertty-1.4.0.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
+EBUILD gertty-1.5.0.ebuild 1155 BLAKE2B f57a4ee9fc24baed0b445aa867b4273745e910cb0fbaa615a7b9aa25f3b15cf286c8b3aa2c2fdff79d1e443900d943ae266427dd1e15ffaac5b5eb27511cd1d4 SHA512 1952c3bbd940575f1218cbf6980012669228ec1642a9d13fd9af4f02742d1dc7b37ec673af515dbef010a8335bd8249db9583339e40a1b03b653a865c354ff9c
 MISC metadata.xml 500 BLAKE2B 0310d985bd0b3824fcf1522d04cbb253fcb3507b96a75073e0e37481cdc7aaf03da638a592bb1470d17e758f2fbcbd6c60d046a7f7ffa18d3c8a6aced2daa76b SHA512 8a39f2a1e526fa077354eacf6a318b4cb11b7a1ec37f2928578bfb13f7d509226a30c0b2b94e6da070e602e54e02fbce0b2129f9421db1f6981eed1e781493f3
diff --git a/dev-util/gertty/gertty-1.3.2.ebuild b/dev-util/gertty/gertty-1.3.2.ebuild
index 7c18ac66c8e3..4ed475d08fb0 100644
--- a/dev-util/gertty/gertty-1.3.2.ebuild
+++ b/dev-util/gertty/gertty-1.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty"
+HOMEPAGE="https://pypi.org/project/gertty/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
index 7c18ac66c8e3..4ed475d08fb0 100644
--- a/dev-util/gertty/gertty-1.4.0.ebuild
+++ b/dev-util/gertty/gertty-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty"
+HOMEPAGE="https://pypi.org/project/gertty/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/gertty/gertty-1.5.0.ebuild b/dev-util/gertty/gertty-1.5.0.ebuild
index bd38b77879ee..dabb69045cdd 100644
--- a/dev-util/gertty/gertty-1.5.0.ebuild
+++ b/dev-util/gertty/gertty-1.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty"
+HOMEPAGE="https://pypi.org/project/gertty/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 31c1ba4ddcf4..ef339db5950c 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.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
-EBUILD glade-3.20.4.ebuild 2398 BLAKE2B fbeaba8d2b275218160e38bd2ecdde8872c65741e0c37d9244ca51d79025a1096b1dba2e5f63a45d9c4322709db54bcd1a2f01fb060a58c6e7bf7dfb76183771 SHA512 1e8fbf054ac69b453a42629bb97ab8022a2e4b9f82f606f798b2195a3d50735182c5877c4a3043f6034bb0458ad5207e916d88fe83db969fb3ac01d5c1f88c6c
+EBUILD glade-3.20.4.ebuild 2395 BLAKE2B c744919fae6a50569cb8d2085c04306731a91450b533a2a88c6569cb5b91d807a217f8bd73e4ef6a5136eecdb7b41d0ea7125f62b7349a3f085a6a2b068b1de1 SHA512 181ff3cea5fb9cb410559a4f6e8096ac8469c8e7164cbb90415840674303f1b2d99b9f3e3cfb01a2735cdbf32367e01f359dbfd235acc2a3ac01c3ffa5fdf772
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index 243a72912856..a42b273b5b6a 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.4.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"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 855a20ec96cd..f8a828582ec5 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,4 @@
 DIST glslang-6.2.2596.tar.gz 2270084 BLAKE2B 234d7d201c5ddd91fdaeac1a84104b2b635131fa910315b1d14ae169f6141840a1559114fa2e07775120f56f57d59decd689f44609923152a2e15ecdda66207a SHA512 24c6e90c75767ffc2faf3f0868a7357d5f528cae8972c8b690cda0c573eac0f60f6b8795793534f39ccc2c649cb788101715e42cbdf7ca9d59c955f9b37a4f99
 EBUILD glslang-6.2.2596.ebuild 495 BLAKE2B 38652c1151d347678280e258975ea966d268dd874c8bcf7a12f162b7ca51b39d0d8b8aad8a1a3ef60c7df0c2a7eee3cb2929d205c3d00c7b7f19a39b79e1e431 SHA512 78f3900c0532e34ebf4ddb9c356c47e55837eefd157e9362c8c4a99eb1b6e3dbc2c24564a7e19af186308d155042265a948d223b603e116d70f7db3397b59dae
 EBUILD glslang-9999.ebuild 418 BLAKE2B 43bc0590620b8b5f35703369d49aa19b54883e7fcbb4c7953e79bd7fb9a1e65277c35c3f227823707bf2ab87608b6ffa07b9d0c2a732d70873155f5bc5d0495f SHA512 00a9eac76b47c375c755424814315e9227f235f7255945dc3be69c7049d4ddb7acf3dd97ab4f4a47ab080a688b941d79119374034292864c6e8b047c888fb662
-MISC metadata.xml 431 BLAKE2B cacc6e26c1f1b940c39b25ac8352624bd321f885c276415392390f38de157239e5683b64d0926d66c692a2d508c1c0f38f325a3f1f583b2dd74bca27e493f949 SHA512 78db68ff5a072807466583a6fa1125c21bb5190d77936dde0adaac4355bb7cb7384e3347d16f68099ad7a3d3f1cdd6cd7b5c38134e4700eb1202db7b8b2ab7de
+MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
index eb4425c3d32e..241e7de59999 100644
--- a/dev-util/glslang/metadata.xml
+++ b/dev-util/glslang/metadata.xml
@@ -6,7 +6,7 @@
 		<name>X11</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>commendsarnex@gmail.com</email>
+		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index bb3dd03b770b..ec3557730530 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -2,6 +2,6 @@ AUX 3.24.2-jedi-fixes-1.patch 1224 BLAKE2B 4e3ea7702ddc69f892522596c9ff33495556b
 AUX 3.24.2-jedi-fixes-2.patch 928 BLAKE2B 8fb3e4bb34217309475431ea66f24c003e27a89314d1eafff37b11eb9f79c76b7bddb78899e9cf78215dd72e5da27e6f416757db40921f06904ec6a215ea1dd6 SHA512 e5b08a6ad2e182e9340d49876b0ee61f9a5e97abb8c31361ee5058647490894b741250c0850adfb18f93005ccebbbbff5c0ca6fe75f61d1895816f33e4801af0
 AUX 3.24.2-jedi-fixes-3.patch 8966 BLAKE2B 9dc40ddc73ae2ca5b0cbb6202391eb3aa550771dd65f7fac84e724d207c5867129c8607417279c78aa469234e62a3e1f62cb294701948b5741b06c4a0aecbf9d SHA512 5481e325a338cea5946a4515e8e532c8d516b0f05a2f3c7ad33dc3e9bbc83024bb8ceb2f0913b1795fdc57e856b37ccaf314e05b414d27669a4819b63747f255
 DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
-EBUILD gnome-builder-3.24.2-r1.ebuild 5197 BLAKE2B cddad23ff685a46801e50022a95606bf19937b9740a86f280e39cb72b898b3cd68dfcb34639ce0e16fc98433a171d9427d5a4db26c9d9fa92a5271a7d7e74322 SHA512 9f4687cd2b47ba9a7035e17e20bdd30be2b3a678a5c83db65c20dce251499f4135667e970dd8c13e56cfcd66eb49a13bc20a440b36f3bb7aa5b31c3ef2ec5987
+EBUILD gnome-builder-3.24.2-r1.ebuild 5195 BLAKE2B 2d9dbfd2abcf2261221ef5310853501d93f64db9e235a0b0b1b843a754306033dd26ebc239ef46ee05d8109f35f85055359fc2ce66ea6bf2007dea80f621b3de SHA512 ac2295cdc97874f921a65cf6cd5f766b9deb94dd1cd171e8d0568964c0d2f9e5aa8addeb6410af5174c2c6f636332cfacd171c3d2862bb586baaf0e0bd05e227
 EBUILD gnome-builder-3.24.2.ebuild 5019 BLAKE2B 4ed96a85fb1d622006ac877a50ba580c2d7ca95639af086230d3209e7239cbe8fd48f51776d20d2e656cec25332ae9e735c8c7b3c5750c8dddd12f620e0be0ee SHA512 6d9e47c151f701eae71a4053a72ed0e1de77edd299cf3eef1d2e91289b9e576537269f0571321deb9c5c63103b9181f0db4f87a64f8a4fb8ecfff21056d651f8
 MISC metadata.xml 1011 BLAKE2B d6099c6cd5ffaf091f2ee0e07e261caacf0283aa18dc6be22a617b95236131e831d24f36bbc73f86edc66a3e6fe74f5102d101c9736d5d992a80929a68ac2100 SHA512 b3519707a4023a6c9892827abaf6465e28dbad2f1a8c2760a3f2d9b34d4be384d10326870e0d7952b41cb725c955cc838092786543ff1867db4a3acf41cb404a
diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
index 1daef3f26567..296e94b87677 100644
--- a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
 # FIXME: Review licenses at some point
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="clang +git sysprof vala webkit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index cd1a55569f77..f094a294f0fe 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,5 @@
 DIST howdoi-1.1.12.tar.gz 8196 BLAKE2B de3b7560dac360102246c10e6076658fe6fdfbedd378f02e65928d2b83a3f05357b8a9aafd6ad22e402448dfcf96b72faaf5755774b83ed1656ae7cb81554c72 SHA512 c4f66941d608a3f1c2a441b81ec5b64d9ac4e53b70bf4bda08fd8fc68b1c34022abdddfa47e3812cdce063e5b3c440aa4b9ad39ea95bfad2f285b5ffa89d711b
 DIST howdoi-1.1.9.tar.gz 7549 BLAKE2B 3fa434652971ad9addc01d9232fde67b4d86a7b1bdf14849f75029703495a70eeef3e232d6062ac3598e921b0bb86f39618125cc81424bba646bb08134875dc9 SHA512 6f236c1e7685c10682e38d1f679ebe75a12b29b78bd2496141099d875b483b0c749d12873f69d163e40eb66756b6512146471131758fda84e6ad9fc7b76806b3
-EBUILD howdoi-1.1.12.ebuild 582 BLAKE2B 8de7c5522d1c5723033afaa337492d0dc1c24f116b0b2dcacffa3c9391cc512b0bbd0ed2c09d07e7ae07fd3b533e0b8b848dd77a62d7a8f4908a49a11ac5990c SHA512 7f586cfc76799db92a02b493ec0b9822b27a585f6b3879f0aee27a2cae5ed66fffd998712935ea1bc99bb2b41183d152752095f787eabdb6662e00ffb28536ef
-EBUILD howdoi-1.1.9.ebuild 580 BLAKE2B 6856e2d66a469fccb70cb4dc41f2f9fbd87658d2274cc6fdea9e80af5326d36b308c9630858a34204f769f088b96556a88ccbab370dbe520650884fe25ce0e40 SHA512 d36100e424e2604b41fe3f50eb040a4786c2c020e6394d37f605a274cb808ab996a5a9e3ab9145276a22783c6d83c86e3d18d24f0d6b74f73736643ae6b83cfc
+EBUILD howdoi-1.1.12.ebuild 583 BLAKE2B cbf9439e8305d8aa30d356333ea7c226e20cb494918066b21fb65c647b3504c91151e8322152021b7ea9dc98c2f7af7940023cb0ce43ffe9b4a251d8c5810157 SHA512 8bfb4e52b7766c5a7966df25671c11f3909add694dc6d62128c9ddb3b6a7348a31f07cefe65e361cf2cb09b3934fbe53495315dacc090a8b8d5d522bc94f7f92
+EBUILD howdoi-1.1.9.ebuild 581 BLAKE2B eabc0f6b41035df78b16c0cf6c450010d55f88cdbe371c336febbdc1e27cd27fa1428c02f2a9320e43755fd3689c5c0c9fb535c3fd885a2053f6187876a1cd18 SHA512 be163880689afc744bbef6e878b1bcc49d2a27c1e52eeef91a3449cdfc0c4decce538557e3e7ce969898fd1f433b13e7839ef602ac2ac75845ddfb2e244bd339
 MISC metadata.xml 290 BLAKE2B 49911a26acd9402378242b6d656e33951b594e09cd64ea6115460fb13f1c2a4026644cdaab5fd343790be4122df5426949ca0b2945240216f497542278ab427b SHA512 ede22af6bd7ec77ad0b831c42c0169dc8e43719d4f7c5d7df37e6abb79136d1699a923a587a056210c0cccc33aa887856a46f73baf476ff2c074351880299471
diff --git a/dev-util/howdoi/howdoi-1.1.12.ebuild b/dev-util/howdoi/howdoi-1.1.12.ebuild
index 2b8d41ba1bc6..e072ecb0cb11 100644
--- a/dev-util/howdoi/howdoi-1.1.12.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi"
+HOMEPAGE="https://pypi.org/project/howdoi/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-util/howdoi/howdoi-1.1.9.ebuild b/dev-util/howdoi/howdoi-1.1.9.ebuild
index aa14cb47aad4..66e4cf6fe25e 100644
--- a/dev-util/howdoi/howdoi-1.1.9.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi"
+HOMEPAGE="https://pypi.org/project/howdoi/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 5ec6b3803f26..c1962da9b4ba 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,5 +1,7 @@
 DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
 DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
+DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
 EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
 EBUILD include-what-you-use-5.0.ebuild 1324 BLAKE2B b1d2c2029248c446ff1eaa7219cd159a225c0f4e7723142ea47b5156e41d1272d4be89829b70fddc10f24baa13ecd76f04195c6cac2ce39eda955d7d6312f595 SHA512 15304bcb7ded3d3abc9932062d303619d068926b7531d6eb829601f431865dca3450b498121b479a3edd01d011151864c0c720288142fb9467381018146fe805
+EBUILD include-what-you-use-6.0.ebuild 1324 BLAKE2B b95d2bb55b44cd36657051c58a7c0272881ccacd8ead2e212458100d558bed579b83cf2dce03955ab82cdce1190257e26cb70313333ec572f469fe4e36e8adf5 SHA512 5a831edfd6dcb48621f2ea89531da736667b0d79a6e9f434e6eab1fa4c75626f2251a84fef8f76950414220b3b835521de242d32952a7b485be199d57b252f45
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
new file mode 100644
index 000000000000..7cfe58259cc7
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=6
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
+		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
+
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 042d4fa6423e..8f64eae41896 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -18,5 +18,5 @@ EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
 EBUILD perf-4.14.33.ebuild 4943 BLAKE2B 59e7d995374f472c9ad91ee43d4c792f193f81dafe14f6fa201115da9938cfb6f9d711b50f9b39e44b9f7a72c479b023b13ee1eabf5f1e932f4ab7140dcee976 SHA512 49832af181b35887504ca047ef7225444f85435e4f91b59f4cca5a982ca9c066e0226f49b99f13c578aae418e93a0ffc6087d20cd18c16062144dd8ab56817ff
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
-EBUILD perf-4.9.13.ebuild 4918 BLAKE2B 356336099dbafb068ec43f603afae448c6bbbf76d669005933279df6d0fa699892bb1399fc1727f87ffb7cad4e0a81e15ac898ee81e4f77442d9e965fa5961f5 SHA512 e2863df49308a08229429fd6e29d1967ab7950b6d6795eaf8c5f12e31ab3cb833b564a31c971722602513e4d11304677465471abd2dcfb13b18bb0a75cc28cfc
+EBUILD perf-4.9.13.ebuild 4925 BLAKE2B 919acbb8b5bc86a8cc0de41f963e87a85f16d7ba3fee026adab0c29ac5a46c8846fd102592576f0efdebb379080bf1580babfb0bc23729ea386ae3cc7ba3d634 SHA512 750501145fd525bf5e973edb7f4645cf0cd94c3449ae859ffcc33896e8963db8e573248893441de971248af2842fa18df9222704b5b92880a356e8656776a597
 MISC metadata.xml 1093 BLAKE2B c10db12ae6c05c68b06dba1112b3c899dd40d2d35f8ff8f2bc840c38e712571256b1ac49d90983b4df6af5806fc93b59bbb86e6d851d197539e776d60da0d7da SHA512 5c83c9c871c23eda63760d4b33b549849236d1f79edf4a69bbf2803987cd6db9c3f5dd8abdd216abacce91c93a589a9487e911d9ee1f57a9fec761f7e39beeef
diff --git a/dev-util/perf/perf-4.9.13.ebuild b/dev-util/perf/perf-4.9.13.ebuild
index 5041aed3f5fd..e9c0e8f0c42e 100644
--- a/dev-util/perf/perf-4.9.13.ebuild
+++ b/dev-util/perf/perf-4.9.13.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 1112656e6a2c..aa7478954b0f 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,5 +1,4 @@
-AUX radare2-0.9.9-nogit.patch 352 BLAKE2B b65dd677a246bfd47205061d41f731e5b3ae477946e8b5b1fec6a19aa54fb2bf307ae4421c74ae38049f259476b43897968670c5a5b34808d37de5623ba620c0 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270
 DIST radare2-2.5.0.tar.gz 6272646 BLAKE2B 44c88327b544d03bd464f1ecb72a51b7e3fa86602aeae9055b6f2d41763be9ed9d63be4c7b959e1f920605feeed998c1f56ef0ed3a6a7213b4d5265c057b1213 SHA512 a29e0e61aeee6e08a99a1ed8a8bc428ec8b0474b3781475db3091232353d03d39d8750f774a266e01bb7565049269ee5f43b666b3b69bfadafb75cdb35f6cc4b
-EBUILD radare2-2.5.0.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
-EBUILD radare2-9999.ebuild 1164 BLAKE2B e35816da5d7606f7e5ebc26bd5ffc4b2e681e04f7c35074b1062d99b2058a1ebb6ed120c4eeaddd52312b35e9fffc4568810a1ac9f28f179b74a80fac42413ca SHA512 53c4f6b87b4c25e1ac072f9bcd5f06ead66f1b79c329fadaa2c88f27d77777ba160dfe75aa48779ba3083fd532d7957b00c4fa87c66a33d67a52e6c186e848d7
+EBUILD radare2-2.5.0.ebuild 1128 BLAKE2B 1d1afb7c82e61eca36fb9ec37bf3efe5569c2812c86040982b020dce996db8c9eed5fcbc9d80c6d819cf82df37bd0e3bba3a8414df8be513ebde955490d2a622 SHA512 60b78abd86656f51d5b4fcc89ef7594c0b9007f012bc8fd50446895f55b7ddcbb8e81eac73c3bdbeafc6bfd83ee13fba7d13e0cf21006bf3dbd63f6ae4fb16b3
+EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-0.9.9-nogit.patch b/dev-util/radare2/files/radare2-0.9.9-nogit.patch
deleted file mode 100644
index 9a6979e348a4..000000000000
--- a/dev-util/radare2/files/radare2-0.9.9-nogit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-capstone-sync does not work correctly for release tarballs.
-It tries to sync/revert from upstream git repo unconditionaly.
-diff --git a/shlr/Makefile b/shlr/Makefile
-index a1796ce..f8d179a 100644
---- a/shlr/Makefile
-+++ b/shlr/Makefile
-@@ -144,5 +144,5 @@ else
- 
- ifeq ($(CS_TAR),)
--capstone: capstone-sync
-+capstone: # capstone-sync
- 
- capstone-sync:
diff --git a/dev-util/radare2/radare2-2.5.0.ebuild b/dev-util/radare2/radare2-2.5.0.ebuild
index abe520e9a37a..e054a7433d6f 100644
--- a/dev-util/radare2/radare2-2.5.0.ebuild
+++ b/dev-util/radare2/radare2-2.5.0.ebuild
@@ -18,14 +18,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ssl libressl +system-capstone"
+IUSE="ssl libressl"
 
 RDEPEND="
+	dev-libs/capstone:0=
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	system-capstone? ( dev-libs/capstone:0= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
+		--with-syscapstone \
+		$(use_with ssl openssl)
 }
 
 src_install() {
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index e7a0aae0342f..abe520e9a37a 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit eutils bash-completion-r1
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
@@ -14,12 +14,11 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-	PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch )
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ssl libressl +system-capstone zsh-completion"
+IUSE="ssl libressl +system-capstone"
 
 RDEPEND="
 	ssl? (
@@ -41,10 +40,11 @@ src_configure() {
 src_install() {
 	default
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins doc/zsh/_*
-	fi
+	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
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 70ddf1caaed1..1b22add6538d 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -5,10 +5,6 @@ DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd
 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
-DIST scons-3.0.0-user.html 1111001 BLAKE2B 99a4994b161522535386ea7c0b60755653e782fb67eb725336f5afd3101efcece3036e729c1282f6006c1e291544641a4e2d4f1887fd1ed2378be424bd9a6ca4 SHA512 fb03770d2ca37d33acafa79a76db2fe5378b16f7717bcbf2c80bb8f8244678bf4418ba2cf8631bd5abfb782af2e22e00a77e889cf4f9a69fa1c49d7dc690d5b6
-DIST scons-3.0.0-user.pdf 2376928 BLAKE2B fed5b4b43f4ce387f6ed0a7ca9017e087ba9bd341bcf02e93c223f4fe1e60935b70dcee73e048e206ccc663bd9413231e05266656623c32d97536116e1a5db88 SHA512 826653a8d6700b8faab6e22451fbf0839b2d639db1492334fbcec39f224d19b2d076f49d6cb167c085e8285e4b7022329042d805066922c2edb20db3322816a4
-DIST scons-3.0.0.tar.gz 630418 BLAKE2B c700ebf316932993540c52735af5ae9a2044a35cf2a1c7324d213059f16e0cd45370432fa32b96fd2e4f328add97ff8d608f73da85ae0b952fd97ba0a727b876 SHA512 e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1605 BLAKE2B 1a5d63a7464e304f8e58ddc3d1d762d1fc78ce9c1793ba03fa46cac0a7db7a0416744c6174e5dcb392eb2832b4d784c95223a698f99606fa7c221ee49c03c09b SHA512 ec381c8ac9873e0b911259819adca2570ea8cfe0934ab32ef904daa1c9aaa7024d0285f4d1c7cf023feb537fee0d5fef72ceb97b4015a3f39627ba7f7ec6441b
-EBUILD scons-3.0.0.ebuild 1632 BLAKE2B a1b05948db16f43bc0c110cb656135c74718e8030ab19525a4b7171ab849b41349250c2cebb9fb28797314408a3a5bf2714850848c037d1f6ba7c5cf55a63ff9 SHA512 ee359a5e18e383be4bc121bd3b7e0b8bbf8460d6be1cf25b76c26e525f56846f093ff2377430122a5a1abdef3470d9a55670f928488f62815974f92a05a4dca4
+EBUILD scons-2.5.1.ebuild 1604 BLAKE2B 13dfacaa0117905ed25e1caf7b22e97211999c92a538c380fc3785780c077f2511ca89ba50ae0c462edfb5027b99c3fa8290d10535eab5503034eca2d27496e2 SHA512 8c77ac2c7a6204cb7be8c654b1e8d4cce351dc83eed71c9d1714dd697fc6d17aaa4caf55e361f31994e0f201b6ac4bbce87bb01e1717806c3a4dcf367720d9ca
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 72a65de61155..2f57aa2a0114 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )
diff --git a/dev-util/scons/scons-3.0.0.ebuild b/dev-util/scons/scons-3.0.0.ebuild
deleted file mode 100644
index 48fee1a5c385..000000000000
--- a/dev-util/scons/scons-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-#PATCHES=(  )
-
-python_prepare_all() {
-	# bug #361061
-	if use prefix ; then
-		eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch
-		eprefixify engine/SCons/Platform/posix.py
-	fi
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index 86e62a146ea7..9a89b8e559a9 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 673 BLAKE2B 240916747f1ab2eadd8f6950f927d286ced3383086293f71e28783f22e69eff8c3ea4fc93f343bfaeb31907f3a9adbe6af06d5a3572e1bd07a26a1fe2950d9c8 SHA512 a9bf07aa0de8f0c865f7d04177d1be188bf06d4512398e0c4436c16c06db98d4192d0871108038b45d097646ca5e0829b38c343c5a8bc551c43ee7b99decdd5a
+EBUILD shadowman-2.ebuild 671 BLAKE2B 9ff2beacb79562283ef5452f989c21fc9781ccafd04f80181d4dc35df600b9eaf98adb62fa4a20d5e224d94f3d43073b76e3cb1fa4baaa4f29b5e5fb032a9056 SHA512 08592aa691fe2e00f70e4259676e7f7e2684595cd9eaf3d3b41b099574fa49a161e481a60114a82a49c14a906f121d2eaf4ebcbca75083672650b3e6395122c3
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index f4323d61cf8e..0844c6e56331 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 89726f2908c7..34e7b34ace34 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -2,4 +2,4 @@ AUX spirv-headers-Get-rid-of-custom-target.patch 765 BLAKE2B 83faa69afb1a9b60cd7
 DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
 EBUILD spirv-headers-1.3.ebuild 557 BLAKE2B 5f7e5a8f2e85333b0e8fbefc01fddc6540e985175a6a6725b1ccdb5257c69170cf843e866e8b61b56f939e7d2e436115f895fda089cda0c75fc08e708af13fe7 SHA512 019b68821189bf705e3dd6c98d177b5c4cd01c0a1d5d42781d483a01119256e765c1f0efa263be1f96a4e35e53849e1c0ede77b06d83fc755ec140a7d3225d26
 EBUILD spirv-headers-9999.ebuild 422 BLAKE2B 8b354506bc2d8ee3ebce13ca9e83cecf7f175494aa49e3b42255f5bf1423fe3f69ffcae361645d09d9f4869a0f639fd6ecf95dcd50bf73ed2ded05ed2f1289bd SHA512 d76c5ef2f2474771b3402c70837a86c1886308fa60bb2e00ac7ea850017a8414707fab08aa775134809125e98b3d97ada47ce8c5ace6a8d5f110be1c76e37f1b
-MISC metadata.xml 437 BLAKE2B 232e49e7463b89ba5e532bd57428bef91615dad147f05e0c4ee1a11e214a10cd1c3025bf76061a84f0ef333ff7dba994c09ccffb8505de90a268daee3a93e411 SHA512 649acd19470edfd6d693827bb09cc5e704ff343452172225571f5dc56373b63c36d499b3bc180bcba8f464b3081461abdebc87ed7015d7ec588ed3ccddaed0a5
+MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/metadata.xml b/dev-util/spirv-headers/metadata.xml
index dd3d561acca5..e0db081821a3 100644
--- a/dev-util/spirv-headers/metadata.xml
+++ b/dev-util/spirv-headers/metadata.xml
@@ -6,7 +6,7 @@
 		<name>X11</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>commendsarnex@gmail.com</email>
+		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 301bd0284e92..4754cbc5c596 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2018.2.tar.gz 1039360 BLAKE2B bef1c3e4efa598bffad8f71c4a92cce9db98fd5699ab2f5616a7a4985c15da87f1e246391a2ca5e07affd352c6314896ff1599cdddc117b01655990f9c7b78f4 SHA512 6deed7a36b460135fd7db613b7101d53a87ae5d555f1795aa9a96ab14f437621d4667a41e5f5ae16e849f8e5d66e02611bed21e3110a902feac6c7f376eb5815
-EBUILD spirv-tools-2018.2-r1.ebuild 822 BLAKE2B 4a7872b35a711706348ce7d5d9b169715845d0ad194bf6a60baf97a7d6198231b45cfca20536a562a237247020b5d090d23219e056bd4ac6db676a8c86992481 SHA512 6b5b2fc029db2b0b2ec88d7f112ede0681609be1e27ac1e383de8973f84d6739cffaca614391f7841bcb72766a0eaa44f8b45f6bb04633723257094ef0e14dff
-EBUILD spirv-tools-9999.ebuild 825 BLAKE2B 103363a96bb5f105c67dc49f7db53394b6eeaf4126d1224ed2eadf20e23808acea5288f6245dc58aa8fed8fff47c6bdcfd6e610aa0b83501ca65db657e0e668d SHA512 2f088ae880f902c71433f61f52b29747841f6be5b6e708214ed887adab5c7a0d34b399bc6a00d803e3048930cb3fb4b91f38266752adc1973e05a1bfe72968b1
-MISC metadata.xml 435 BLAKE2B 907f35e3f59db2ebdf69dde5e9c01e6b4dc3efeea3defcbb81dfe7b84a94518008925b3b24849c150cfe5ea80b166cf3bb93f4851db0a5c647ee27742b68df65 SHA512 7a436d1fb3280e11ab02fdfb76051788f492e03649ae6f88c8cb0b15e4432d10b40c8ee27d5a732cead38b137faf1a9af5713e28c26ea179c4d8c8b18eb59b72
+EBUILD spirv-tools-2018.2-r1.ebuild 983 BLAKE2B 4dbc7ec6a58ff9a219ef28333e63521232f654ef3069c2936889058341de3f52bae573d436a16c593a4dca2635a3fe8764cd3f86565fc3a026386999d764aed6 SHA512 082cdf79b0a477d6f25f572aaeb5aff6b6ee925b64b587819b36a4e484f2293afe3a2d5d5fa96485ce07b074953da7fd7b62d08371278864121d802ac5b18066
+EBUILD spirv-tools-9999.ebuild 986 BLAKE2B c2f3fd69fe7945679cfe5039a13097833e428dee219c03810c489827515383e2b247c8f54f46c27466d1325e85e4b4cb4f1ca392a7312d77a68c0f8dd9b5688e SHA512 33e4374d04014378f5b8e123159d40d42372760a991f097ccb01070674c338cdf39350c4fdf2e9150952035a66fe2feca15ca8839ed08c4792b112a0d5deee51
+MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/metadata.xml b/dev-util/spirv-tools/metadata.xml
index 72d8623dc68e..8199d3b4700f 100644
--- a/dev-util/spirv-tools/metadata.xml
+++ b/dev-util/spirv-tools/metadata.xml
@@ -6,7 +6,7 @@
 		<name>X11</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>commendsarnex@gmail.com</email>
+		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
index fa84f40f6b7e..f1227eb734c8 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
@@ -12,6 +12,9 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
 
 RDEPEND=""
 DEPEND="dev-util/spirv-headers"
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index e0e2f53d0e21..9cd364683405 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -12,6 +12,9 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
 
 RDEPEND=""
 DEPEND="dev-util/spirv-headers"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /dev-util
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)