gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /dev-util
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
72 files changed, 1331 insertions, 486 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9309335a1f06..7b04b8c4f41a 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 25bca8f456dc..c2c3112c5aa5 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
 DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3 SHA512 121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
 DIST android-studio-ide-173.4819257-linux.zip 894877040 BLAKE2B 159d57c0c0d6d6958d1a08e7ff4ff0314c0cb2b15c5126dd3d357e1dc696d32dfee78ae6b2d35a628cbf000bc014d61c20ad48acce12c10356b0db8183c27318 SHA512 c399897bc85ce1399ac8ce1df4749d7f1bff4501cb90b13efbd61a56173ab1f6f9b0c7c1f852dceb7a76bc631d83ca4efab9b39c4d3c76e3b4454f4803611251
+DIST android-studio-ide-173.4907809-linux.zip 897596053 BLAKE2B 6142cfc21d41a23d93ff064be457a28879ce80830bec79a38f6862d0f5b9de7b552d7175d7bf3e3ddfc70b10e0f7313e7ebcb7a3cdf16511c070551a27193775 SHA512 3fc01ffef5dd88dce088cc67fde03c62dadce7a700aace17ebd414ad0b1125b8370b5f132349424ff65ffc721ff383e6793737a0021826f08e35c893e33535be
 EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
 EBUILD android-studio-3.1.3.0.173.4819257-r1.ebuild 3102 BLAKE2B c6d14892b2113d35bf050b6a3d3d990bf2cd0a35606cb1b177ad784f0d10645809224690d01ff26159cd7d1067d91c3426f64313cb059062668559edc6031da2 SHA512 b9d8f3127ac2ec844916c36e79b9d61c9da77a454f54ac21485d6bcae0f9f408e5aaf4d418fbbdf2855b731860058e6586d293c2e42d44e69eb9faff8b07b966
+EBUILD android-studio-3.1.4.0.173.4907809.ebuild 3102 BLAKE2B c6d14892b2113d35bf050b6a3d3d990bf2cd0a35606cb1b177ad784f0d10645809224690d01ff26159cd7d1067d91c3426f64313cb059062668559edc6031da2 SHA512 b9d8f3127ac2ec844916c36e79b9d61c9da77a454f54ac21485d6bcae0f9f408e5aaf4d418fbbdf2855b731860058e6586d293c2e42d44e69eb9faff8b07b966
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild b/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild
new file mode 100644
index 000000000000..2659a27fd7b7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 eapi7-ver
+
+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"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+	STUDIO_V=$(ver_cut 1-4)
+	BUILD_V=$(ver_cut 5-6)
+else
+	STUDIO_V=$(ver_cut 1-3)
+	BUILD_V=$(ver_cut 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}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply_user
+
+	# This is really a bundled jdk not a jre
+	rm -rf "${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/apitrace/Manifest b/dev-util/apitrace/Manifest
index 84809624988e..9e800ac7721e 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -3,5 +3,5 @@ AUX apitrace-7.1-docs-install.patch 526 BLAKE2B 0b0412e17de8e5ad10fbca93afcb9403
 AUX apitrace-7.1-glxtrace-only.patch 1022 BLAKE2B 1265fd4dc70702f6cba1d50437a55177ca19867e1a1c0b9ee0ab1f52b85864aa3a109fc7852aa60225de328cb67c6b987af37bf797aa03eac61b5b81af6980d2 SHA512 3cbb1b25dcfbb57785feba8ef83450e270f062fc771e5fd1ae99c8ac893cad6e33162a12fccc962da08778a77377db652690efe3c54d60b2a56a6d1971cefdf1
 AUX apitrace-7.1-snappy-license.patch 240 BLAKE2B ef144dba8882466d0fce8da74ffaa008840ca1d9fc411f37e56ec7bfa3ab1637c001b87fb80186b1844abe7694419719a0c1ad011bba5002752d4c1fcc448e96 SHA512 0ea2d2fe38c0ecd12a41dcef66efda7e55d02c43a9a8ec52da621f711e50f040542efa65e855d52715fa0ab78d54b4c5620ee0cfc0795f4d9eb4a433d07da60c
 DIST apitrace-7.1.tar.gz 2343156 BLAKE2B ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
-EBUILD apitrace-7.1.ebuild 2514 BLAKE2B e715ce5917aff9a84e2a26b38176e53d16fe8c6e11f5d1347b6a216ec95f90cf04064cb14a09e7adc763f56c04125c384802972faf0db69e53d6ad419a40c3dd SHA512 c65aeb52b0ec152d4413d569172b2235434bdf2b17326e84cd85205880b028f0f390f2262a7a2d4aa1ca11dad48f208ab16daf0d0511a856eefd5fb583492595
+EBUILD apitrace-7.1-r1.ebuild 2439 BLAKE2B 37393fe352c333c50f870dea34cbcff7e53878bc84194d64c5bfe7eb0812e6dcad9477a6634444d37498b359d456a739a24b5fa6fe4a56152deb3360d56ca1f6 SHA512 c916ea1fd2a816d59979e9490a4d7cb8d0fadde7f47c5e32b53711d53cc59ebb078f57548bfad5b2dc206d89182b8c34fe12b18fcb4a22dd297a703c74312763
 MISC metadata.xml 721 BLAKE2B ac714ac582205e96e3728c64d84f9d69b11625bd29cbea77a00009ff92634eb61caa809c0926e00f75f7bd07a6559738c6d0bac7c23cfe7495f9bde95502d8d7 SHA512 961e99dd94af7d8fefdecdd4ea91fed6ff934ca0c047721a079f43aa8e3b566523fe57a136063155dda0cc3f058133e14fe58401a5a39c35ab8149a7259b76a1
diff --git a/dev-util/apitrace/apitrace-7.1.ebuild b/dev-util/apitrace/apitrace-7.1-r1.ebuild
index 7eeab3135213..c39555ef4931 100644
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
 
-inherit cmake-multilib eutils python-single-r1
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-multilib python-single-r1
 
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
 HOMEPAGE="https://github.com/apitrace/apitrace"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -18,11 +18,9 @@ IUSE="+cli egl qt5 system-snappy"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=sys-devel/gcc-4.7:*
-	system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
 	media-libs/libpng:0=
