gentoo resync : 30.04.2018

18 files changed, 242 insertions, 251 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b7da6a68a0aa..52b4d12c204b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/alleyoop/Manifest b/dev-util/alleyoop/Manifest
deleted file mode 100644
index 30a5379dd5cb..000000000000
--- a/dev-util/alleyoop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST alleyoop-0.9.8.tar.xz 252292 BLAKE2B ab1a3b5b80d6eddd947368ae60b01820823c2095c006414ee32961efdee0434e19a4e498deb56947d621769937dab567013787ccf96d07dd9c05dfae46dfbbf9 SHA512 b056b41692da1824e233160c1053075cabcd11394c8c571dd654167be3ef29680357f69371b36f672b4e8b8a769ba3d0a33ad48c1409a8141bcbfa0ba8187bfb
-EBUILD alleyoop-0.9.8.ebuild 587 BLAKE2B cc1190d9438aaf8ac69432e684e2d6363ad7d628dd31b064dc4305658ec12ec3aac254216de7dc3d97ac2d18d0e63c17cdd2a9f94b9b176995957930149ecdf0 SHA512 fdb4ec58c543acf216650ac99e0eb2f0238e94cecdad74bc6f6e3d2c40e0e4e6bde3472a55b50dc6d72e4fbd67cce63036e8e1e28ca8f2c26e0855c4b7193948
-MISC metadata.xml 250 BLAKE2B 6c0a69ccde48ed61172921499d529a62a49f4c466c16583bf69bad76b74c05a3c81f4b24990aa021740982ff06911e22d008fd031ae208c7e0490c877d9808c3 SHA512 7119be34df805f2437d97c678ccdd6ac4c41b354b8c73a43aea7813749d3c8b595ee0fa852f2d3be3452977812941dad018e5508e548db6036ecfbad4442d5c5
diff --git a/dev-util/alleyoop/alleyoop-0.9.8.ebuild b/dev-util/alleyoop/alleyoop-0.9.8.ebuild
deleted file mode 100644
index bb2bdbe4eace..000000000000
--- a/dev-util/alleyoop/alleyoop-0.9.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A Gtk+ front-end to the Valgrind memory checker"
-HOMEPAGE="http://alleyoop.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha amd64 ~ppc -sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.2:2
-	>=gnome-base/gconf-2.2:2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libglade-2.2
-	gnome-base/libgnome-keyring
-	sys-devel/binutils
-	>=dev-util/valgrind-2.4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/dev-util/alleyoop/metadata.xml b/dev-util/alleyoop/metadata.xml
deleted file mode 100644
index dc8392005a86..000000000000
--- a/dev-util/alleyoop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">alleyoop</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 8544e6940b1f..145541c53dcc 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,5 +1,7 @@
 DIST bazel-0.10.1-dist.zip 92973197 BLAKE2B a1d681407e2c72a57b3dcbb5e2afc49e59670be65da3d7d038dc3b8593bc0ab5b4a06c8dd8fc8a617a92eef2fc26a049b6de9a1eab0d05f31efb2fbeeb9ce711 SHA512 1894c951fd39a084011f89dd0d458e182525c2bfd6c80da071865e981e21a8c2b8363530ab53af18e6deae4a488744d6d2b7a5a4acf04715c2e26560a01df707
+DIST bazel-0.13.0-dist.zip 90105262 BLAKE2B cb065025524123babef187bac2e1f54f43645d08cb1282a5fe8f8c8b090e595570646072e2380836e2c43403f7953f97321becc24b743d7b9ab43ad208cf2c2d SHA512 3c128e551cff1b685250a68892ca3e1ad6be8b152ee2b8eb527c94adbb8fd50c70e703a363bb938916275030ddb14d756c14e4dc238e7a7b40289c700c5d53c7
 DIST bazel-0.7.0-dist.zip 84669893 BLAKE2B 2f8bbe3a48224a797bdebdaad8f7c403c8b0232ada5eee8c8619f241e9670dda311b9280f48b5e2013079f959891d94f55aee2af0dfae9fc4f6a486663fa245d SHA512 039ab6a04fd4422bd14503187e6cc0d07301723b3ecae906606fa12ccea72190d82237899c103c1adfdf05dc8672887790780ddfb4cce87cd590adbde3d3f6d4
 EBUILD bazel-0.10.1.ebuild 2006 BLAKE2B d504972b5370261cdd09db5fd2e7f2cc87c0fcc0d256659c73b3c2114f8db095371456f2bd7e6367b23c6f91d22326e7041516e8d439489417fd21f1b02bcf93 SHA512 695034a4ee0a490b4f68371b60ad6b1864be19adf166b6d6d9dc5cf367767101862e5d207e91f2565bf0597345d0ce9a29db8d3aa198c49b54d8557fa300b375