+	media-libs/mesa[egl?,${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	sys-process/procps
 	x11-libs/libX11
 	egl? (
@@ -31,11 +29,13 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	qt5? (
 		dev-qt/qtcore:5
-		dev-qt/qtgui:5
+		dev-qt/qtgui:5[-gles2]
 		dev-qt/qtnetwork:5
 		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)"
+		dev-qt/qtwidgets:5[-gles2]
+	)
+	system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -59,15 +59,14 @@ src_prepare() {
 
 src_configure() {
 	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-			$(cmake-utils_use_enable !system-snappy STATIC_SNAPPY)
+		local mycmakeargs=(
+			-DENABLE_EGL=$(usex egl)
+			-DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
 		)
 		if multilib_is_native_abi ; then
 			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt5 GUI)
+				-DENABLE_CLI=$(usex cli)
+				-DENABLE_GUI=$(usex qt5)
 			)
 		else
 			mycmakeargs+=(
@@ -89,7 +88,7 @@ src_install() {
 	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
 	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
 
-	rm docs/INSTALL.markdown
+	rm docs/INSTALL.markdown || die
 	dodoc docs/* README.markdown
 
 	exeinto /usr/$(get_libdir)/${PN}/scripts
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
index ba693c309ae8..593b34e2d0cf 100644
--- a/dev-util/bitrise/Manifest
+++ b/dev-util/bitrise/Manifest
@@ -1,5 +1,7 @@
 DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
 DIST bitrise-1.19.0.tar.gz 4223634 BLAKE2B cb0822af15c1214d785f002617cd5c184e50a85c289d7ef5fe4fb429009495db26935aea9b9fbdb43514221d233a10347b52d01c0f839bb981da8437d61f79a1 SHA512 ef0ca59a907bf85ceadd2bccb7859e6b40146fd4983d51c84f82ba3ac36b47eeef41cbd342cfcbe516ed2ee678e66a4e07ef451cc36a7b6977fa6def9ac2a1e4
+DIST bitrise-1.20.0.tar.gz 4226859 BLAKE2B f358caf503e02bfbeb895ebe759aeceb2c28f0055676cc897b16ffacfadf2b0f48e7c0c495716d58d1a65b8697889eb3c6895a145bd7fa6828bbbe32280c5d15 SHA512 edb3e78fe8714604f2e514d80efc879b8a28e18846be9f7a9abc641901355b31ce6659ed30ef9c81bcefbe9816d48a6a3f6c292f8948c09c6e9330fbef154eb7
 EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
 EBUILD bitrise-1.19.0.ebuild 1107 BLAKE2B f7310107af1e54c7c0bbdabed8a34bb395cb32fe7c0f33dbefea4f20bf2e1e1dc220f192f7c7ac2ad7a7b9e4119f81fe4d58a8e01760e8c2310fd68bd5f7820c SHA512 08be8f002c738976f4127fbcc55223949f439bfc2e56de01f442a545164640e88205f24af10a3d643b6947446f809ba5a3690a82e1433321b150248d73978ff1
+EBUILD bitrise-1.20.0.ebuild 1486 BLAKE2B 16bd7ae58234830fe8a85828cf857b8be6a96742531f94de2f8aca024fc88afc2cb2bc4a8802f4cd02a3c12f37b62dd05bc981a34679a7489357f5de0b3c67df SHA512 ab6d0c7e346618d8500dd0308166d2195e6d711f34b5778ba097d96f90529b9e2b01714da454be938706011add5101c3b5b08b37bd00550c7fee5340505f2de1
 MISC metadata.xml 1069 BLAKE2B 18a8c9d910ea0495f53dd0f979ee07f5b99394c9198e56739a54e03c9d5a158038de5b9d38fb57a71a191327b76e7902ffe78324c23889295e4f7c404ba0e130 SHA512 787df19e97b702d0b0ca57a2474a68957fb953c16f236aa235f2488598c051851cc174824aaf60bdd7666d8338dca78f109ac03510e1a374605e855605870cf8
diff --git a/dev-util/bitrise/bitrise-1.20.0.ebuild b/dev-util/bitrise/bitrise-1.20.0.ebuild
new file mode 100644
index 000000000000..3a7a162eac9d
--- /dev/null
+++ b/dev-util/bitrise/bitrise-1.20.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND=">=dev-util/envman-1.2.0
+	>=dev-util/stepman-0.10.0"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	default
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
+}
+
+src_test() {
+	pushd "${S}/_tests/integration/" || die "Couldn't find integration tests directory"
+	rm envstore_test.go exit_code_test.go global_flag_test.go json_params_test.go log_filter_test.go output_alias_test.go \
+		step_template_test.go trigger_params_test.go update_test.go timeout_test.go || die "Couldn't remove network-dependent tests"
+	popd || die "Couldn't return to ${S} directory"
+	export PULL_REQUEST_ID=""
+	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/bitrise
+	dodoc README.md
+	use doc && dodoc -r _docs
+}
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 499a65552906..a29ee9c408a3 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -14,7 +14,7 @@ DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd
 DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
 EBUILD boost-build-1.62.0-r1.ebuild 3903 BLAKE2B 043936d2e52800edb79e6c69180e0c5cef1a237c0e3d2297da3bd70e230bbdd24342f288c959e476d5f38e2f93a5c643fb484878d39719d86fd0fb4535644142 SHA512 5c2ade13e563b52163e9ff072f8c2c98efb2ff95a9c30f1d9c590a02271570db15015e852df297aafecfcdc845d18e15db878d3fa81a4a1619f67808e9411efd
 EBUILD boost-build-1.63.0.ebuild 3827 BLAKE2B dd1f7ad44ffdac1565e7314be8942393c58aed3cd805464c04b7ce6d09a6b15d1c2b391396e45a55725a95b971e1a589a7224acce922e9af4dc63bd546ba0092 SHA512 7108fd0049da3be73d5a0423094ad63b50d1e1209cf0570046a4ffeebb7dd944adf0fb6497a06c88e68af0a61636a8cd48d5a3c3379307eb67cc1c65ed6da3ff
-EBUILD boost-build-1.65.0.ebuild 3827 BLAKE2B 7a19192a568f013a256fcfbaf5b6338a6fa4b93500989657f2b12b311dfec3af38fa1c508bd1cc4113f4a4109ec652c64d1d492cbe1cd17ae9a5263dda30c202 SHA512 615cf675233757e540dc60259332d1579069e71f1240f7e19c79fb82b94d7bddcb00a73123c1deca2b7e05c193cb539ac487ad4425f5901f1629b122555900b5
+EBUILD boost-build-1.65.0.ebuild 3826 BLAKE2B a04f2363e055efb59001bdb3fdbb9c1ff20582ec15603dcfb362ff5d679f69fed64cdd80962f57ac4bec3bb32e5390c33ca52d8289df9710ac7484775799e58b SHA512 105be8996c3e88612d803476428981b90ca1f5b891260a36a3707deeda846503473f704f1784f9a29cf29e1d8e1c6c2f9f0e5dd3dc18424dcfe2e03fe5fd31f9
 EBUILD boost-build-1.66.0.ebuild 3896 BLAKE2B c5f6d2b2e9f943553d864928b6f3750679641654bb97b1dc37431190d81bfb560f015e7e36b373997d95891bbe97a72c4cfc456301f406df668e874b2121c76e SHA512 f33deb81bd957925d730b2224df5e27ec24279376bc49d3d6e2d9e538edbcb4c7f89c0de66c38d609748ab7469065bad61aa7a7518b973157f885185e3386465
 EBUILD boost-build-1.67.0.ebuild 3863 BLAKE2B f409a586844fbcc0dc898cfb051682e9ab06f9f9e5e66ecc05c7a9af03c167e52c1650745d518b952a866d52d163c3689796a2611b1dac9cf20f789b4a6cf58d SHA512 27c84fc912d0ddaf8ea3d3a7ded91f3a80994f052652b46272f5ad1482afd1f29979193adaa52715872c27a0afd08d8c7817fdb0a9bcb62278a483731f313cf5
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index 44cad29af789..0a977472723e 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 572555870bd0..feb16200284f 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -8,6 +8,6 @@ DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749
 EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d
 EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
-EBUILD catalyst-3.0.2.ebuild 1993 BLAKE2B 76da50315f207c8c29dfee5598bde54749c681ed7de0726ae040c6f3e36420ac5ebd19af8d00061b35aeff0bc730b7aeebae96480b96a0e2ce8d1f3e4e448f7d SHA512 444c5e6d30bbaf61b4a6f12c404532b7be5cf5b5322c37fcfc670494b5e6dbbd726134df3d40d0915426587d05cbd1b9493b753d6ab186a7e57e8e5f917e017c
+EBUILD catalyst-3.0.2.ebuild 1991 BLAKE2B 320f68ea1cee53ff519006532321a8ecc695c1b547bf4f3d170a564eb336c430f7575effa03e112c086591c2f5fd18f817416e050a76e01769c4e282da1d1ad3 SHA512 a27092e4b8af69f20c08d3ed5f808e16b08a7fa7ebc09ed599e0dc0f3e0d969cdc8093995aeb245439a463a96fa44eeabdfb2031fec96ad442c3b0fb306b567e
 EBUILD catalyst-9999.ebuild 1993 BLAKE2B 055a409cbb3ac2c82f776c5613b0d9e09aee320fc6a9ad445f0738f10fb5334b2f49f975606203b6005370c568d5e1648aa9b286663439c34247c4eebce32081 SHA512 3e526426383b71b906be666f5cba15f8a9dbddf0836313acbd3ccadc08dad5bae445db81560a7e47bd23b1f2f6e7b885f6c677ce124a2782af4928a5263578bc
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
index b253f77f24a9..cc286d0a2429 100644
--- a/dev-util/catalyst/catalyst-3.0.2.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.2.ebuild
@@ -12,7 +12,7 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 1bf9135f3802..c0017e2edd78 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,9 +1,12 @@
 AUX ccache-3.1.10-size-on-disk.patch 518 BLAKE2B 1f949d0cb0168e3de0a4e142db339f59b1dabda2b06912133e10c536e23f7912e002c7d4cf6ec90654863c0339339bf17baa9b3b107110e4f25e6876ba8fe39b SHA512 bf7a160b091798e7de57748f4f9e0d6f027872c713108e3791cfc82bf64d3ed843607267ff0cca9e0848abf8bbcbbb6c19921560032576849a42f29ecc496212
 AUX ccache-3.3-size-on-disk.patch 514 BLAKE2B 93ce94415da1ac5af7ccf60958908f7b1b75b9a7af2602c1f23113b06dbc15489f797a188103a948cb7dd81ffba11797fa0e525c2ab667b9fb5a2a890097028b SHA512 7e7f01ca602722a1add1615223bb109cecfdf69ab7612a0424732f992331b0addd7b94f684fedb91486f69cbe57fcb1961d1069116a27458f1f5b20a169f2569
+AUX ccache-3.4-size-on-disk.patch 522 BLAKE2B 6ec1f4cdb75d39997e16716caf3195c180ef7796568031b0dcbb92c385034b793fef2ad7afd9d3aaf66c37dd562447fca3bbac8b42909b2fa4e2b2ae1f8008ea SHA512 91757a176c813076d90f1a44b6a605bf1fac30e47caf253883c59e8f9e0e257d6aeceeb3f3f96351fc5c24f413eb7bb08a811e4be0991fe653ae62d68cce565f
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
+DIST ccache-3.4.2.tar.xz 324340 BLAKE2B e49582b4ff254dd4cd210634342d7b21d5c099892d4c7f3240122a3b9de013477f6c440eaf73d06fc0445020e225562528babfb41d10ca1fab68052c1e726531 SHA512 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
+EBUILD ccache-3.4.2.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.4.2.ebuild b/dev-util/ccache/ccache-3.4.2.ebuild
new file mode 100644
index 000000000000..25d07d629e1f
--- /dev/null
+++ b/dev-util/ccache/ccache-3.4.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
new file mode 100644
index 000000000000..4f39a0348f2f
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/56178
+
+stick to the size of files on disk rather than their byte size.
+this func is only used for stats management, so this should be safe.
+
+--- a/src/util.c
++++ b/src/util.c
+@@ -845,12 +845,7 @@ file_size(struct stat *st)
+ #ifdef _WIN32
+ 	return (st->st_size + 1023) & ~1023;
+ #else
+-	size_t size = st->st_blocks * 512;
+-	if ((size_t)st->st_size > size) {
+-		// Probably a broken stat() call...
+-		size = (st->st_size + 1023) & ~1023;
+-	}
+-	return size;
++	return st->st_blocks * 512;
+ #endif
+ }
+ 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 98982495aba7..61c6fb1defad 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,9 +1,12 @@
 AUX cutter-1.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.6-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
+AUX cutter-1.7-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
 DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
 DIST cutter-1.6.tar.gz 1083427 BLAKE2B d51b88f2b9dd2655ef58d7075086959ec3ed59ed4b21db81a792ee165deda523a4e59378c954d0f2aa5b0af25d67329ed2119c004edc402c9b593a3b230a6fd9 SHA512 83aaadfbaccdaa514606408868c050e22d0a80a749b98a9f6df929467a16e69b0d454b25ce1cf53e35ebbfb74e9b39e2bd390057488c9bb3992a442ca306c2f1
+DIST cutter-1.7.tar.gz 1099734 BLAKE2B 200621a902fabee66ebb6e02cc0efb7a705320c6071db5ce64adee0717977a72056bb5ef3ea8f8cad05488c7f031da7c24bbfc2986bb780f111f0a3a5b7a5b0e SHA512 52eea3017ebe02dee4f4e2f7109486ef2b833359959f7058fff49b4462dbc551e6d25cf31da934c9dc8489dad68ad2a3ba8b12fa60789852d13e8d3cb225a1b8
 EBUILD cutter-1.0.ebuild 637 BLAKE2B a7ee78a5d5f0f988ca10b0f7af3a5d5f63d433eea111358953599db557bd4cdbb656858619aaeb53293faf2749f8cb4540670ee590e6e3a9ec373a98f099da64 SHA512 71f8a88e2ac7b0d3215cbb32c3cc3c3b9d433010deb6755d5fcabfee26e1440948eb33c658374a2070c1e5f844099c715f461935da410d3fbdf2daf2be181a88
 EBUILD cutter-1.4.ebuild 1009 BLAKE2B a0056eeecee4e95a9b9e6332b9d8ddd9007ff569d93c473257ebc59bcc3a80a9a6bae8dc996f50ba355b8e29298d1a9c6c158402f77f4056bfca6674875135ba SHA512 9b78868d333fd97fc424e3eaa46d136098298f79860db68898dbad3841353dc81dbd513a312431f16d536c3273c968a5317f6bf58250f9f9ae792b9643ad659a
 EBUILD cutter-1.6.ebuild 1009 BLAKE2B b511368dcafb04f330ba2a9212cc5a2ce451f6ac69efc4b02dd789f63c326536af8a1b2339c2a17c50a2f47fa41f80bf5465ceced2c3880a90e482fcca372137 SHA512 3ec586afa2c3c9b040acb05e54a37b767dcf35fe0e9fe840befb0d8cd7221d2c6f91d994ce3006fb0d45666c29d79c47fdd0d3c4a3160aaf4661de077c00b903
+EBUILD cutter-1.7.ebuild 1180 BLAKE2B 298213403869122e505d67cb655aa5604be2c51e8ff8370e5ddda46157c4ce4c549237c96412c7435a90096d7d78f0c9346dc2c6cab4fec66f4b6a1d2ed122c9 SHA512 ea4eedb00a260567cf62853d3452b368d0c84fcd889c00ed67c224450fee010ab0096b1f2dbad03376791ea2908fac2accf024865fead13861c1f2609c97e829
 MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
diff --git a/dev-util/cutter/cutter-1.7.ebuild b/dev-util/cutter/cutter-1.7.ebuild
new file mode 100644
index 000000000000..283bd485f0dd
--- /dev/null
+++ b/dev-util/cutter/cutter-1.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jupyter webengine"
+REQUIRED_USE="webengine? ( jupyter )"
+
+DEPEND="
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtsvg-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	>=dev-util/radare2-2.7.0
+	jupyter? ( dev-python/jupyter )
+	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3-config.patch"
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
+		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/cutter/files/cutter-1.7-python3-config.patch b/dev-util/cutter/files/cutter-1.7-python3-config.patch
new file mode 100644
index 000000000000..51a811dbb33f
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.7-python3-config.patch
@@ -0,0 +1,20 @@
+--- a/src/Cutter.pro	2018-04-24 17:43:11.000000000 +0900
++++ b/src/Cutter.pro	2018-07-08 21:21:34.280748499 +0900
+@@ -74,11 +74,13 @@
+         LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
+         DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
+     } else {
+-        CONFIG += link_pkgconfig
+-        !packagesExist(python3) {
+-            error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
++        system(type python3-config) {
++            LIBS += $$system(python3-config --libs)
++            TMP = $$system(python3-config --includes)
++            INCLUDEPATH += $$replace(TMP, "-I", "")
++        } else {
++            error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
+         }
+-        PKGCONFIG += python3
+     }
+ }
+
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 74d5dfb7247d..f99154b98e14 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,5 +1,5 @@
 DIST dbus-test-runner-12.10.1.tar.gz 382108 BLAKE2B 760ed88f089b92ff3d51bc7342f11691e760b2aeb107e2dfcd903f1ebc3acc2e1ad6dfe3768d29329408770f562f8dd9656f7aed8e45d7e6b5334f5d328d5c0c SHA512 6d40d607fdc417ebb9aaa6dc3cdd41a8ff1563cb3791689d17a99d105a0c16dad8ffcaf3da7ab6b8c3dcae17d2eba1bf8a6a5d92dc1d3de0975218220ed3c9c0
 DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
 EBUILD dbus-test-runner-12.10.1.ebuild 748 BLAKE2B b5cbba38435ada80f7d75a47ae8cda181a750d3f2d4aea8a6f0f4b8a5e0f1602c11925b37b974600f3d575ea762231eb0ea35565521aed0b640d195f5fd50101 SHA512 9a1f2b4ed8b757ca09a1195d567716620d7ecea9d45e4ee4c31d478c29cc5b2a95941f536a9c59e8c4c61b34f8e55d823d655ebb5641f93e0a41dbb339cf85fa
-EBUILD dbus-test-runner-15.04.0_p100.ebuild 1062 BLAKE2B 73a351c0093d81041de019f72f4abd77a83d3ccc2c1cf58568cbf6ca6e9f7ca31aa481cb76cc4d976118a28cdd564adbd18eeb099c27e30ce4ce482e887a7089 SHA512 46db266c277e6a3d5c02bfab1b1a695422629d003b4ff5696e2283cc472db6a3a13239789fe8849e765a04f7ea2f4318d316423afa0111067ae9dcb8bf20f659
+EBUILD dbus-test-runner-15.04.0_p100.ebuild 1059 BLAKE2B 414d307546be572965718de45ff6a80713462ad6f768e69145d3b28fd175eee619bff8933706b9108ced86896e1f95f56b2d9d9bb73689588b7f516386bfe5ed SHA512 ef9d66604300ec17fba41f9f3ec900621dfd145cb2d3d298a59971a8835a16964952785a5b5e9b193e03b460b7529f895f439babefc5635893b3f80335d4ccc0
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
index 97a40fe0f91f..8d824950024c 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 6b71b1405885..5907500b097d 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,10 +1,8 @@
-DIST debootstrap_1.0.103.tar.gz 73167 BLAKE2B 063e27c1d58826bb7fec7879a5876df33b0da27cdbbdce3aa5ffecbcb70dba2814817e644725a132100cc7c7d182576bb2ba813f96bb4b289d06622d073da9d3 SHA512 4b43db32c46e5b69db9885494bc1f91197a40311c05196bf1c6e17d0a1f0519dbf61c8f5731c8627a708b8dfc8f3ba78e822a21879a5caf0d70046e3b7e60aa2
-DIST debootstrap_1.0.104.tar.gz 73264 BLAKE2B 28b4d1d1ad389dfb13f049529e5d14e1d8d82abf58b802ff25787e5c791c5d25aa2fd349f923b4e4d29bcbed78f2d32769189e110b6788acb67fb5499454dc52 SHA512 cfefa225a804e353195dedf5fbf0b005e7ac988f66c934927a312a32e8bbe9fd1083647fbafc5dbb3c7b55613887beb2c6296e3a5b8ed705b9ce18e850ee27a4
-DIST debootstrap_1.0.106.tar.gz 73686 BLAKE2B c6dbaa19ab702e49117b56ed04928f0ba6656ee9af8f206ae376af72baf114b20175b32e1c6d6b2fbc7b851e204445b4758a0edc147b94c687ddb5bca8457252 SHA512 86eee4ea1782cd96f364df748b3c7c62a48728c3371fe708937ebb76d75d0ad967d76af7a7f6cc1eb7a8623bba817137b49ffe145378489126d38021dd2882b2
+DIST debootstrap_1.0.107.tar.gz 74202 BLAKE2B 672f4bd723bec5d77d4bf6a5e38b9092cccb890141a44c67d8e8e63e35be3e3735e348b82052090e748d39ad025d73e18ca939c1b040be30af760cdbb8e8df81 SHA512 5b166351c590918cb913ab2307b61c5e6e257c7227e04881ff91d9a579db32c2da920a590ae3471821513eded9bf517feee97bedf43b7feb2ea7f1c5308b873f
+DIST debootstrap_1.0.108.tar.gz 74631 BLAKE2B 3b676f993843dc70bcbb38929f8e90357c1be45430178fce9ccf7320fc5cf9fed5e9f6eb3137878fe86fcdbc082315f9edecbec321453c22fa588c601206895d SHA512 69f71ffe6668e0fef95f88f74d8625ca32eed11a43b893ad79e4e1abc8c79156bc9a3f8d2465465577d83cfe2ea40692f2f616f173edab0b1d9ea3c3a04b9736
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.103.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.104.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.106.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.107.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.108.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.106.ebuild b/dev-util/debootstrap/debootstrap-1.0.106.ebuild
deleted file mode 100644
index 93ffd5d2d1aa..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.106.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.103.ebuild b/dev-util/debootstrap/debootstrap-1.0.107.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.103.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.107.ebuild
diff --git a/dev-util/debootstrap/debootstrap-1.0.104.ebuild b/dev-util/debootstrap/debootstrap-1.0.108.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.104.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.108.ebuild
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 9ff1d5bfa767..c74ba1948c42 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -2,8 +2,10 @@ AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb0632
 DIST dwarves-1.10_p20140618.tar.xz 105912 BLAKE2B f1dd0a2206c09a259f1efde86bbaf946dcee92c680f59102059fbe770b1d4fb3776effabd096a7b94e068fa9ef1ea0947f489add2e5171db1ee3e325a507ef95 SHA512 522a6d674da5cc2316c180bcb4e90419d5811ff34e6aeeef875950dbcc4c12ea5a133d159360629d687f93ae2db622bb87d9b94a747aade90a61b239b9137a2c
 DIST dwarves-1.10_p20160519.tar.xz 106532 BLAKE2B f8bcd60fb65a9905fe8027431e38f594bba0d944c8a2ef0b25d078980773a6ffc6882b045783c63f089f605b9dc7b17c44758b24accacad563e4fe0cc235b39e SHA512 74797e934db900e78235705f70de45667e4ba7f56c0b7454d148365b8c87b617dcbf07fa12bdfdcaa2c129cd2111b029b458e71f77261b237de46fc2759a37da
 DIST dwarves-1.10_p20160630.tar.xz 106700 BLAKE2B 002c3c7e3d94dbfa199d78ae8be5a2cd4d95dab69e542c9fda6660aeae4e183bd0eee8926a5d1c54d58eb75538e35ae16ddf78e071714d0ab08444abebb8252e SHA512 f33ffbca0ef0dd89add5275c01a35e7c6298c4dae73be9c197887c54608ffb0edb95b8792f8a51ab29d80051682752d6f1c2596a486f61bc18e6cd47e2b7e4b0
+DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27
 EBUILD dwarves-1.10_p20140618.ebuild 1038 BLAKE2B 4b7554e6e3430285a0ee841ae2468a30b66f69f391c3246bae594b91fe920627cee83499441eaad5d882d42613a900bf1ea9131fa0f6de19194426056c8119c8 SHA512 6cc3333ecaf75f0cf910f2c364d56eace6c7ea89b52377a4d79275e485e01398745d5ac45cf0201a4cf3215b6a57d53b3e8a96dc0a65b2cc5b4e864824b11637
 EBUILD dwarves-1.10_p20160519.ebuild 1038 BLAKE2B 810faad7bd8ef2a477a44afd3fdce7f28b4ee152ccd2b254ce16ed4a3aea048d319c00e4dc49efe5d1c9633dac6521a024c6b59af5bdab5816f53ed721038b62 SHA512 b639ba81e22f559b1547e78ca1ec945471b946050f6a61892321403c4e283388067a4870835bf8a8fccc0b0367f2e14c192642ff210530604945662c91840f26
 EBUILD dwarves-1.10_p20160630.ebuild 1038 BLAKE2B 810faad7bd8ef2a477a44afd3fdce7f28b4ee152ccd2b254ce16ed4a3aea048d319c00e4dc49efe5d1c9633dac6521a024c6b59af5bdab5816f53ed721038b62 SHA512 b639ba81e22f559b1547e78ca1ec945471b946050f6a61892321403c4e283388067a4870835bf8a8fccc0b0367f2e14c192642ff210530604945662c91840f26
+EBUILD dwarves-1.12.ebuild 1038 BLAKE2B 9cb69f3108df21db6c39c359129df606083374ba7a9dff0b8338dcaf9ca96bc1b85be0c135d7c2e8b76a60e1b391ed6c4abcd9eeacfc75fc6eb8526f0a2dc803 SHA512 9ba86d1966a769c43202fa8152617e6af65a0f967433aedfe69461857607485c26d1d51fb8dc5c5b2e48a55d9c8d1c67c54d0d64f3b837a9438531e1d2ffe51e
 EBUILD dwarves-9999.ebuild 926 BLAKE2B 6f6bff98a7f3e0463f5a89a27cec543122f9857468ab263e5027a8a4fafa5f4a9c46eedd53da7b9c0bfabfc788538ff738acdb748c1045a33ba6a024be6d24ef SHA512 dbed04e6cf4e2c5f0aed91ba35c299ad88f1a3bbf95f278ce48c4ee1b34751f6246f73d6fabc207fc83d6d4b28918c549634bffd1e621da2cb7e8a26d9f58ab9
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.12.ebuild b/dev-util/dwarves/dwarves-1.12.ebuild
new file mode 100644
index 000000000000..13d4797c399f
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.131
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
+	S=${WORKDIR}
+else
+	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake-utils_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${D}"/usr/bin/ostra-cg \
+		"${D}"/usr/share/dwarves/runtime/python/ostra.py
+}
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 736b8cbb5ea2..900b2c435d60 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,4 +1,6 @@
 DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
-EBUILD edb-debugger-0.9.21.ebuild 2109 BLAKE2B f8412190b29713ca51b90cc322a92974a879c897c79d7145c3e0fb79d2f9c46b333064a4f2538b4a515f5131dbd38f939fb65192e9d7996458d7df03fec55f0e SHA512 d1d932deeb4109438e97c4b8417b3fa493d40a86e3582ace599097047691d1c6148ac3b62ec1b500af25171db3cfd790a8b67bb04289ae5ac7c819b0dc836def
-EBUILD edb-debugger-9999.ebuild 1238 BLAKE2B a31e56662cb09b439fcbad13011e05a931fc05f6099793336c9b74e6cde709b86a1e6d85b9b8e7c2eb66e8eacb627581313f1968ae5ef95ba84b56a5c6133bf2 SHA512 24763b7327d5d23dff879bd230c0c56c0a88dd6a7fb94c13699ce6b45c371bbf6d27c8b72736e26f25877758f004e4d46997858349a36b00ef96d701bddb459b
-MISC metadata.xml 688 BLAKE2B eaf7922cca384a33aa16e2593ecaed8de0eab807ed8781c9bb8bba754d82ef2234b74e75ca77817f5a568bd044949572bfdeee9d9ab5981c79fd3952ff587a5b SHA512 f83568251c245ecc4b3c2aebebd461e5ef765f79736a97c230bd58bdfa4da3643aa2e9fc6ca2b80eacf81ec2af6c1102c5f432002505ac6ad7977675aa629d65
+DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
+EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
+EBUILD edb-debugger-1.0.0.ebuild 1096 BLAKE2B 3f73167ba37b9d4bc277fbf53fddc96bfb98b9f301be40cc322accc063437ef5d7001732b5868d6fb57ad469a460b220c486ec1e1322af4b3008dada35d7c86a SHA512 460c78cf689eea5eeef7811bd609bf950b68aff1151ad562477c039ab8317407a826dd5e28e036acbb7cf43e8dfc00f1f17d709c9daedc2a8d47133eaef7d852
+EBUILD edb-debugger-9999.ebuild 787 BLAKE2B be915dd9ce1d585bf4852a928f262bd37d03df3d61f9aa237bfb11f359b3f2a464d12ced3b24dd908c8ce38aae78a2b19469ab911a1d1811dfe6ff88062eb0c4 SHA512 ca50d50f061e1373c7b5177cef7cea6c5878f449b7877324ef963b37d3e93d97ed4f9ff9f7fbfc235bc339b4beebafbed796838b04d234e87a1f6714be7c542f
+MISC metadata.xml 601 BLAKE2B d91cda94777a8c5d1332e28b7cb643c59271d2442b3aef592b4ba097bd953693107e32803f23a5f2666a6cacf142ca87c0881cfc00a99f70b5a043755a14935b SHA512 76dd4c92c4a5463273ae8c8f9568e1ca330f709900a16247a7e8dc1035e3530c358c2573953d75845b442f63e965b3584ca7fa9f2fb75b55aa4985e13d3cbede
diff --git a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
index 8d159b715b63..e6f1a158575f 100644
--- a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ S="${WORKDIR}/edb-debugger-${PV}"
 
 RDEPEND="
 	>=dev-libs/capstone-3.0
-	graphviz? ( >=media-gfx/graphviz-2.38.0 )
+	graphviz? ( media-gfx/graphviz )
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
@@ -29,11 +29,11 @@ RDEPEND="
 	dev-qt/qtcore:5
 	"
 DEPEND="
-	>=dev-libs/boost-1.35.0
+	dev-libs/boost
 	virtual/pkgconfig
 	${RDEPEND}"
 
-src_prepare(){
+src_prepare() {
 	#Remove this in a future version; There won't be any edb48-logo.png
 	sed -i  '/edb48-logo/d' CMakeLists.txt || die
 
@@ -41,15 +41,13 @@ src_prepare(){
 	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
 	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
 
-	if ! use graphviz; then
-		sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
-	fi
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_DISABLE_FIND_PACKAGE_GRAPHVIZ=$(usex !graphviz)
 		-DQT_VERSION=Qt5
 	)
 	if use pax_kernel || use legacy-mem-write; then
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild
new file mode 100644
index 000000000000..19371dd7bdb6
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+S="${WORKDIR}/${P}"
+
+RDEPEND="
+	dev-libs/capstone
+	graphviz? ( media-gfx/graphviz )
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_prepare() {
+	#Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index 800b7d58d535..43268a0bddf5 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,16 +7,16 @@ inherit cmake-utils git-r3
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
+EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
 
 LICENSE="GPL-2+"
-IUSE="debug graphviz"
 SLOT="0"
-EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
 KEYWORDS=""
+IUSE="graphviz"
 
 RDEPEND="
-	>=dev-libs/capstone-3.0
-	graphviz? ( >=media-gfx/graphviz-2.38.0 )
+	dev-libs/capstone
+	graphviz? ( media-gfx/graphviz )
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
@@ -24,31 +24,17 @@ RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtgui:5
 	dev-qt/qtcore:5
-	"
+"
+
 DEPEND="
-	>=dev-libs/boost-1.35.0
+	dev-libs/boost
 	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare(){
-	#Make the desktop's entries somewhat cuter
-	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
-	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+	${RDEPEND}
+"
 
+src_prepare() {
 	if ! use graphviz; then
-		sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
 	cmake-utils_src_prepare
 }
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	mycmakeargs+=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DQT_VERSION=Qt5
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index 9be9b854d3f5..a940dc098dc5 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -10,11 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
-		<flag name="graphviz">Add support for the Graphviz library</flag>
-		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+	<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
+	<flag name="graphviz">Add support for the Graphviz library</flag>
+	<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">eteran/edb-debugger</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-util/envman/Manifest b/dev-util/envman/Manifest
index 1ba33a6f12f2..20c8aa974018 100644
--- a/dev-util/envman/Manifest
+++ b/dev-util/envman/Manifest
@@ -1,3 +1,5 @@
 DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18
+DIST envman-1.2.1.tar.gz 3033981 BLAKE2B a48c46d35a122ad86274867c246f1af998a983a67e8d30214bc6f3a989ad6b435a61ebad7f128803ffb9dcfc05af261b99cf3316fed93412c6ee1da873cc988e SHA512 bbec25964d868077c88a01ab827744633b325eb955809d4ec48a5224f6f8530c31b297b592f0280dabd01007bf75fd6ac3609c4d19be0332ca114d36725c7fb6
 EBUILD envman-1.2.0.ebuild 873 BLAKE2B ab827ea0ff610b6d2675f925dc65b32b47472eaca4f605341a71d332ea00527fb8f8357847a7f0bdbc3314d9182ea104dd13f9c179a8b210410190cb1472ade1 SHA512 862df91f0bed24dffec1e1c0d209aed338a2ab060c41ec147a82503a81f279b787ed2524ff0cca90be47717881b491ac7a4490736a8ac4a3011289bd7480ac11
+EBUILD envman-1.2.1.ebuild 869 BLAKE2B ed7a46805b4ee9acc2746795b09d812bf012c2975f7b75d501d94409c3a14312c9c4c985cb3191512203e9ce5fcedda346fed15c39bc79c4160f509a7041e49a SHA512 6dd367bd5ff737cb782192c35be6251a60a049f2a69a196171a2b2415b57d896a1c5db8702689ad926a6a445227cac50de83e00aaf2429cffb52133292357f15
 MISC metadata.xml 942 BLAKE2B 32b021b4b9f97464d5ff81c7541a389105d75d32ac8598474007f4f27013c0b1bff37968a4ebcf9b9e41264686aef44c43da6896426392adfaf91576ca2873fa SHA512 4fd1c54eec14f80bd804140299d2f987c404f0653c6b6adfc1715ac01cbaed0555ccb8cd87fbe6a2f34b7cb90f81cf20db817866f40ea2f6c607c7268705a089
diff --git a/dev-util/envman/envman-1.2.1.ebuild b/dev-util/envman/envman-1.2.1.ebuild
new file mode 100644
index 000000000000..6909eb936e5a
--- /dev/null
+++ b/dev-util/envman/envman-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Environment variable manager for Bitrise CLI"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
+}
+
+src_test() {
+	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
+}
+
+src_install() {
+	dobin bin/envman
+	einstalldocs
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 3310563e7c55..ccc76cca2cc4 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,8 +1,11 @@
 AUX gdbus-codegen-2.40.0-sitedir.patch 1086 BLAKE2B 7c3a460c3ceb90e35ce160eed36229e99459062e2b9166003408aa8a1b10b529aa419f18943c6d225a89c2378f9405f8f54b40fe460428a81544359562a2b8db SHA512 e860da78f31cb61896c450b4728cfc1d8eb57f0c06c9440fa4c3d4344429e41b12531b59e6ad6c8cb4ff146f9f63ddd9ed0e6b7f493a11adba46ea628bcc3499
 AUX gdbus-codegen-2.54.3-sitedir.patch 885 BLAKE2B e63cdb128735fa8fbdf2ae1e324f9ba602149c6a36e69752e948a2be0c559625154a6d6036478d9f30da9d628ada9d62930142fc351686aca0e7f55ec7cc4386 SHA512 122583e4d4f84144c822a37ee9b259e9f3be0dddecaee1d19575e53836122b3c5a283d201e1864c15d1f9b3f7f9827f8e6040a7f856ea1d471842acc28f0dd1a
+AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
+DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 EBUILD gdbus-codegen-2.52.3.ebuild 1311 BLAKE2B bf17da01f79eb6b14738251e89bfef6cc4d7b3fec8fbe09faa0cb7e72dce085f232d558ab42c55a7683399a9f1ff91f30fc0c6265c9016b8e6c0cc7249e04253 SHA512 610cd17bac301bdba9e7fefc019da8aaf1157fedfa0d1e6b05310794fa8e7e757aee22d12520725612cb2b12c7c8e56e63b76fdd1c300d1d4a6f302555ee6bb2
 EBUILD gdbus-codegen-2.54.3.ebuild 1303 BLAKE2B b0e9e2582ee7f4d9fca636bf37a87a48bb596c9c3c196c0d2233c03e1c989d455524a99a516190b06dadedd72223f44b16db4c024853b4b3c0a0f58e2732aec1 SHA512 f7bd9a848fb0b32153545083876663d1f8d11a85bedebcae7bad7dede1b0f47e6455beb30dffb2cf5404563c24b585958e03d5fe71f006625a7ce3858346f36c
+EBUILD gdbus-codegen-2.56.2-r1.ebuild 1331 BLAKE2B 2637d705951b179a8ad0691a732257780bbe356f78b5a2ade116fc8884a7224c3305f98f239942bd13349dae8f74dd9309a75df63043b0d2b992f8b2bd8d8c40 SHA512 5d8e66202c15432bfd1eeaf0cd23559bbfe9ac834a60dc95d42b6ff07a2ebfd326a2f866efdd99dfeccdc727add74e34f11b7f8f8da6b55fe91cae8e096fd030
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
new file mode 100644
index 000000000000..30f0d7dcc7c0
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
@@ -0,0 +1,54 @@
+From 9eaaa76e2e36e46a43dbd419724696fd7ff8ea64 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Sat, 14 Apr 2018 09:55:22 +0200
+Subject: [PATCH 1/2] gdbus-codegen-2.54.3-sitedir.patch
+
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 28 --------------------------
+ 1 file changed, 28 deletions(-)
+
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 67d367543..190afa28f 100755
+--- a/gdbus-codegen.in
++++ b/gdbus-codegen.in
+@@ -20,36 +20,8 @@
+ # Author: David Zeuthen <davidz@redhat.com>
+ 
+ 
+-import os
+ import sys
+ 
+-srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
+-filedir = os.path.dirname(__file__)
+-
+-if srcdir is not None:
+-    path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-    # adding /some/prefix/bin/../share/glib-2.0 to the python path
+-    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+-else:
+-    # Assume that the modules we need are in the current directory and add the
+-    # parent directory to the python path.
+-    path = os.path.join(filedir, '..')
+-
+-# Canonicalize, then do further testing
+-path = os.path.abspath(path)
+-
+-# If the above path detection failed, use the hard-coded datadir. This can
+-# happen when, for instance, bindir and datadir are not in the same prefix or
+-# on Windows where we cannot make any guarantees about the directory structure.
+-#
+-# In these cases our installation cannot be relocatable, but at least we should
+-# be able to find the codegen module.
+-if not os.path.isfile(os.path.join(path, 'codegen', 'codegen_main.py')):
+-    path = os.path.join('@DATADIR@', 'glib-2.0')
+-
+-sys.path.insert(0, path)
+-from codegen import codegen_main
++from gdbus_codegen import codegen_main
+ 
+ sys.exit(codegen_main.codegen_main())
+-- 
+2.17.0
+
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
new file mode 100644
index 000000000000..d913496897eb
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
new file mode 100644
index 000000000000..a81ac96619c1
--- /dev/null
+++ b/dev-util/glib-utils/Manifest
@@ -0,0 +1,4 @@
+DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
+EBUILD glib-utils-2.52.3.ebuild 479 BLAKE2B 470fc81c8c561d7877c888eb94a91a161989f47935ff9f709843fda0cdde77402cd672efe94a55fa0bee649553749612b1273e0391a18607108c5d7837299c1d SHA512 d6698c0a179f0bc645d74e205601a175ccf95e63cb0da8bfe2b07a2c8d6a4222a69def4d9dded8c7f09b435a1b7d56eece1bf57612d12fa47a743cff3225d5db
+EBUILD glib-utils-2.56.2.ebuild 1300 BLAKE2B 5df0d0cb06c47aad00450271a5734c97303b0558f89dfee7a74d2424640c69f6f9fabbde97d48bb60229102bb52ed16ffa6be8ddbab7709be2ffef7c6384b42b SHA512 ccd4fedc7f346460f429cd4169f5eae76c0638a778f54e88ca974033f9a965d45b34fa9798580c61422b30e0f40c2cb78b83856e6f70fda26759ac9b918131a9
+MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.52.3.ebuild b/dev-util/glib-utils/glib-utils-2.52.3.ebuild
new file mode 100644
index 000000000000..bbc78a7fd93d
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.52.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="dev-libs/glib:2"
diff --git a/dev-util/glib-utils/glib-utils-2.56.2.ebuild b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
new file mode 100644
index 000000000000..94ec6c5e79f8
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}"
+
+src_configure() { :; }
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glib-utils/metadata.xml b/dev-util/glib-utils/metadata.xml
new file mode 100644
index 000000000000..0da0d356cb57
--- /dev/null
+++ b/dev-util/glib-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 9dd5dd64ee2a..d0e1ecbe7d39 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,4 +1,7 @@
 AUX gn-gen-r0.patch 2025 BLAKE2B ee95f445ebbf8ba58724aea497d98a2be257708e59c5c5f237f318b3075d5f75135b935defa794cd37ec81aea9ef3c39648e4b92056e9f0746a31ca75e085a4d SHA512 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7
+AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
 DIST gn-0.1445.tar.gz 958901 BLAKE2B f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300 SHA512 2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06
+DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
 EBUILD gn-0.1445.ebuild 1035 BLAKE2B 4379c5852e60d16e4eb7036abd922bfd80d5116d727725ffc887a3c04f951adfed32826d9e5e4780110e61a7b4e547b9b58e912f8d5712b23f88937ebcbfebe3 SHA512 359cae269e45cfb01ebf43205ac0f1c61639d9c9cf62580394245581e55d7812ec356726135a783c75715f998b9b0402230532b890a155d6864c6901318e0006
+EBUILD gn-0.1463.ebuild 1035 BLAKE2B 8c055bbd508d9ad6d8eb193165df198d9fcb9e1a3cc35558d4553348a2bc454f80e4fcc89eb2388595abbc4fec30d2446e5a9af01d7b7e7fe3d74b41dd5e5b90 SHA512 8239344f95f665383b9e3be5032ce623369d285479a555c5c4d57afe57b0e41f1fb59907cc4de274761c6f4dfe5b20dcdf7010ddd99562e18d4e32f81821cbdd
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r1.patch b/dev-util/gn/files/gn-gen-r1.patch
new file mode 100644
index 000000000000..77fdefcf222d
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r1.patch
@@ -0,0 +1,57 @@
+diff --git a/build/gen.py b/build/gen.py
+index 76f88e84..5e088b2a 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         # Garbage collection is done by default on aix.
+         ldflags.append('-Wl,--gc-sections')
+ 
+-      # Omit all symbol information from the output file.
+-      if platform.is_darwin():
+-        ldflags.append('-Wl,-S')
+-      elif platform.is_aix():
+-        ldflags.append('-Wl,-s')
+-      else:
+-        ldflags.append('-Wl,-strip-all')
+-
+       # Enable identical code-folding.
+       if options.use_icf:
+         ldflags.append('-Wl,--icf=all')
+@@ -356,26 +345,17 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+     ])
+     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
++    ldflags.append('-pthread')
+ 
+     if platform.is_linux():
+       if linux_sysroot:
+         # Use the sid sysroot that UpdateLinuxSysroot() downloads.
+         cflags.append('--sysroot=' + linux_sysroot)
+         ldflags.append('--sysroot=' + linux_sysroot)
+-      ldflags.extend([
+-          '-static-libstdc++',
+-          '-Wl,--as-needed',
+-      ])
+-      libs.extend([
+-          # These are needed by libc++.
+-          '-ldl',
+-          '-lpthread',
+-      ])
+     elif platform.is_darwin():
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/gn-0.1463.ebuild b/dev-util/gn/gn-0.1463.ebuild
new file mode 100644
index 000000000000..7192511c83ef
--- /dev/null
+++ b/dev-util/gn/gn-0.1463.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r1.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
+	echo "$@"
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 38c484266405..95f7f0f65a2e 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,7 +3,11 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 DIST jenkins-bin-2.121.2.war 74736956 BLAKE2B d63f49bad61bad216d06318c373951e99c46ff98bc0c9311fc123c9045d235131623436e3636db63bea0e95bf467040c755d0086612d69ea45b016e9dd39095a SHA512 b62b8cbb76997ded9442311204f7e43acfef57ed9949db19c05c382cb2171042ac41332d6372a45a7a5f46f295b21a6fd0533bd71e800fec7b0bf6b3e2998c8e
+DIST jenkins-bin-2.121.3.war 74764818 BLAKE2B a738a48fa944f6b27c1c36afde46d957bfa7134fce54b6799ef4ee7bc16b68c2c8819a907e54ad90f7713dad9b1df7dc59f4e1751e9c843172f59ab2b2c9e27f SHA512 93460c7623090e55b38da8a009ade40c44943683c64fa5a0528fab3813ffc592b3419856c8b2f175b16455a21db71f6f2e509ab97d793c94e0727f3c73525c41
 DIST jenkins-bin-2.133.war 75341772 BLAKE2B 2e9ca1ba4cce14eb32157c0b3853b103b02d02c4ba7ab3cdc7308e1fe7b6210e70552ef52a1b92d107149d9c261de5ed8b74cbf044a6e8f09ca48b9ae7388d5c SHA512 f1fcbaa40e554d854efc59d8ebc03b9c9626ca065e79bb18fd671c0f25db5b0e1cf1e4341459eea1e4ece9f978da53f5b46425bd125453f8a7c7abc5551ad000
+DIST jenkins-bin-2.138.war 75704621 BLAKE2B b9411bcec408eb5b17fb3d1dfbf2b82be2516be07b53b182af543a4c59504a49adbac154caa5f2e67f26268464c5e47da5d3caf7f2a19945600d9f4e31402da9 SHA512 69e0873e265de35d09af26ecc53bda012c486b4b7ad43eefea67ca819e6c38dd3a61f189a94a79a60e6fa5b3279baf3228d41691e26417aceb4db12fd36a5325
 EBUILD jenkins-bin-2.121.2.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
+EBUILD jenkins-bin-2.121.3.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
 EBUILD jenkins-bin-2.133.ebuild 1100 BLAKE2B d2dcdb83fff9aa62fa385b7c9540e5d3ed3f9758fcbda8ef90818f09c6b2033b0527a7eaf2377f3aeae6d73015544640e81474aa2fa78a7cab3bb9da071d1c90 SHA512 4cf21957d3803b439f7b13b612f86ff823435f46112bd9fedf5c225db03a98309dd6361ca9da7a789bbad718de009cba4fc819c0fffae807ac70e3cbb47470b2
+EBUILD jenkins-bin-2.138.ebuild 1100 BLAKE2B d2dcdb83fff9aa62fa385b7c9540e5d3ed3f9758fcbda8ef90818f09c6b2033b0527a7eaf2377f3aeae6d73015544640e81474aa2fa78a7cab3bb9da071d1c90 SHA512 4cf21957d3803b439f7b13b612f86ff823435f46112bd9fedf5c225db03a98309dd6361ca9da7a789bbad718de009cba4fc819c0fffae807ac70e3cbb47470b2
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.3.ebuild
new file mode 100644
index 000000000000..3b701c29b1b9
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.121.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.138.ebuild
new file mode 100644
index 000000000000..bd24b8ebc145
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.138.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 48da5d526cde..c8b46e5788c0 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-php-5.2.3.tar.xz 685364 BLAKE2B 02a00a5565bbb21a00a75231168f27a78cc3c7411430fc46e1c9b796fd378417e65369ff95fdb045a52d8c9aa1207b5b425e7c63de701d0805ee92db343e3ed4 SHA512 43ac063f38ae0f7fd222415f9327b9f738e9a450daa8a1cb6a83a1abe9c4e8adcb03628d8e62d1d93bdc85548ee36123347c39b702e7b44d4513ec54f67a5692
+DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd
 EBUILD kdevelop-php-5.2.3.ebuild 1062 BLAKE2B cdf8d324b3c9cdf1d8242edef0fbcc55becf96c86f5871246beaf55083e1270312535a04ec7d821d39f62205c25b0a976d0a8a1571a2e5c3b0f3ead196d3fb73 SHA512 7415d13081b485f1aba68f71ff1be86673c1c4a396c9dcbd5349707f985e54f07621cb19473f2af4c2795754fa1e843fce197623fc5593302603c9c0a94a16d3
+EBUILD kdevelop-php-5.2.4.ebuild 967 BLAKE2B 8df42002e02e3b78482b74cfd5b1061d867ae9fb85c7a7821836c752680dcd2fe8cd215d12e7bc4cf029594f1ab4dd00ff12892c00a9d34ab2ee0570f8715b49 SHA512 6312ec050c6171c420c01c49a3b3412451c0f81aa5c1d7a235212003dffe3e380d2f5630bb6ad29eee38a55929035fe6d2e7691ddbd5ca5a1f605e66d5a200c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
new file mode 100644
index 000000000000..bdc85574736b
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDEBASE="kdevelop"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="PHP plugin for KDevelop"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5
+"
+RDEPEND="${DEPEND}
+	!dev-util/kdevelop-php-docs
+"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 450fe2076d33..735c68a47f99 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-python-5.2.3.tar.xz 1071116 BLAKE2B 5d271c98d3d516a2fa9dda8995b4f3215dee5803417d95bab1c811a73c18becce779d0d3185584eb2116b1152ce3020a3704d7b71bc801712c35154531447ab6 SHA512 fd869ec93d544f2c16883bf95fb694fe75582dec3bb55d661de3f5fe9dc2d692439ef9cae9039bffb0e1a85d645eef228da869694110323b3ba56d78df2def61
+DIST kdev-python-5.2.4.tar.xz 1073172 BLAKE2B 774ef9853d9304073c5c8ff0657774a546c361d316116c1b09f21dad5f65cc8566948f42d179d5e612b64874ea14087e26794fdc3f3c7a9910569592c064973b SHA512 abf86aeeffba496a51cc6969bb0dd75509b3385332914f8135e3b1ec5e4da592af5a7d07fd98ad231d8c09109c2396037727e3db0a7ce14bd427f87d558fa3b8
 EBUILD kdevelop-python-5.2.3.ebuild 1168 BLAKE2B e6e88767249fd607486ad0bf766caa1305a352c21a5f7c8feea95c2ee017c943c9f316f1c5084fd0c7924ac6d1d523dfc3ec2f198768ac005b218f22d5f0123d SHA512 083555b74b7af5d028a7b690d30a46c202f19125a0a5a519d5237a406c06bfdea76bb28e8e80bb56499f3442fa87da4e078ff22c0595b2b372cc788792aa6a8c
+EBUILD kdevelop-python-5.2.4.ebuild 1170 BLAKE2B b3d26171ff01de428c3bc5f0f805a6e5c83ad02beb368756af08b733dd1f3d226f353e70469ba9f1726bd21ce50cf587c0df66dd362d226c2ba4a15972fb123d SHA512 5ed32d3f49b61ed7812dbba36d519d7c102c6c823dcc36dd623ef60ff8fdce0c938fa03008c3ec7711b478f3c865c818a7a463f52f5e824cc30208913a540584
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
new file mode 100644
index 000000000000..f62599c11d97
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDE_TEST="forceoptional"
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop:5
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null || die
+	emake parser
+	popd > /dev/null || die
+
+	kde5_src_compile
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 18dceb8d93b8..c3262e506fd2 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
-EBUILD kdevelop-5.2.3.ebuild 3801 BLAKE2B a7f01ea69e0652bd2f92819a829b29a20d29da1b9c43abee542a8550fc4aeb89245a7be9b7dc0cc42a26c0d899f8307ad796f955300b84488de6c9a2641efecf SHA512 e85d654094752e2b1fd9a348bf9374447681df93dee668464304b91cdc2aae962847535aa0138afe11b63ea8a5fdf3120213dd340b92e6e80845b6c1a0efd2a2
+DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
+EBUILD kdevelop-5.2.3.ebuild 3882 BLAKE2B dbf9df8aecef1077e2d9e5c6f466e5313da26cbc76e69f958a7d5f555ae4086f8e9c9c850fd9a124e24a70f52223e3e0e3232c56f2be30fed422786139bf35a3 SHA512 88b0714d803633c796cc643d2731a90e45b9065cd0ac57813c6a31c298a4580141ca33dbd491ba2f4b604ffc2497c734a6ab87b92fd3856c4ff1798aa4156b20
+EBUILD kdevelop-5.2.4.ebuild 3858 BLAKE2B 9f0082d4c036dcdb6c9656f3238df1cec85f0b2c47f9dda1858d74da54d45c05bac366fd22a11d4bf3a0bd9995c8842159d90b51c4dee0545e19af60c9695c87 SHA512 f76f6cd3e1a3db04bbd33244cf19c590542f8476130a79fa99c3adcf2d9e07b59f9986c078a5d3f4cd5b63ec121d6cb6c03124214273c43bbc2fd56c6e0b0572
 MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
index c8c5c9567be5..0fbf50234984 100644
--- a/dev-util/kdevelop/kdevelop-5.2.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
@@ -107,12 +107,14 @@ src_configure() {
 		$(cmake-utils_use_find_package plasma KF5Plasma)
 		$(cmake-utils_use_find_package hex OktetaKastenControllers)
 		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package reviewboard KF5Purpose)
 		$(cmake-utils_use_find_package subversion SubversionLibrary)
 		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
 		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
 	)
 
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
 	kde5_src_configure
 }
 
diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
new file mode 100644
index 000000000000..361ca0737b8f
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="test? ( welcomepage )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qthelp)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	>=sys-devel/clang-3.8.0:=
+	x11-misc/shared-mime-info
+	gdbui? ( $(add_plasma_dep libksysguard) )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( $(add_frameworks_dep purpose) )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	cvs? ( dev-vcs/cvs )
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop:4
+	!dev-util/kdevelop-clang
+	!dev-util/kdevelop-cppcheck
+	!dev-util/kdevelop-qmake
+	!dev-util/kdevelop-qmljs
+	!dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_cvs=$(usex cvs)
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package hex OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake-utils_use_find_package reviewboard KF5Purpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
+	)
+
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 07f3bbd17106..3732ff3e1860 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,7 +4,6 @@ DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 EBUILD lldb-5.0.2.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
 EBUILD lldb-6.0.1.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
-EBUILD lldb-6.0.9999.ebuild 2963 BLAKE2B 54d7cbb6d273667023d8beb7e5aeb55b2c332729e49c05ec6a2b79170b06e4287f16542878abbd6b27b13a6981629d264c269f27e3107eb9198e7f9ba7db4935 SHA512 5fb250ab99d6bdac31790f7035148f3da7115bb93d65359da3b757a75c90cb2f840b37ccd72a8374434081d2c677fe523862d19ada6a693eff7b6dac5f404f2f
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-6.0.9999.ebuild b/dev-util/lldb/lldb-6.0.9999.ebuild
deleted file mode 100644
index 3713e043cb9f..000000000000
--- a/dev-util/lldb/lldb-6.0.9999.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
-	https://github.com/llvm-mirror/lldb.git"
-EGIT_BRANCH="release_60"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="libedit ncurses python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
-	fi
-	git-r3_checkout
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index db2802aa5965..2cb60f6cd237 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,8 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2017.3.4.tar.gz 279847033 BLAKE2B 451540aae6434f39a94a664d4aa8747071c9c045793a7d445bf1acf4c0412309448b9e05b01c7e86d5b6915d144cb5175956981597d24064b2a7f934bd043bf3 SHA512 0478ca55a0dbd45b54c3d1af45a6cfdc562f0a863e3fe09922421ed121e22f5182c71fbc05b0e9fe7a8e92b197f6ad473da34b30b867297690d7bd9df5fda730
-DIST pycharm-community-2018.1.4.tar.gz 271284732 BLAKE2B 806fb3774f08cd94ea525a3e3a6de3b1a17f1340e093e897ab185b7e08a4f389b627b5f3b5233421ef6c1468f36ec205bfaac73f3b8f151f57c23f0ce44ad3ea SHA512 00040aa0f6d6cc60837277c1413b155b82ec580c6619d425aeb8c50521c11c17654549901a3c324d335d8818120e1e9e730ec03a03722058aa1064685e17cbce
-DIST pycharm-community-2018.2.tar.gz 260724936 BLAKE2B 0c8882d8f2a115a172140e8312ef331cdaaeb41fd5ea6adf3091593d8635f63a616ad5dc710447b7e148c9d83d5ece98ccfd71f4af6663ff89296259b729c0aa SHA512 d2b46e7463010186fb633a17c2833cca397ffd001679495fd3aca034e4feeebbf7e19c4803f6588d23e15afbf3e6850b2880b7867e7f9cfeeab338e7c7322669
-EBUILD pycharm-community-2017.3.4.ebuild 1046 BLAKE2B 91c20e6afe384e069c14f4650d2c8082a9994c55db770fb21b1ff5490da06a6c342ab4ab537c090689e76ba0e4d697a0cbf349e6fe6b2105fb5d197ccd5bd566 SHA512 44adaaf25bbde27c7170dc818bc7a8b93c597fa0d84b7edc48f53209771467afe1b3c73be60f3b118a2a10e434b790502cd837633efa3c4c5fef466094d2c06c
-EBUILD pycharm-community-2018.1.4.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
-EBUILD pycharm-community-2018.2.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
+DIST pycharm-community-2018.2.1.tar.gz 260758803 BLAKE2B 735d3e7483b46a9be8bf0a8fa88a51352b1048718aab00b63c133a408666e151947ded527b4ed754ce15aff17a3da9396e10b9194e61286f0ed0534d51f0eabe SHA512 bcae7f579664aa9b071eef6fedc68dad8c9e36078c258cee6877ada1247f9051c4d542657ef2b01dce087e273623b84d86d786ddf1e922d7c6599725f50428bd
+EBUILD pycharm-community-2018.2.1.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.4.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.4.ebuild
deleted file mode 100644
index 5afd45d5ad93..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2017.3.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild
index c37c85ebc8eb..c37c85ebc8eb 100644
--- a/dev-util/pycharm-community/pycharm-community-2018.1.4.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.ebuild
deleted file mode 100644
index c37c85ebc8eb..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index e2fcc7a11ba0..9fb2aae79bb1 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,8 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2017.3.4.tar.gz 356283723 BLAKE2B 3d2abed57f0459e49034a6b081c69008628ec8a16322ce90e15e0a42c670554ea4eca66b73279ea0f9aeac116dc86e8d52590861d712ccdf93d2be31c2d1211e SHA512 8adc3c46b50c4ed895d0d40b0c235a047fcac7e4ab5262aa88ba69deffa9402b652bc69ec1ee3d7682900698d14bb2ecb7f82a89f998979c009fcadb98ef4517
-DIST pycharm-professional-2018.1.4.tar.gz 348483306 BLAKE2B d03950a8d91c726f175c51fe512fdedef32a26fc39881ff4651ff09f277e9b7b3c053754e391c760856507b64b0a57128092a9fef5b7d2ab5fbfaac47f3216d2 SHA512 e45623fc0127a5f919015937853a4364344b01f586d5a63cf3605f0eac773228f02326c0714e2c25eb490431716f2b794e191aa01149a07ab87c067f1ff3ce3b
-DIST pycharm-professional-2018.2.tar.gz 337502172 BLAKE2B 9b4c4f2f69ea4fce29ca498a633d6a7bac749920580c8e670844effce030000c491ef041e545a90559b7ce589c5f0a28c8e40d3dc5708f7166a3f6bbe88a5f43 SHA512 51b30d73526ada82274d043c40724b7f7f7189eb25393a079fda04fff88cfd1158878c5d87810918d06a5e5c656cde03497de70f67ca4d73d6f0c1b159be27ba
-EBUILD pycharm-professional-2017.3.4.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
-EBUILD pycharm-professional-2018.1.4.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
-EBUILD pycharm-professional-2018.2.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
+DIST pycharm-professional-2018.2.1.tar.gz 343377232 BLAKE2B a8427902b4c7d1909e188130ab3688606ebc40b6eb8a633e9ccc36bf0a5cdd04772eb3cd0e7ba2cf77119f3efc9dfa8373c174db29b643bc9a350767524a4386 SHA512 3bb492932c5622771d39ebb66ee045e0affd2a16130f3a270af74bb75d8925bd3e29be5310f6003e5ff8a6f385b6376b9c77c7bf1e2b1e44c5671a04f86c8852
+EBUILD pycharm-professional-2018.2.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.4.ebuild
deleted file mode 100644
index 71fdc968f972..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2017.3.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild
index 5dc7e67e051f..5dc7e67e051f 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2018.1.4.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.2.ebuild
deleted file mode 100644
index 5dc7e67e051f..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 58d4b78d8056..1ccbe17b57af 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -3,5 +3,5 @@ DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429
 DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
-EBUILD shellcheck-0.5.0.ebuild 911 BLAKE2B 6ae6f5c785950da968eb253db682789f44ba50f62c578226af0526f209a67c22f1ee8b8be027c684437ebaaef3b7bc4d1fed5e10a82c075015c105276c1227ce SHA512 69fc399a74442149185b6f7612f6ddd4cb78dca576cb8d579dce7fdda4f79589a2cab9d2382e42078e57f9c852f86078d9d2753b96cc2fdd36137d0d3fc01a8f
+EBUILD shellcheck-0.5.0-r1.ebuild 928 BLAKE2B 514b7de6cc381054ce51df81ccad2d5cf6a81394b08e6669f64bcb44483facb5b2ac6b1e7e76c75a79a7b5bc309b3a9aa0a7def1a7c214c4ace15b1fb5eecc21 SHA512 341a72ecba74ff426b476f273f34d070eae99b5bb08fb770831cee05f34fb1a3869808c6bc2f8e99e1b9591d353d6d46cd2e963e3e6c3778d56063ce59db027e
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.5.0.ebuild b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
index 1bd29432c618..7731bf5be612 100644
--- a/dev-util/shellcheck/shellcheck-0.5.0.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/mtl-2.2.1:=[profile?]
 	>=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
 	dev-haskell/regex-tdfa:=[profile?]
 	dev-haskell/semigroups:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
diff --git a/dev-util/stepman/Manifest b/dev-util/stepman/Manifest
index f2cd68e028e3..11e5e2510258 100644
--- a/dev-util/stepman/Manifest
+++ b/dev-util/stepman/Manifest
@@ -1,3 +1,5 @@
 DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe
+DIST stepman-0.10.2.tar.gz 3087278 BLAKE2B 224bc6141678d4155474591d7094956ddd230086315ccff8ec2f91bb2d72761f46daa864086a449fb5d79dc2f7ec6f8935fa62a9a5be41a2f0aad9e3de84ca20 SHA512 6b7f1e17ff14e8a0a69056f6a8fa00043b53d818e61603fc2571a42a73e2c88edae1bb233fb734e1796c581c63f7aaf6e91c425525adbb2e1c3429cdc8dfa1e8
 EBUILD stepman-0.10.0.ebuild 962 BLAKE2B d83a3ee4b3169a85604fd93d8de9ca2b54ccc2c7e47592d98236eda93dd2edc8ef080de477906e2f305d6e855402fdecf60e74b2c6dc959afff19bae1799a78d SHA512 09686058814adcb51f743b97410ea933b4122dbf2b96ace3ddad51499d50f867fb65e253c3ec9c23ed7334fb3b0d26ceb6477d9130bcf96f91d4071edb6eb1c4
+EBUILD stepman-0.10.2.ebuild 799 BLAKE2B d2e4bf1e47c302e80aa19a705c8a6297714834e721c53da69df8234e8e43e655d4be1d3777e92bcc3f457a1570531d08b989880b393ed05099e0048249e31099 SHA512 12a7cbe7df5a571055e3787e5ab337dd996967dc01267d6627ba0f15544bf8ba5e9275f1d1c8b71685ed91025865b33fa6eb0c703bc5c6078a1d04403f37b962
 MISC metadata.xml 949 BLAKE2B 883da9ca0b0e0d8d86e6c4e863eea1f53a029c4d5ee517ca546a70ea34180055dd3500a7f85c4cf98571f9f487ac78cb86b48a772992a4461aa0342b12def494 SHA512 db268017d243e1e24b2ea28731e8286f731bbb73214f17828d4a86dba4fd2a7c4e259f8afb2698984569bcd20b06029cfb3be45fbf8e84934ca650ee842f2a17
diff --git a/dev-util/stepman/stepman-0.10.2.ebuild b/dev-util/stepman/stepman-0.10.2.ebuild
new file mode 100644
index 000000000000..c91e20ce2292
--- /dev/null
+++ b/dev-util/stepman/stepman-0.10.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Step collection manager for Bitrise CLI."
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
+}
+
+src_install() {
+	dobin bin/stepman
+	dodoc README.md
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index f7bfe8adf85c..52c521b7e259 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,8 @@
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
-DIST strace-4.22.tar.xz 1232884 BLAKE2B 4053d1923ad1f942c3887be1716b400e426b318e136cc1cba1d83091445e2a3b64588c0578f0165ffec01dda1cb1824c29dbdab05bb409232edede953f2a5e78 SHA512 624c3f27921b6df2eb8ff409a35fa9153c4571cd5f703e6cac18f024bccd5ff4acb81f88ca33f81d1046d9718dec7b2705e8940e80bb8447ec3e62a6fd5f8350
 DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
+DIST strace-4.24.tar.xz 1398252 BLAKE2B ca83adfb3ccd23a55976c2950ce5911203e1ad911147649127e49d815e4899b5fd72459c371c15aea701d0d30e994d0eca2b32aad240fccc4e8d1cecb3f97558 SHA512 69cbf8b2c32c7ea90ebe5955bc71b454316a3494ae6975203fe61ce1f42ec539438cec5ba8ee7f529f89661d964b4aa53656712706aacff6bf018304b7a09813
 EBUILD strace-4.20.ebuild 1938 BLAKE2B c5ac6fcf26c6d6543fb58624114f3e034d32df958b1a98a57abcdb1a07d2a994c5c3e8794b3f43ab4862605bc0190d2717abe57599333dcd7610a5dd2721d5be SHA512 d6d66f647dde209d9677016bcc231f2edfcc0cdf83875b2df1c063e4b3a7921783e522fd5708655de97127fb17e2ddb877acefbececae6348bffecfdbc7c3b8f
-EBUILD strace-4.22.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e
 EBUILD strace-4.23-r1.ebuild 2277 BLAKE2B 0d14908ceda437cf5fc4c2883fb343fcddfb7191c729f72ce99d5b2f4eb41a18c55aadefc6f72510dd3992d6d7efbba6547b2dbc59037fdd6d40a681aa2a9b3a SHA512 917bb1f3c8c015f768d32899a724c5dda2a23d05c8de5c38cfdcc452c3b1b58aed5f7d8bbbf76834e419b23727b4d3b65c6e5fa7b6ea1c1c1537565a5b867296
+EBUILD strace-4.24.ebuild 2277 BLAKE2B 0d14908ceda437cf5fc4c2883fb343fcddfb7191c729f72ce99d5b2f4eb41a18c55aadefc6f72510dd3992d6d7efbba6547b2dbc59037fdd6d40a681aa2a9b3a SHA512 917bb1f3c8c015f768d32899a724c5dda2a23d05c8de5c38cfdcc452c3b1b58aed5f7d8bbbf76834e419b23727b4d3b65c6e5fa7b6ea1c1c1537565a5b867296
 EBUILD strace-9999.ebuild 2283 BLAKE2B cf962151854597584f0fae1b649379c2ae6b7f448acc11042c56750ce401670f32ade92d142a2124c69a027d8147b8a5610877c5e3928826fec66447329a5b8f SHA512 0d200822ace7b03abbee2b03d2c997c129877400eea8828c4bc27d22e6b2131be04e5ae822241e633410059c531c67b5fff2bb8232d8a08a5585a40dea0e243c
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.22.ebuild b/dev-util/strace/strace-4.24.ebuild
index 216395c678c1..a16ee1f785c0 100644
--- a/dev-util/strace/strace-4.22.ebuild
+++ b/dev-util/strace/strace-4.24.ebuild
@@ -18,9 +18,14 @@ HOMEPAGE="https://strace.io/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="aio perl static unwind"
+IUSE="aio perl static unwind elfutils"
 
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
 # strace only uses the header from libaio to decode structs
 DEPEND="
 	static? ( ${LIB_DEPEND} )
@@ -66,7 +71,8 @@ src_configure() {
 	# Don't require mpers support on non-multilib systems. #649560
 	econf \
 		--enable-mpers=check \
-		$(use_with unwind libunwind)
+		$(use_with unwind libunwind) \
+		$(use_with elfutils libdw)
 }
 
 src_test() {
diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest
index 79d53a583b4c..e62e430546a6 100644
--- a/dev-util/stressapptest/Manifest
+++ b/dev-util/stressapptest/Manifest
@@ -1,3 +1,5 @@
 DIST stressapptest-1.0.8.tar.gz 218485 BLAKE2B a843330dfbf16b324a13e4156c819e8b9139288bd316d560410aeb704ff4e24c47d86dd3b1d1a65d325b86110015c6e893cd38aea99d59b7c68989ba2228f376 SHA512 b5fde353d15958052219c3e505a22aa914e03a7fe96c3a0ac5025a4c730643f6fbdd5088a7cc0dd4618d4998151e2374507845110af8f2cdb43ccd4c87d48916
+DIST stressapptest-1.0.9.tar.gz 219517 BLAKE2B 58fdb60b924bedd526cf31ed47a56cf4cca288abb43054fc6de5379ec2c6ea705c92eec1ef657274949009e40e8fa82ee9cc6e1bda2ef160a894ba95519fcfd8 SHA512 2680b9a4e148a2fe0cb7758ffde7624c8874bbae1e7650bb4df6916512be5949996da16d52f530b237fe4c6122fa9bb2d35b11092d106f59d614b44eec250595
 EBUILD stressapptest-1.0.8.ebuild 610 BLAKE2B e2c5db27457525327788a29e1b50a6f9e661e1807822e3374d41af2dbd3bb55af337506018b4d72c7838f2b4c9b126dfc6682cef5e8c0d1aeab8fed8d1e69d09 SHA512 36404057a349a6a5e66525235960becaafa4ef7013937170cb04eafd8e7202b19fa5e17be018e5c8cb540407c4c757154b0e4cfe00a89d16fa891611398cd969
+EBUILD stressapptest-1.0.9.ebuild 610 BLAKE2B 00167ba505bd365fd0fbccdb8e22b62d4b4ae88a70e457a21b5b6709bd668d6a501dcdc8fe7f477f6aff6174d4cbdfc6e347ae93789c7cd8197a85b7cc973523 SHA512 623e840e7dbdfc1c1221aad1612e6b67f6a673088c907e9320858c5bfdd1601458e3c25cc951632018160aa5fb128f37514f3949e491ac51967a2546f761440c
 MISC metadata.xml 259 BLAKE2B bf2f588235ba1f20b67db1404be3652d18c003fc52012eca6ed8175524b805a9d168779856994a16cdd2fc049db4eb6c4f3a71b61b50806d53b654877a89d7db SHA512 13357765b1f978b966b3d556a606bda30467379b2c33bc24d2940af28906ca337e8da57e936ba55c26de06d39b48f6729b4d8d4193e178033ea1f2e13e50ad7e
diff --git a/dev-util/stressapptest/stressapptest-1.0.9.ebuild b/dev-util/stressapptest/stressapptest-1.0.9.ebuild
new file mode 100644
index 000000000000..27748ce9fde5
--- /dev/null
+++ b/dev-util/stressapptest/stressapptest-1.0.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="Stressful Application Test"
+HOMEPAGE="https://github.com/stressapptest/stressapptest"
+SRC_URI="https://github.com/stressapptest/stressapptest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libaio"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# Matches the configure & sat.cc logic.
+	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
+	econf --disable-default-optimizations
+}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 87ca7cf970be..dc378924a613 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,7 @@
 DIST sysdig-0.22.1.tar.gz 825171 BLAKE2B aa4836ed0be30fb3d8318b151c3f60586daaea15974558e7d81ba2da6d9c511bedc67fe8bc518697b6a268ea93bd112f64ae5772ef75c10d8b57d06e1468ff13 SHA512 e9f5ca594dc31832b4ea365a624208f5319add1480cfe9fb3d0e960757229fbe6ce46b906a390a667147ae1a7c0a31fd7ffeb9a1a0b376376530d4f60f397453
 DIST sysdig-0.23.0.tar.gz 829716 BLAKE2B d507d28ef606e4ccd96fec1fa735bf305ceb2b2d0292b872309d877c7492def92b7305866316977f0e12325f3b8ae180a1633c8d969b1761eb2197b5250f4d43 SHA512 e6ad3f5bba1ad7307a7e0769b1a9a0c20659fff5bcc06b741cb9ce23428d4de38b5acf32a37d10bb1b41e839cc3a86b89075bde577c3f200e9fa5b4bad33a77d
+DIST sysdig-0.23.1.tar.gz 830420 BLAKE2B 31a8c4cd8b570a308c81b4df53494cff2619d05724e509634671968025ebee0e46c5e59a7c877e6d9f1f1eba86a8a27a0cd9c5b66e75723ec8eec66c6782d4c0 SHA512 059a564a5d31381efae4bc50d2b83f83a1d051f1cfb9fa6bfb75a341305149073a6eb3b9a3ce4da12fa293e75b71f8b30c9021ac8d4c4a2f59a40e35a5ffd482
 EBUILD sysdig-0.22.1.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 EBUILD sysdig-0.23.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
+EBUILD sysdig-0.23.1.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.23.1.ebuild b/dev-util/sysdig/sysdig-0.23.1.ebuild
new file mode 100644
index 000000000000..e366e6626308
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.23.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="all"
+
+	if use modules; then
+		cmake-utils_src_make configure_driver
+
+		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED%/}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED%/}"/usr/etc || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /dev-util
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)