+EBUILD bazel-0.13.0.ebuild 2006 BLAKE2B d504972b5370261cdd09db5fd2e7f2cc87c0fcc0d256659c73b3c2114f8db095371456f2bd7e6367b23c6f91d22326e7041516e8d439489417fd21f1b02bcf93 SHA512 695034a4ee0a490b4f68371b60ad6b1864be19adf166b6d6d9dc5cf367767101862e5d207e91f2565bf0597345d0ce9a29db8d3aa198c49b54d8557fa300b375
 EBUILD bazel-0.7.0.ebuild 1977 BLAKE2B 3ea58cf2048b9825a17a01853d56f1f28cd2b84e14137bb4ef52d1d895c8351723447ae15e9ac379c21b8cd658bd21030058045aede3415bfac4c2591859b4c2 SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76
 MISC metadata.xml 703 BLAKE2B a019fea848bd86537d64d63746c1d7459ec1b511ac77c0c8ca9caee9e2b888ad99c15cdb5aca00ad6d6bbbfcfb5a2da05632af4d67b40d231e2234484f2eeb11 SHA512 46c1f55e4949ef3b7d42d769e31e34fcc9bffbe4b36cf6a467a514f8471325597d417f3da5ff955203fdc880531502969cef4fcedb4536cc7bfc64d2b7e50c5d
diff --git a/dev-util/bazel/bazel-0.13.0.ebuild b/dev-util/bazel/bazel-0.13.0.ebuild
new file mode 100644
index 000000000000..5a238c7915f2
--- /dev/null
+++ b/dev-util/bazel/bazel-0.13.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+	VERBOSE=yes ./compile.sh || die
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
+		> "${T}/bazelrc" || die
+	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
+	mv bazel-bin/scripts/bazel-complete.bash output/ || die
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+}
+
+src_install() {
+	output/bazel shutdown
+	dobin output/bazel
+	newbashcomp output/bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
diff --git a/dev-util/bluej/Manifest b/dev-util/bluej/Manifest
deleted file mode 100644
index b30b42333472..000000000000
--- a/dev-util/bluej/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX bluej.wrapper 167 BLAKE2B 5ed811970729f6212d43f3f951f351c6499badbb8d2500bbf44b72fb010db5bccdede09d7a0207bdfcebca094d1fe1a15bc3fa858dae778e2237eab850450e25 SHA512 fb2ed5d87687f9e64c23871f4dbbb510771fbca97ea787b7da52346848b48bc038199153c3f1a554a609daf38e5458ea81a187ce6deaf408f1088c088a30c7d2
-DIST BlueJ-source-311.zip 15564184 BLAKE2B 7e34ad2663ec07bc370c851288c71e021b50cb868e26665132dc6c3b2e734ef1b8e75e2a60c5d39f36393d298c195e3acb31eebd17e283d7028ba7644462441d SHA512 60515f8564f0edf96ffba69ff43c199c024da12ac5601cba5f163c5682c9466717e2048593582ad2fe5d61988380e3fb9205825ec8967e99983c8a2a02f5144a
-DIST bluej-ref-manual.pdf 768751 BLAKE2B 22f037706e3bd8e24a79ac3983c368ad6e6c50c1769ed64c00ae5be11dc7838116a56dd0502c014b3e21d2ba385822b85c7a3f8e4440bc3bb8059696f0eada4e SHA512 7f7e8cc2eab6402722eb8f94c878b506f595eee280cdfa85497d926cb06aa229defb0c8fbe5353dbbf6587e36a99ad5dae0a50fca21c1c80c88a92647d9b5319
-DIST bluej-testing-tutorial.pdf 269284 BLAKE2B c91f3c13d2837e3ee1a7628ec06998b38fd023f55ab3bbe271d63a790224b622d7ad05783f9f1bd13f176e656e450dea0ba8268ea9eff10e3c03eb9a0ad36c3f SHA512 015da66cbf4940ca4bcab535023608a8497e7c6df1e06988393f8f0c7300a4521025474bf828e7889ff717e988968a2e973330758bf6dd570c057a837c78a9b5
-DIST bluej-tutorial-2.0.1.pdf 1205655 BLAKE2B 79bd98b146ab89f1b974e4ad4d10ff17cf418e896806a34c2f900e25845b08b7bb42ba5785c653e21ac7a863b6dc4392f57db4dd2e01817a80c1a7b694a8018e SHA512 410acbb75091d14b5ee7f5d56c01441a9611ed1f8b583c0301e1badf3d01bd2bb284da77d422c38ace283e7fe066b7975c772859697d25d6e9b334053d2f4833
-EBUILD bluej-3.1.1.ebuild 1467 BLAKE2B 1131f080c717c784dde293c6ce2d5af47cb32cd9041421ebc818df8a85b6d4ac7b932e85bf2eb57ca8bc618e30f22d1f862bf6ed7036a6b73111cc54947ab20f SHA512 8c577cc0408653bd9a72d91b9b83e91dcf458a9f0d54698ad941ad403612ed1fe91f50b651f51ce7ede57f3209b025b61cf742fd2b2dc50fd6b880359fc772a7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/bluej/bluej-3.1.1.ebuild b/dev-util/bluej/bluej-3.1.1.ebuild
deleted file mode 100644
index b38d355a8265..000000000000
--- a/dev-util/bluej/bluej-3.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-EANT_BUILD_TARGET="ready-to-run"
-EANT_DOC_TARGET="doc-core"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DOC_PV="2.0.1"
-
-DESCRIPTION="An integrated Java environment for introductory teaching"
-HOMEPAGE="http://bluej.org/"
-SRC_URI="http://www.bluej.org/download/files/source/BlueJ-source-${PV//./}.zip
-doc? ( http://bluej.org/download/files/${PN}-ref-manual.pdf
-		http://bluej.org/tutorial/tutorial-${DOC_PV//.}.pdf -> ${PN}-tutorial-${DOC_PV}.pdf
-		http://bluej.org/tutorial/testing-tutorial.pdf -> ${PN}-testing-tutorial.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jdk-1.5.0"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-java_prepare() {
-	sed -i \
-		-e "s:^build_java_home=.*$:build_java_home=$(java-config -O):" \
-		-e "/^bluej_home/d" \
-		build.properties || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r lib icons
-
-	# fix config location and set symlink
-	dodir /etc
-	mv "${D}"/{usr/share/${PN}/lib,etc}/${PN}.defs
-	dosym /{etc,usr/share/${PN}/lib}/${PN}.defs
-
-	use source && java-pkg_dosrc src/${PN}/*
-
-	insinto /usr/share/doc/${PF}
-	use examples && { doins -r examples
-		docompress -x /usr/share/doc/${P}/examples ; }
-	use doc && { doins "${DISTDIR}"/${PN}-*.pdf
-		dohtml -r doc/all/* ; }
-
-	newbin "${FILESDIR}"/${PN}.wrapper ${PN}
-
-	make_desktop_entry ${PN} Blue-J
-}
diff --git a/dev-util/bluej/files/bluej.wrapper b/dev-util/bluej/files/bluej.wrapper
deleted file mode 100644
index 8d5fe5278092..000000000000
--- a/dev-util/bluej/files/bluej.wrapper
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-APPBASE="/usr/share/bluej"
-JAVAPATH="$(java-config -O)"
-CP="$APPBASE/lib/bluej.jar:$JAVAPATH/lib/tools.jar"
-"$JAVAPATH/bin/java" -cp "$CP" bluej.Boot  "$@"
-
diff --git a/dev-util/bluej/metadata.xml b/dev-util/bluej/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/bluej/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index ec3557730530..953c8dd871bf 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -3,5 +3,4 @@ AUX 3.24.2-jedi-fixes-2.patch 928 BLAKE2B 8fb3e4bb34217309475431ea66f24c003e27a8
 AUX 3.24.2-jedi-fixes-3.patch 8966 BLAKE2B 9dc40ddc73ae2ca5b0cbb6202391eb3aa550771dd65f7fac84e724d207c5867129c8607417279c78aa469234e62a3e1f62cb294701948b5741b06c4a0aecbf9d SHA512 5481e325a338cea5946a4515e8e532c8d516b0f05a2f3c7ad33dc3e9bbc83024bb8ceb2f0913b1795fdc57e856b37ccaf314e05b414d27669a4819b63747f255
 DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
 EBUILD gnome-builder-3.24.2-r1.ebuild 5195 BLAKE2B 2d9dbfd2abcf2261221ef5310853501d93f64db9e235a0b0b1b843a754306033dd26ebc239ef46ee05d8109f35f85055359fc2ce66ea6bf2007dea80f621b3de SHA512 ac2295cdc97874f921a65cf6cd5f766b9deb94dd1cd171e8d0568964c0d2f9e5aa8addeb6410af5174c2c6f636332cfacd171c3d2862bb586baaf0e0bd05e227
-EBUILD gnome-builder-3.24.2.ebuild 5019 BLAKE2B 4ed96a85fb1d622006ac877a50ba580c2d7ca95639af086230d3209e7239cbe8fd48f51776d20d2e656cec25332ae9e735c8c7b3c5750c8dddd12f620e0be0ee SHA512 6d9e47c151f701eae71a4053a72ed0e1de77edd299cf3eef1d2e91289b9e576537269f0571321deb9c5c63103b9181f0db4f87a64f8a4fb8ecfff21056d651f8
 MISC metadata.xml 1011 BLAKE2B d6099c6cd5ffaf091f2ee0e07e261caacf0283aa18dc6be22a617b95236131e831d24f36bbc73f86edc66a3e6fe74f5102d101c9736d5d992a80929a68ac2100 SHA512 b3519707a4023a6c9892827abaf6465e28dbad2f1a8c2760a3f2d9b34d4be384d10326870e0d7952b41cb725c955cc838092786543ff1867db4a3acf41cb404a
diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2.ebuild
deleted file mode 100644
index fc35c2c3eb4b..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.24.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-VALA_MIN_API_VERSION="0.30"
-VALA_USE_DEPEND="vapigen"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome2 python-single-r1 vala virtualx readme.gentoo-r1
-
-DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clang +git sysprof vala webkit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/configure.ac files and the requirements within.
-# Most have no extra requirements and default to enabled; we need to handle the ones with extra requirements, which tend to default to auto(magic).
-# Look at the last (fourth) argument given to AC_ARG_ENABLE to decide. We don't support any disabling of those that are default-enabled and have no extra deps beyond C/python/introspection.
-# FIXME: >=dev-util/devhelp-3.20.0 dependency is automagic for devhelp integration plugin
-# FIXME: vte could be optional via $(use_enable vte terminal-plugin) - but most/all people want this and have vte?
-# FIXME: flatpak-plugin needs flatpak.pc >=0.6.9, libgit2[threads] >=libgit2-glib-0.24.0[ssh] libsoup-2.4.pc
-# FIXME: --with-sanitizer configure option
-# FIXME: Enable rdtscp based high performance counter usage on suitable architectures for EGG_COUNTER?
-# Editorconfig needs pcre.h, with vte migrating away, might want it optional?
-# Python is always enabled - the core python plugin support checks are automagic and not worth crippling it by not supporting python plugins
-# Relatedly introspection is always required to not have broken python using plugins or have to enable/disable them based on it. This is a full IDE, not a place to be really minimal.
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it. Last full check at 3.22.4
-RDEPEND="
-	>=x11-libs/gtk+-3.22.1:3[introspection]
-	>=dev-libs/glib-2.50.0:2[dbus]
-	>=x11-libs/gtksourceview-3.22.0:3.0[introspection]
-	>=dev-libs/gobject-introspection-1.48.0:=
-	>=dev-python/pygobject-3.22.0:3
-	>=dev-libs/libxml2-2.9.0
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.18.0[python,${PYTHON_USEDEP}]
-	>=dev-libs/json-glib-1.2.0
-	>=app-text/gspell-1.2.0
-	>=app-text/enchant-1.6.0
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
-	clang? ( sys-devel/clang:= )
-	git? (
-		dev-libs/libgit2[ssh,threads]
-		>=dev-libs/libgit2-glib-0.25.0[ssh] )
-	>=x11-libs/vte-0.46:2.91
-	sysprof? ( >=dev-util/sysprof-3.23.91[gtk] )
-	dev-libs/libpcre:3
-	${PYTHON_DEPS}
-	vala? ( $(vala_depend) )
-"
-# desktop-file-utils for desktop-file-validate check in configure for 3.22.4
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	!<sys-apps/sandbox-2.10-r3
-"
-
-# Tests fail if all plugins aren't enabled (webkit, clang, devhelp, perhaps more)
-RESTRICT="test"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-'
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files
-# jhbuild support
-# rust language server via rls
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# mono/PHPize stuff
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-channel=distro \
-		--enable-editorconfig \
-		--enable-introspection \
-		$(use_enable vala vala-pack-plugin) \
-		$(use_enable webkit) \
-		$(use_enable webkit html-preview-plugin) \
-		$(use_enable clang clang-plugin) \
-		$(use_enable git git-plugin) \
-		$(use_enable sysprof sysprof-plugin) \
-		--disable-flatpak-plugin \
-		--enable-terminal-plugin \
-		--enable-gettext-plugin \
-		--disable-static
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
-
-	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" virtx emake check
-}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 9ede11077da6..4ee42efb411b 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,5 @@
 DIST meld-3.18.0.tar.xz 553772 BLAKE2B 9a481f18147a767e65cb6d58bd4770232e9d2f8e10261f8fe19d305ab44c19b8728dd5f7e7b77e4607fcdc4e6b47a0464ba5dbb4491ddc9d91ae8c1a10c1e409 SHA512 1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
+DIST meld-3.18.1.tar.xz 563516 BLAKE2B 2463fd6c2a74d9eb655c6e2d531ef69950d8f7a275c01a0dbacf48a8c236a860b27dcc79a137a56241183a1b000d36503c33112c7dcb55055a931f4c415f178d SHA512 ca60c8ea9a5b95b228bd72fe3f8c0d4a8aa004bed27c2b29cd8ff647839973f1808df81dcb5c85cb5420ab2ad4413b0ab31b617494fe6eb366b2b9ad3a83eef1
 EBUILD meld-3.18.0.ebuild 860 BLAKE2B 02dd86bf5d95762f40dc79bcd04d1fee260b0fb20526745a129ff5a32a12e416b25ac8d9fd2249f4429614b0bcb8860d5917255d4c1461b6e2096c8e6dd90073 SHA512 5d4541c603a549fc1073e754f1b87c06d4deda1c4e7cf99b302f720639f32d4b411dbeb7009f3a7d433b83978ab3bd3d945776e61499903d9d56746dbba08541
+EBUILD meld-3.18.1.ebuild 900 BLAKE2B c1c40f9016cd1b8fb25c286dc3b0e7cd91ac040381e8dae320c1f2087e60ccc7b4aec554d02e6ee42a29b3c735257e546376cbe8b3dc8a63fba1cd7238427956 SHA512 16882c06aaa92c778ad93c80bf42923364512496a7991ac2e7dbaad64383fb31f7bc610c74870c275b34d629def2cf21cd8cb2b575b6837d32fd0e3e9b15b155
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.18.1.ebuild b/dev-util/meld/meld-3.18.1.ebuild
new file mode 100644
index 000000000000..ea18fe9d5a84
--- /dev/null
+++ b/dev-util/meld/meld-3.18.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2[dbus]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.14:3[introspection]
+	>=x11-libs/gtksourceview-3.14:3.0[introspection]
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 10cc0d7e216b..444103244058 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,5 +1,5 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
 DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 BLAKE2B b87fc120d6dbb1207d70bbc3324c60c41c2ac8cae8af014ba47bc15c383f7fb821924d3337b25a0b59d0ef2ad641444ed5f85e46d02cd19b07b8913d9ddaf10d SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3
-EBUILD netbeans-8.2.ebuild 6137 BLAKE2B b3a41be3cda4ffa7b26224c95c288db674bde4d3fc5631417e12e32fb8d9ba6a1a8776be47af4d31ad214f8e7c1b887adccd739948ce310f1d9a0c9c6a2a4d41 SHA512 96b38333c5856e2c7f811cf4546b7a65a8d6036584a92ce5f28cc0dfaca2a71da3f3a66ae7ea147a2812ad06a99ab48de105b4c4fc2a68379ec4a38d3e9d0f53
+EBUILD netbeans-8.2.ebuild 6155 BLAKE2B 2f8b34973c6edb42fa41cb0933c1c40a5584ae54e2f77355b40fffdead9b7427d8a0a326b11da45b8c3588314f13da7669822ad9e82d69abc3454971aad97648 SHA512 5591a6f66af08b14c4b44ae0e311c32fb4b70184a72e73ea6ef8c93e124d78e5380ba334345255404651662a3e40e415b551d0d6264601f0a8f6c4ec83c6455b
 MISC metadata.xml 1290 BLAKE2B 6244d6034061869e8129c8edc442fae9035749f0660204b0e3cdfc4a667643b370b26ad6d34c4a6e713fa060cfca5fbfcaa1ea87da7d451204e5de758e945c66 SHA512 10b6897bd10823d399937aaf3e09c1231a6c67072723cea8a9aff002b275b76d74a62260f8416e17cc53bc6a87fa0c19d00cb428ecff4052c1c8e278211ebe70
diff --git a/dev-util/netbeans/netbeans-8.2.ebuild b/dev-util/netbeans/netbeans-8.2.ebuild
index 3ee81e8dc9b1..1fc9f826f55d 100644
--- a/dev-util/netbeans/netbeans-8.2.ebuild
+++ b/dev-util/netbeans/netbeans-8.2.ebuild
@@ -5,9 +5,9 @@ EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
 L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2"
 ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
@@ -100,6 +100,7 @@ S="${WORKDIR}"
 
 CDEPEND="virtual/jdk:1.8"
 DEPEND="${CDEPEND}
+	app-arch/unzip
 	dev-java/javahelp:0"
 RDEPEND="${CDEPEND}
 	~dev-java/netbeans-harness-${PV}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 2443a6e10afe..f258d570ef0b 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,5 @@
 DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
+DIST qbs-src-1.11.0.tar.gz 4299668 BLAKE2B b17e5d0e65fd0c29bf7837d53eb5c5470e6f3a243b4cbd215a528c6657e5c4831e49b369034133f784122e358cce723bd78b26df8bd580ed570a71590a73af7d SHA512 123319aca79c4816fcfd839a7c7f3029c55eac4dc2c2a2bae7df891c15ef81de22bb7f6ad04bbdb39401473a3df15e41b88adcd0d5d2462c2ef3e62bf5e0f80a
 EBUILD qbs-1.10.1.ebuild 3011 BLAKE2B 6bfbb42ef28d3a0a74a6aaf1472e65e32639682c612d1e37a62340598883b1802e7c6717fe57e4340bbad4170a06ddcc1e2f22b35953b019ddc38bd77d3af042 SHA512 c947d0203b748ca2bfceb814322f1369497829a8c0506066cba15878fec019f2f81a566abdd87e2a3c2a828fbde8516e809db79dbcba5b235a087067fa8030c3
+EBUILD qbs-1.11.0.ebuild 3067 BLAKE2B c3e28908a89e224589cb89293c50df616cb5b20b733faf80b47ef2f25a7c7e9f676169d5cfa143de51dd85f5d103ac37dde40878899d992522b693eb548764d0 SHA512 4118b383ab47c790f2354667db16e4f1c689a411efa57dacdded76f42ba8f339485c04923d43fc6a15acb60c5e73640d8036a4ba86a88b8f36f849d79bec74a7
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.0.ebuild
new file mode 100644
index 000000000000..4971aeed8202
--- /dev/null
+++ b/dev-util/qbs/qbs-1.11.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# don't add /usr/include to INCLUDEPATH
+	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
+	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	# the qbsres target uses the newly built qbs binary, so we have to tell it where to find its libraries
+	sed -i -e '/qbsres\.commands =/ a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \
+		static-res.pro || die
+
+	echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
+
+	# skip several tests that fail and/or have additional deps
+	sed -i \
+		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
+		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
+		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
+		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+
+	# requires jdk, fails, bug 585398
+	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+	export QBS_AUTOTEST_PROFILE=autotests
+
+	"${S}"/bin/qbs-setup-toolchains --detect || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${WORKDIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc -r changelogs
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/qbs/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}