public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-cnd/, ...
@ 2015-11-28 16:59 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-11-28 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     65a3a759044c52447e5acce2abc624605fcdd971
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 16:59:09 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 16:59:09 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=65a3a759

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.26

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20151128.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   2 +
 .../netbeans-cnd-9999_p20151128.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20151128.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20151128.ebuild      | 266 ++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20151128.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20151128.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20151128.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20151128.ebuild         | 114 ++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20151128.ebuild             | 390 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20151128.ebuild            | 274 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20151128.ebuild        | 134 +++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20151128.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20151128.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20151128.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20151128.ebuild  | 128 +++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20151128.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |   2 +
 .../netbeans-platform-9999_p20151128.ebuild        | 165 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20151128.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20151128.ebuild       | 116 ++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20151128.ebuild    |  94 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20151128.ebuild   | 253 +++++++++++++
 42 files changed, 3301 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 135bc77..79eb5ca 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-9999_p20151020.ebuild 3384 SHA256 a802a8f7ce9dacc6fff9450f9a1d23cf585e9fab6216a9cdd4d82155175e2c80 SHA512 dad537659fb7a12ee11ba7f902d516f74ecdaec8b12c22a3a5519ffe83581aea0f29c6c6cfd79c6385614f4f553f797a72d385a8f21d37354c40d3f21bb9f1a9 WHIRLPOOL 2ef2db6c7eddd9ffbc37285ecfb44ede5c9dab9f45f802c254ddae1d557aa65a38054f1284a23537a8a6617a1d7b1d31c5542025dc28d4c9a239c3ca2e957a35
@@ -61,4 +62,5 @@ EBUILD netbeans-apisupport-9999_p20151124.ebuild 3384 SHA256 faeef3798ce4b85654c
 EBUILD netbeans-apisupport-9999_p20151125.ebuild 3384 SHA256 55710da0a180656993cb20fb27b49d3827effee003842caee6ce7f4c3a4e96ca SHA512 d3e1da8f6d39d4a928d5b5e8b41c9067ff0e77639316d713bb8a05a8b381ba3d323a31067532157c9c7bed4c5bb8d2312adf82130f722d1fcd17657ba3d1f2aa WHIRLPOOL 0a6b15d04a6c1d3f36c191c55a4937aaa922b6348f100a2c705a01fb0d6049b9bc4707a68df1b6dabe5b9f0894bf7d5e561b33a1b39b76b3efed4362e4ad6ac2
 EBUILD netbeans-apisupport-9999_p20151126.ebuild 3384 SHA256 415d22e9f7f91b552e25c2ed64c9abc29096be98d4466cb498b51c319274060f SHA512 3937e01dc24d9e0d6be87befaead8f96122bcd732eb4b1b9cc6bb57f4f3cc3a415b3fdba12cf103924e7b25a7049cc7ccdf3ca7770ed289ae92114da526d39f6 WHIRLPOOL 1ebc070ac37e446c812f93f13f0cd519747c463e141add0ea38c1e2b73640184296bd1013d1a00bab5aecbc20dd14d8696ed4a3bbd981810eb3777c416d8e8f7
 EBUILD netbeans-apisupport-9999_p20151127.ebuild 3384 SHA256 741a497c8ae881cbb5f78b489273b967a7d1864fcfd4a16497385a2e5ce5f3d5 SHA512 f02152a38e6787528d092a93d8732e7aed863ae2c303da0abb06a3f829db07df6096f2c05f88ddb26f320e620100172c4cb0a95c026758352486a3498efbf865 WHIRLPOOL adadc871d400ca52617ec9607943ebc0f5ea287a07862302a26f575d47731a645a09d5f658afc173871b26ee5ea4b8defe744f30fd38c6ecf820edd76cdb106d
+EBUILD netbeans-apisupport-9999_p20151128.ebuild 3384 SHA256 02c2df4a9d1879d8e1958835e5c31ba1b1b2f0890d2d8d4fce83d8d0615418ce SHA512 404d176aa002e55f1e29551cf7b9e17487bae33706ee4da343e7494b8c30a8958753a68c59fd9e35f6d99750a86022dc1cb5e7db3c199957e71db1d4cf155825 WHIRLPOOL e904f914c09c7e1710cc16c2863e69f88ddb17d8f67c2eb74670b2a16f14ba80f6b5abf353ec7313ab7e69df744b554a62b81ad63a97c4295ed009d7ad1d1868
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151128.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151128.ebuild
new file mode 100644
index 0000000..ee70986
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151128.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index f82ec36..5ebc542 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-9999_p20151020.ebuild 4790 SHA256 66315a81faa064377f614b4891799849b7c08b6e6da3dbd947313942d191bed0 SHA512 2008d230f3fb0b8d3665949e6015c768fd35aecc11b2847abcc7acf76a62d2e6b642d56d595acec6de81a2bead1e4feb948e4f2bbae183ad4d85935a48432c37 WHIRLPOOL 61f64490b827d42ac383ab6151db645d8bcf0589c90c8c31d8c55ddf71d7f723f219884d916c48b42fb63aa8faa534f3b0664cdcb498a36346f283302498ed09
@@ -74,4 +75,5 @@ EBUILD netbeans-cnd-9999_p20151124.ebuild 4790 SHA256 2a73ab1063e4f377e4b262380d
 EBUILD netbeans-cnd-9999_p20151125.ebuild 4790 SHA256 d5634cdf3dad5ea9fb53ef0e1c2c968a0fcdc232958885e9c22a2634015896ac SHA512 c665b74b141eabfdcfa53f68c27a66d6f4b176503ee114907b71ded9e56ffc273c3e8cfa0c9cb28c11dc0b99822ed7d7937a2d28cef05f5c342ee5538c918eda WHIRLPOOL 376e3c905e66764dade619a26e6795b21d477e29c47c0ea03650758454fccb75591f16c5debd5a2f7c71b1e1140d5b2a4670301277e7b11e45073214bec7ce27
 EBUILD netbeans-cnd-9999_p20151126.ebuild 4790 SHA256 bd5209bc5a1be91c4c5865ef1f40409ce351d089d975972728c53b1b2ef9b453 SHA512 a9379721230b2e48d7d4d7f0b0272ac5745ca4eeff2a39737795d4790c3e42d52547c3c28cb81fdcae81f0548bd0cc2e48253f472479385eaa042d772c94f9c7 WHIRLPOOL 62f1c9b1f5b280c27420dafbf3fb058a0b00b5549f7062e3d68dc08ff0a644ceb12cb01cc66b2d4ac749d3b86a3192c7a7332cb7dee9ab95d2612db6966c75ea
 EBUILD netbeans-cnd-9999_p20151127.ebuild 4790 SHA256 59bae39f95110c127cafef0153da707435b36cdea9996d7d44a518613e149cb7 SHA512 8f2ac424989695ab5ebc30ba4b8b8f90d36efd60ba52143c7463a41ec7776081d1ac986f1fb1cfe5efe9c9b656088b9bfb395329fd519608d358f09de9737928 WHIRLPOOL fdce0716ec06df82f468a55f77bafec966ef26c90908c4ad29dc75d758a99417fe9844cd1fe94a50421296b3cd74e724b6cb1a63aa354ddc227995fb179d7ff1
+EBUILD netbeans-cnd-9999_p20151128.ebuild 4790 SHA256 bf3480161b2231efb0d47aa55eccf518c601408066ac1b68170fe69c58c16558 SHA512 264e60a5ea0f2d1f3040e81aee85a74e9a3c9369ba4b1797080ce52cb8e985980291c8e49919efc3976c4ece6548b9d38c97c17d1cbacc4a0d0c688c912032c9 WHIRLPOOL 93664495b2ce745e73d86942102c85498f39cece67cfa8803d03d9d9fe217ddf2a2d044da36833ecada6b1b79324179234c4809b8a8ea1895959cc948e99c004
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151128.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151128.ebuild
new file mode 100644
index 0000000..a61edb4
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151128.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/9A133B99ABDA40B3A17B23DFA79A91AF5FC429B1-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/9A133B99ABDA40B3A17B23DFA79A91AF5FC429B1-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index c4716a8..4c348fe 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-9999_p20151020.ebuild 2968 SHA256 a65fcfda2248cf3e4d1f8f812a8205ebed17738be5f49c0446bd6a4047b3707c SHA512 f8cd1aeed5e0bb0bb83784c6179b799420f997830f11f452026cc4c17b7329eb7ba8a6c9a04cb230bbfe90468ece35ce3125c68caea71a094e469a549639a929 WHIRLPOOL 6f3109f29a5a3d9b9fc8cb355f3feb4c8bf1d0d895fd03dd17dd44502aa36f0f571fc35102854e56acf0a8c46ad0e05356ed08aa81540bf978a2ab0cc0cbf638
@@ -63,4 +64,5 @@ EBUILD netbeans-dlight-9999_p20151124.ebuild 2968 SHA256 829d48bb0ab55219831e909
 EBUILD netbeans-dlight-9999_p20151125.ebuild 2968 SHA256 dff6a182ad5d354b8ed22f497296de2f30111d8dc65eaba00b125ac0642822e2 SHA512 319f51727e34162eca0b421f7940e696ffbf2aa29dfae9c69a0379a82cc0d3f9d8b6e92e642c76ef4cce6ef1e2d90f7d4f2db9960d8c0d09cab859196413be49 WHIRLPOOL 0d44f9689bd30fa1867e8b247235285de4f31a462fda35415fb78fb5f1217c6bb3c326758c14d9ba79476122d13e5fd30a546ad0aabdcee416bc8d3376ad1e01
 EBUILD netbeans-dlight-9999_p20151126.ebuild 2968 SHA256 d169fa18ff684d1de134a0ff44aec9026f32f1d649103202fecb14a41a62a3e4 SHA512 4606889552de60070aa644229fc1908a145da633ecf28f1b0b079ba3e8052b3a8ca0aceb2da9af897ecff90643e5e4567d1b8f342270d28ea8ad6069134e6bb8 WHIRLPOOL d4c0ba24034b37af3df5dd1e2fab593cb1e2edbed803aedea69cb1e02923f59b5d3f7ba3a872c24fb3aca22d66bd52acabc5879d4d65ca86578917f5e2d1780d
 EBUILD netbeans-dlight-9999_p20151127.ebuild 2968 SHA256 dac72c0d9f162eb3165c7e143621063a8de251e065b003a38a3ed4f36d715983 SHA512 567b37df15af7137189b7f1522f27c5e61a68796c0aa5373bdd68691e773b6fbd97c767132d6295e66554215876609ae07a7645b1a884e5aa8207a49447e26e9 WHIRLPOOL b66e32ed1575228f4882892edea52fb154d1dfc519b1db076e7ce20919664c27161dc59588eda7f2e2dbcca8624b3fc7c8e3bd1c899e9370fd4565af1ae37b1d
+EBUILD netbeans-dlight-9999_p20151128.ebuild 2968 SHA256 78d8b1f74e9c1b0b10bad6c183e57515cd710d6496d08bf18cabcc7611a726a1 SHA512 6352112b67df1f69fe18d75905fe8d32c562e0563a8603e94c1b15b186d5f78ae63ff42c5c676fbd5a0ef241ad24ccea0ea34e20148cee0e97e80da5b56a6fa1 WHIRLPOOL ddf2f5d6b6e2264d221e96d707adf1067d478560c14fb007c8ab963750cba4e38f7621899233840c714d9fcc5f67416b19c8221155fcb133db07da49cb9728e6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151128.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151128.ebuild
new file mode 100644
index 0000000..d4df3be
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151128.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index eff2aff..1bc72d1 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1.ebuild 15885 SHA256 3fd6aa88405a012ba048d097ac4313ee0034cab88ee3a7d61fc033b8e70b7d32 SHA512 9f30d3c2162eb12027ca2f8d9ad80707e928afdcadd4b73082e470245683dce239b049474859fe5df5f18d0e6f0256306a4df7e207bfb6d157941afca04f9f6c WHIRLPOOL e49f7b009e2c1a79f49d418e517340ca50c2b4ef1fdcf10803f019a9f0aded2c19045598c61e8e9313e8e75feb330e910008765d9c39b3f09d33e656a63b7a67
 EBUILD netbeans-enterprise-9999_p20151020.ebuild 15931 SHA256 e1b6fcfb1ed4f4645675540de7806a6ba0c25c493ac37d0b55cb713a25408e63 SHA512 2052dca8b87bcf9571d3aab7dc97cb1c954368e47a9eaca1a35f88222c584f74856ec7eb1a54d91c4fbc0b191cc6070c9c44dcc713cfbbff97fa7b2188e73289 WHIRLPOOL 32c6cc8a6d364ce2828fcce4226c6b567d8928445158efd9c5804424005e4c820115024bd3c5a1eb7399702c9a4e196bb6429f53be337722ec5003fd5829a70f
@@ -93,4 +94,5 @@ EBUILD netbeans-enterprise-9999_p20151124.ebuild 15931 SHA256 3625414423cc3924a5
 EBUILD netbeans-enterprise-9999_p20151125.ebuild 15931 SHA256 695ad2ac68264746c14b430dad45f6f92c603b57a381b324e45011e4a97e9328 SHA512 325e19e80b664b39ed95c0edd63c7ccbaace919709fbd85694a827598e22e892a0b250488b2d07aa2dc6dfb8912233e250e4621f97304b02e4e65b8abd8787d8 WHIRLPOOL 9095f5b3a87776679aeb2dfd9cf70fca1801d7f01b5cd9ffcea04886d1e3262695fb4473feb5cf66c1615750e350b4524d897f23ba5cee2384df44f38191941a
 EBUILD netbeans-enterprise-9999_p20151126.ebuild 15931 SHA256 3f4e6db232ff955e52f6e4f783e6519787885af3833e1706188ccb9965e6852c SHA512 9da9e7539b2fae535ad12040518c24c0f30d4a4b8961cb7362096f5af5cf3a5d3743334564f54a6f96ea1b19041665f214420f2be39f8da20839e31925e941ba WHIRLPOOL 82f336f724ebb4c1743a930d38f88fb0555eb69871f4448806f16eeb888d640fc8123211e084264e8b644b2021ed93c352af35d7b58ca4f781e94481d3130310
 EBUILD netbeans-enterprise-9999_p20151127.ebuild 15931 SHA256 76f909e33d48d7d02b12d2437d73a7e551619fa798b14c676bf5fbb0bf820a03 SHA512 2f36f0913ec6cec6b4d0db2c1a5e8384852032f247f2fea4f1a4a251715f4fc92b6b403ce6fd8f6344c4794ff3b1cabb3cac60b47f7c2616fbe6f15dd91b50b8 WHIRLPOOL 7025b75045fa3e02eea7fd68b62d445968a2c5d824a103e5981cb06e709bc423dc509fa8e0ec059ba0dfe81c1f551c8f28c5bd9fcac2461c2430d40c20499e64
+EBUILD netbeans-enterprise-9999_p20151128.ebuild 15931 SHA256 ff2245141d71dfc82053c0566b9d9c325f92e0d722c7a7b912090a91506e76bb SHA512 06de58e39ebdeaf5db30add5c6a4fe505861aad88b70c711106bd549180b40637e1fc31a84adbd791eb4f00f14f42d968a6c5686923e90bba8b89cf0d5f6af98 WHIRLPOOL 3674e1bf02d03a23a8f85beb65d72dfa5ae02ec35ecc750265422f348ca1762c315757dc7cd6135535a79d62f554efa019a48fabe79cecfd0865bf6bc8630105
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151128.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151128.ebuild
new file mode 100644
index 0000000..0de9dd0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151128.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 34cd21f..9987b40 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-9999_p20151020.ebuild 2913 SHA256 c427771eaed07707482008965ee7ab7a073165a1b5291ba7b7defde74b2b042e SHA512 cd21b3e42b03617836e91a78ea80fd864e5f6bba688dfb88d241528038bd598f6d0395a5ecc986eb285e18f4fff9103df5be6acd97a7e9475f8aa8abd05c5bd8 WHIRLPOOL 252962555c37479949e70d5fb0fc201fe540e5aa7f51ff1821db82bd96fa8ac047c788263bda06e0640e7590f007c0c213e834e4b2d39fbe44f0b906167ac7ba
@@ -61,4 +62,5 @@ EBUILD netbeans-ergonomics-9999_p20151124.ebuild 2913 SHA256 f5919c7a10230e146c9
 EBUILD netbeans-ergonomics-9999_p20151125.ebuild 2913 SHA256 b8e3eafcdc5718bd42386e22920d1b5f0368662c56866d6171d4efa698935d57 SHA512 fa2555dcd0c76ba55d48f724a64fa34add7dd8a1cf06e94ad5ea849c2eb7a993bd669fed2b8b2f371eead68b12698bf3843fb44b0e82b2eb484ce52cdc0708cf WHIRLPOOL d0187102b5894499e42008da083bdb4dcd1c40d021f1d3ad023f4cdeacd7875a95ce7cd6527582adb05eaa28eb07fe78c2cc5145639c090fe059d5c9bbb8f7ab
 EBUILD netbeans-ergonomics-9999_p20151126.ebuild 2913 SHA256 506e2773bf26e1192db6f073e9722f4be16e98152a2030888ee7df14dee62eea SHA512 e96d098151e797e5e78644f55a9cd747ea4fc42ab976907038cfbdaa8b1d2f7be635121ba206005f7d778408e7ba0d793a28999551765bb31654d097111f210e WHIRLPOOL 50d7fd6ed2c24651f018645b9a4cafb4a5ff1ff4a65d3c2a386b17c1cefdcb42a0583e63697dd64c38fd4e1f84f69b237ff9c741038c65985a7f36e59fd18a54
 EBUILD netbeans-ergonomics-9999_p20151127.ebuild 2913 SHA256 2cbe0388eb2d9cd029393ef276960ec20a742fcd032c1ceb44da88a899c76eba SHA512 6131ba883a1e0d81e6d2127d134526e67f96b3a5833d8e1d0fa79f54349b78e726bc8752989a0e66ada1f767b6bbb852f842f1a41c533c5c74f88efbaef2c76b WHIRLPOOL 425cbc3c7be4f01daa6f1fffd745b522bd00a839c526d564f97dba1d7fb1ac3435b9088460ef3165dc4e1c2a38cd21a2e584b5234077065e0bd3c3eb1490ee60
+EBUILD netbeans-ergonomics-9999_p20151128.ebuild 2913 SHA256 1829ef81a4d98a8eb337139865f24a0a811257f7d775b281cf16c9ea71dd193d SHA512 563faf0a63e41927ac000ffc1abb9fa937f56aafd9fa45ba71c6562491d3d09a09b1e9dd25da1ae6cdce30c642da23b880c4cdd26ab569bcee7f5bea8fd0aa5e WHIRLPOOL 23681bf40938d6927c14072f3475dc0f8a7624af22ee491338b085d1a754d61a877a27ed2a4fc8db439b1a5b418c09202ee196c2d37789315b1410c65a567d95
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151128.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151128.ebuild
new file mode 100644
index 0000000..8549a8a
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151128.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index d930afa..a370b73 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-9999_p20151020.ebuild 3377 SHA256 ae85904a27ed01ac4da2317415479c02bcfc53365cc80752b075caee00b98ff3 SHA512 6b206c3d29d731efb7a3b13c78fe199404b459296b43c2f4a6bcbbe4a01dba20e4e366ab4027e2390c92fc513a577f1c7dbb8bea1371952bdd989d6d37bd4942 WHIRLPOOL b57e3a64badedbe927a3313e5e90461d4433ef120a802bacaac0abc2cce7fa45c931e609e93c4340966960807073133d4ff1b3fb348f33a8491dade4729840da
@@ -63,4 +64,5 @@ EBUILD netbeans-extide-9999_p20151124.ebuild 3377 SHA256 3d6d5a9b2bffc01b0ffa158
 EBUILD netbeans-extide-9999_p20151125.ebuild 3377 SHA256 45f2c75bda95fd04d85eec40e7fbc9a2d81e9339d418cf10c70936395b32e8ad SHA512 178cb8c625acd694f27d296e0fc12680dfc16fc8d247bc3d4942cf24c5b8a7bfe86100f855b364aed728196077b5f05787dcc1e0991e2208c323a06cb56d47f9 WHIRLPOOL ecf8c4c9e4681a95d6dd62b768cec791b02a59162a792a467fa449f7b5acd983888192bf65fe1e0c202754a18a3a45b5cd7531e2f7d0a69b836c8f0f0d3abcba
 EBUILD netbeans-extide-9999_p20151126.ebuild 3377 SHA256 809dd67950779eeaa8166749d507167dc3574c6bdc2ef23cc79db031db2fa6f9 SHA512 c0501e2a39a66f76592fb103915ecb6c4e6639eeeae6ccc6997df1e212969303481cfca35f76bf9fe9f99811883da54f398a796f8c43bf604e3f206f1f9f3880 WHIRLPOOL 31e36ab19f6524566ad95a1dda232f3d38f243b0cb72013acd2d1456556286e82f9e2a2d4f8d95763464a042478bea9536261c2300f72f722075bb687685c024
 EBUILD netbeans-extide-9999_p20151127.ebuild 3377 SHA256 1162d4317f4280ac04f9b6ceb467fd52793dc919fb991ed3c26937263b3dee1d SHA512 7cc1dc4c241dbdaaab684ba527c641364c829c2258c14e10253ab51de5aefb6560c43e8bbbcd60ab88b54b4def35f935dda393fdb8d375631864362ef490f5e6 WHIRLPOOL adc4a65c6e7ca89ec30e49e03afc93b0e07cc8b14e5af02b74033b6c0e6f93ed8925616476fc80f2649429a3ba0b6477b5ff0dcc9b0f04d49c72f73d4cd33bf5
+EBUILD netbeans-extide-9999_p20151128.ebuild 3377 SHA256 ad8272262fceadda20824d2aded4f5f3225a7bd5ab43b837c09c99ae748d5455 SHA512 e5c26c82b5130cfd90df86138067cae28443a3f55feae1a48f577c802e325af02a0e6dd6d238b16c2ee607b5fea7c43ccc42e1658276169a05eada1ca4e8d37e WHIRLPOOL 7ca183cc677158945e39b018147bddb8e74fa2fb0ec11d43c99dd4893e753ae3e30c7c3ac1e31c646486566382135700eb156088e8a5178e785d2ea5880b40d8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151128.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151128.ebuild
new file mode 100644
index 0000000..ab3543b
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151128.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
+	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/extide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
+}

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 03bf2c1..5185f40 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-9999_p20151020.ebuild 3416 SHA256 e6656b24da8b8d6a7a5af50e93115a6076290e8df249db67906e0f815c3c9640 SHA512 82b2dfb7b9ba64c1da6f1801b2763bf53dad6b8ee5e73d1d833752be3c6f09df4ebf4c553e6b36ba6154e22bba2f8fd5e93f55c5d284d17e0854bda979f87dbd WHIRLPOOL b86d8797a030c2e95323a27ec0ce3e350895911ce42678c1c9ec836abf2cb44a60de951ef80f9d372ff6426ef758d5f6ba80bce14977805959587310ee8f41d6
@@ -62,4 +63,5 @@ EBUILD netbeans-groovy-9999_p20151124.ebuild 3416 SHA256 da35c70e9590c0d187d66ea
 EBUILD netbeans-groovy-9999_p20151125.ebuild 3416 SHA256 f1ef8782ca98e1ba214132ab0908caeb89c88a0de5228a4174623410fcea98fc SHA512 20d2a292bedff6c6647f86e66ceea6ea4b1175c255fe024330d712ed4cec7c04686c7675384a28608cf94d7579c6f27157b7f381897dd1b7cbef7477ed212c0d WHIRLPOOL 86966a5d527e9fca9abc0a34f017d638c43e8ff9db4d9078f83bfd338e6511780ae70466f9d83ec1446981b5f67fd8ecc844be629b4dad9b231902ac0fddedd5
 EBUILD netbeans-groovy-9999_p20151126.ebuild 3416 SHA256 483697c8930d1f261d5dfab4340a5c5455c34ed7664fffa27df94ac3ff0c2d58 SHA512 586ccd1010ed8433e255155d49c2b801def091003fa29146197f23c7a78bebca3a37ec936e24ebb1e8f8d7c9ff0113ead02e7d4ba8fdb9fe5b209d7f423b13b0 WHIRLPOOL 0da2f0d54d5a8e108e188682efd9484aee1b6e4d9d51e4664e4871dc58089d68349b1101e082fd0ac334b9fed519e279d7ff73c18f1785da2ea9717e54f61171
 EBUILD netbeans-groovy-9999_p20151127.ebuild 3416 SHA256 8df56efb07d0e2593ba4e50b77beb25302144d91726053c9c295031448335bdf SHA512 c74f5dd3e754164d1be7f83c66a04383ad3422338fffe87c36b02e10e51948be803fe3128f61e5c1e3008ebfb091a797cea9190fd6b39c09ca11bbcdaf4c8a1b WHIRLPOOL ac1713aad8b285b74771cd496660aa07d2e12b1e6923c9120f60616c41225d9bbe8c7aa35635f101fd548094ff7d276bb6f5ec857ebe749f467f9711eb4ec4d2
+EBUILD netbeans-groovy-9999_p20151128.ebuild 3416 SHA256 4f554706319734a7c2c6e241c84ccbe3a55d3d62d4b1308191ce70551f307f30 SHA512 71d287c9f49337d91c517588052e97b30f26853c5df560eb82dacbc7088a1cafa80d39f61853c85edbc7712dad161d240c572ef6c20a04fc64bd6e255595f766 WHIRLPOOL feafde226801b6cf15278ed9dbeee7de7c9d0cd9822c2605109e4c7ab62e1dbe63cdd41d49d9e381650c535015a13e0cd82a87e5d1daf768b1608c56690e01f5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151128.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151128.ebuild
new file mode 100644
index 0000000..919d670
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151128.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar libs.groovy/external/groovy-all-2.1.7.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index b300b48..94d7a97 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-9999_p20151020.ebuild 4125 SHA256 a2353178bb8fbb9ab606abc0255a5865df100d47ec8daa4dc39e0634f5304a7b SHA512 86ca298b06278505df877f2fdbf7f210808d6d2d5dfe1a523b0414026b8dde1a2e3c9d008c8052b628f9373036ff3300d8c12e100b45ece94fe1e7763fe3036c WHIRLPOOL d7f2648646ed5a1fefe9858fc1a2da28a5781d340578fe9004f9b3415ce4d6d6bca83bcf707f9715d1d1c7aa1f786af86c8f4d9a8ca95dbac24ccd8ddd15f82a
@@ -66,4 +67,5 @@ EBUILD netbeans-harness-9999_p20151124.ebuild 4125 SHA256 aabd7c97af7ee68434bfa6
 EBUILD netbeans-harness-9999_p20151125.ebuild 4125 SHA256 f3617e59eea220f51c6d1a5d2ab6a4f2d9d96b1f011a43c86e6708f04cd264ca SHA512 924ac364e4d15745efac93f6ab166556879043bf8a5133c0228a24c1cc987bd84ff1180ada025b661482939ac0c34099164bfde58fbd7663ac53a44aaafdc0bc WHIRLPOOL 13b1add4ed734b66b945790cf3df75e23eecdc7742c1912adf2e32422680f7b730b6cb2307097cce94dd7fe7656865565350d343dc98648c4151fce44656fda4
 EBUILD netbeans-harness-9999_p20151126.ebuild 4125 SHA256 f0cd97e5b99c04da4e0edff548027a57d935ed366b8c766e20dddd3c82973184 SHA512 61d95f017db291716a082b398f77e22bad6a3c7b51e4544504fe8518c357a8e82947cd7d1c037732407fd43ac6d218341c37bd164d5ddec73fae12aa10dcdb52 WHIRLPOOL b05c326c0ecc986c455dcf683bfb07fbac5e800956b20b2050d81565af59f40a6fced78ab1253d972b1ed317b86535c7d322a868a5af63d70063f9fddcbe760e
 EBUILD netbeans-harness-9999_p20151127.ebuild 4125 SHA256 937f55c7961895cb8b1156b8e2d6eacd6a21ce3fb786c6668d8c8beb85a90150 SHA512 09b61a2d2188c170e0e994423f78debdf468f79fffde34505d10572b500a52d2180c7378f7f6d3ac0b4f5fbcd15969fd0671867d45000c5e7c292964d54f5d00 WHIRLPOOL 702e653558d391c46e58d3f109f79a0310a25cca67067deab7d1b3151cc8388cef19101a3b090da6ce90ebc4b8ce7a1b4e2e6142a4469f186bd85218dca094cc
+EBUILD netbeans-harness-9999_p20151128.ebuild 4125 SHA256 b4e1bbf85280c3fdcc92ea7e9c19312e1a0ff2057da729978fa5e7ffa7ec3db1 SHA512 d06e9476a7a3d9213c26a9223ef696143b687d5ef3c12de2bd64b4ad63b627e280c144151d15e2880cb911ad53df7e350afada8334eb00edf934146c4c49eb59 WHIRLPOOL 3f7300df9d3cb6934a313a1cf0004e672e077a43c3c810dd9852e8351475b9ef8a74ee1df521b7ca3d1ef8db95ebbcdebbd46913fcaf0ebf1746fa77e950b33d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151128.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151128.ebuild
new file mode 100644
index 0000000..af5ef9a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151128.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index f127f54..db7160c 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -149,6 +149,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
 EBUILD netbeans-ide-9999_p20151020.ebuild 30334 SHA256 72d4045e01c0b9adb6b431f84f4c300b303e9ea6474df0149296202990811eb4 SHA512 9dbfe097d94f29368a251d851982df5990ed2dfb0dd6537d344e992d1a022e169a860413c7b459fbda6261f38bb1026b43ddba78a5a062bf55150647c5ac134d WHIRLPOOL 82a3f22970d024e8af5d0fba4fbb2dccc00759f98705264f5765f0a1c0cfda03a018bfaf406221a1cb251ce2e73a45acfb376ebe3f8152dfd69a0c706014a445
@@ -179,4 +180,5 @@ EBUILD netbeans-ide-9999_p20151124.ebuild 31262 SHA256 8b3670150e2b27ccb53bb3d60
 EBUILD netbeans-ide-9999_p20151125.ebuild 31262 SHA256 e9f9fdf4280401659f2d49d33a87577f167cdd9810130ba5b89b4b3fd0f7f570 SHA512 c044cf3c5cfe093cd61fc92b1277eeb88f910c48dea4ff9290bd968ceee0a4f634ecf37537093ece6890ec3ddba5fb72edb61ae86cf31e78124525dc0ac92d76 WHIRLPOOL 347ae97f0f288c165807b07f3367c5d5d30769d7df4aede90f4714ee72913a2cecc2efb35acc376f054e67676f607e7c7de1c54dff9808d5b91ff8dbbfcc5c2b
 EBUILD netbeans-ide-9999_p20151126.ebuild 31262 SHA256 181c08e6a70359fb839d5096bd11a9ae66a9070bb74f268a142b11215bf9945b SHA512 182545c16e6540e6ab18366e13f0656bec8bb05b30a442967416e9e416137db6385c8758d26890fc704ac42c10bebc0d5cf752d81a791463ce344ffef74bcba2 WHIRLPOOL 8d80c4853f7d5ec9003e201adfc40028ada9410e4d478f4ff578df7cb5367923e715a835c116153cf3cd5bce61e4a85485822550a18e6d746e56c99be71781b4
 EBUILD netbeans-ide-9999_p20151127.ebuild 31262 SHA256 360a1514fd5746a973ea22da09cc43c7d76a0c80c9cdfb8d403a097b92c10895 SHA512 36cd530755969298a2dcdf8c61efd6915e21ea244b6ee2c4466d353b316cdee9e812a1346a4bd73c55e15898af58ccf6d452efca79b30262ef83dabac36d96f8 WHIRLPOOL 1ad3fbb022a10a1eb996e32f861c91c41f62db50f12bf6953589c25bc19f697d29e4305a55a2ee7c7c71008886d965890044a3e67ed5b460ef4cd1f404737e04
+EBUILD netbeans-ide-9999_p20151128.ebuild 31270 SHA256 2bd56050413c12c238aff8aee3541a2d5728d5472b1e066c224ed82cba1fdab4 SHA512 c41fbe0f934241e8142b64cfe5a39b9dd108c48f3a14d61c4b2e45663c323f025c11252b8556e6a7e382efbca40e5296f41c1cca50293e96bdd21c81be6ae665 WHIRLPOOL 9484ed123e61f160856297b04128933388452170c2034cb28b64685109f768f18581a6c0c860b50c1366186a1c811c69ba74b4522928419f399f91d411edd4d1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151128.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151128.ebuild
new file mode 100644
index 0000000..e47ad38
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151128.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/bcpkix:1.52
+	dev-java/bcprov:1.52
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into docker.api/external bcpkix-1.52 bcpkix.jar bcpkix-jdk15on-153.jar
+	java-pkg_jar-from --into docker.api/external bcprov-1.52 bcprov.jar bcprov-jdk15on-153.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm bcpkix-jdk15on-153.jar && dosym /usr/share/bcpkix-1.52/lib/bcpkix.jar ${instdir}/bcpkix-jdk15on-153.jar || die
+	rm bcprov-jdk15on-153.jar && dosym /usr/share/bcprov-1.52/lib/bcprov.jar ${instdir}/bcprov-jdk15on-153.jar || die
+	rm commons-compress-1.8.1.jar && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 72863bb..9df8fd2 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-8.1.ebuild 14772 SHA256 cb902b5daf59fb70506d8b8b665418eb98ef2088a72be533b321cc894ef81642 SHA512 b34b6aa8b6358916b0d65f1af261c5cef5e14e9b037cfb6592b98c34f74c556ea57422cc9cd71c1b6cffe6676a7d16cd44b4ddabf270b06078a907a4a79a2fea WHIRLPOOL 1b497bcf6e5141438b69ed81efd64e60532bf956dceea98f30a50d52c3a9bf04c415d578e1315081deef37fd7a7684ddf4806c88c48e51a1ff6eafa7c9fa338d
 EBUILD netbeans-java-9999_p20151020.ebuild 14818 SHA256 8429447d697e0d2c5f6c169937b73ba3e061943bd1ccef44d4ec4676a4e175c6 SHA512 cf9d81fb87a1b5ae5d687023b244ed5d213a8860a0a46a3b8ea98f898b7abd4e07b2a69560f5d042160146c7047370dd132aad45914beb7cd30ab31de0abedad WHIRLPOOL 6a8be8b421801914af952de8bb88e416f451893a72fd123e731b58286bcf475015941c667d794f7372364a627324caf4e79dbd7451ef144d14df6a47d850aa65
@@ -90,4 +91,5 @@ EBUILD netbeans-java-9999_p20151124.ebuild 14977 SHA256 32b17195b22d4dd1675fcf5e
 EBUILD netbeans-java-9999_p20151125.ebuild 14977 SHA256 85d5eb3ea770e34e0c2dfa3c7c7d6904784e09597326dc61c78e515e8546fad5 SHA512 a34548182589bc0f453d34f264afbc5cb4d61833f8a6d0968d4d31bd603102f776d6ea5d23b3e899af29186258b1503f8788477cc84afacebc2bdd5b64889e4d WHIRLPOOL af729ec3ad73beadd50f32691c267169d827310cc441d32961a4d502b32cd855bf9addb66f37054c2edebca527f8d4b0f01de2349f178953e8cf4aa6e067e7a8
 EBUILD netbeans-java-9999_p20151126.ebuild 14977 SHA256 51e1a0a7f6f306dfa8fc5fdd687ec71fc4f046e62522c9474f9d6dc660d7f845 SHA512 356ca41bbf0c4d5761f86e17594e0ad50bd442fc1911e5b84e926f0f137750fefa3f72d2d8a4268c0f225500a039adc4b8321a1ac1d522454f372d3ec9067c80 WHIRLPOOL cdbfc5c501526791f0fa190b5ff7ad054a11c692b9684faccccc575ab4b7e84737ee792b94ec38d5fa3b68c05cc32c2048313114b296e475e3cad9c2d46fe8d8
 EBUILD netbeans-java-9999_p20151127.ebuild 14977 SHA256 6127065b9c8e1f6f487a016e7e1fc09fc4b4a845df6ac4895c2ba202ed204854 SHA512 8a0989921635fc99478b6a0c1331ed6aa4e1af13124e1595b771751d4631370106b066cb4da0ee1580d9eaa7250837f60a0da96af14a11527009c13127d22c1b WHIRLPOOL e89a23af9ffbaf7501d41239a4a1db314b86cf1be62eaf75fb1c4fb6a30fe304d35a4066bd74eaaee282a8aa4575c7aca1e01965587a1251a48c67b98a0a16ba
+EBUILD netbeans-java-9999_p20151128.ebuild 14977 SHA256 cce32a38bb107f0e46d21faedb615a0b0efdfa3e4b8efc1605e84c0dd43d644f SHA512 db4cebf0c93e4bdf910f76815ebf1972cd6b486a7d6d6d650140faeb4358442ed3a3e08a8f9a010a726f09a49d71fc06759d01eafdad6a1a50455909d2ada1ff WHIRLPOOL 0bfd244b4a579f8eb72af17e48c9beffa73a97ecb8cef2f577873af66f957e2c67a3bd8a7000981a4eb80dc9aaa7dea96e71c84d318ebad78d181997e1ef801e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151128.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151128.ebuild
new file mode 100644
index 0000000..4995c08
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151128.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/61EFAA681DB4565984F8FB85AA95CCA5F7CE88D1-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/61EFAA681DB4565984F8FB85AA95CCA5F7CE88D1-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index b5d3c5a..a8e4d0a 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-9999_p20151020.ebuild 4976 SHA256 3fa86c840916b7cdbdad3ca01c01fc90d92d83e48570872e597fb1e195baa738 SHA512 198643bd7c1e2d724d51c03399456cb52aa976351acb9ae40da5fd6b87ebeb5b4790e939227e5e885f0422a5d53162258480d471fd8c00d698ce52838ca3f859 WHIRLPOOL d733b45a36ef3cedb5c8327b5a8b89bf76270f4347d51a702ac869687f24a65dfb85a4388e00aa81aebd04397ec8e555a2e9abed08c32f276fd8c5ae3e2cc8f9
@@ -64,4 +65,5 @@ EBUILD netbeans-javacard-9999_p20151124.ebuild 4976 SHA256 c2fdbe7d307fdfbe2eb64
 EBUILD netbeans-javacard-9999_p20151125.ebuild 4976 SHA256 f9d036c91eb55e4f14d8c0dfdcbf99063b044c9339dde0b09da416c411717d3e SHA512 55243230fe5f31bc0f21bffcd5aff4959cae262ba1495ed9d09e9e981ce5e55d13209a4de45e2eb003f7199d2b64c6640b2154b9cad1fa5f4187dfdd706f109c WHIRLPOOL c01e4bd1f0a9f253efcfd024764ac499ea84901c4ae9bd20c4823011b57b70c583fa18d29a25b350ac96fefc089da1e20c1a6d12f328f699dd49a0c8fb2f61de
 EBUILD netbeans-javacard-9999_p20151126.ebuild 4976 SHA256 70c79abcfa275f0a468cf9a452a9f31cfee8337b3bfeebe5eb8bef752a69b8fb SHA512 20349a9c959244cd09e05375f6975df1501bf4872817c3b01958ed2d9194b70ee3ac9315c17ba131e3bd98d82bd93e90e2e74e2f979acac34930e902cf430d35 WHIRLPOOL 47f84a0ca577206e993a2740b7092e93fc6e55c26b4f2a151549100facf16652f2887f0b0b33e967136def45d16cdcda1f206b0460a5c19ffd46f6ee75dd076a
 EBUILD netbeans-javacard-9999_p20151127.ebuild 4976 SHA256 d9b295fd60cdb6cc2c363da5f754cafb1d88c9356591ad25428a09f88c23734a SHA512 d9e923b0972cf1ae3e62209581c1f800995dde1154927a787ea71b72c6bee7158b8a94c92fec856bbbfb309501c81f1a9d5d1785d9101298cb274f822680448b WHIRLPOOL e205cb0ce746314763712d6435be8a2ec082669c85a89947ac0598a8394ac3c45844b12fb75c2b1a5947c81952216a3bbb89a67286de767c8bebd951b0ee46a3
+EBUILD netbeans-javacard-9999_p20151128.ebuild 4976 SHA256 59fb7c590c88d458a53f6eb1f0b1563e789695b0e8d58e87f170415517c0537c SHA512 c7f7598dbf1a4d5c6cc52a8ef068ddc07837a4f6d254fde9f0ae78016b90c58d59a352e98fa67632b74316b5be36a8136c6f9877429396ef3dfa89bf60749d52 WHIRLPOOL e021cefcf49006512392cd6111969b01af5c63df55184c1173e41796d58d2a9c87d6a35cf5d6c7447a8396b68d507cc83fe0ca623bed0fd63c115e28ba698633
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151128.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151128.ebuild
new file mode 100644
index 0000000..0580744
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151128.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 44fa6e7..1b451b9 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-9999_p20151020.ebuild 6228 SHA256 dc223ff5c029585a18f5e15773ad43b6ee99773eaf61133e915d638b4b80a432 SHA512 3a4fc7a669aefec1454c261ec6d151ecfb47ff4615029619ba9817c284a6acd9c0444da9113d9bc494b8722a85034b102307797936886c0c9817ef87565eb903 WHIRLPOOL 1741f79478c96b3aec92750444759bca60a84914c64bdf8cd6b28a0c4d0afa33391df02c31da9337d2e52ab81f5f563b44da330c18d265b8f5e7e0e167f338e3
@@ -62,4 +63,5 @@ EBUILD netbeans-javadoc-9999_p20151124.ebuild 6293 SHA256 f3e2301e5a3ad20eca37c3
 EBUILD netbeans-javadoc-9999_p20151125.ebuild 6293 SHA256 e410d368b37d8db5f243842033a5d4e85787680bfe1e39d7f02bd9797f16b2e5 SHA512 d7f424c34b5130f0d93b75428767fb4a5856ac679112ec668024d20f75923eda2a3185a2e8312758ed5b3189f841ff6a17ffdb01ad411d3e6e248a17165eaf7c WHIRLPOOL c95e97751c05ef425a9550b6d71d0968ae1794fbcc1401eb90e624cc1bd49fe4839b5d3bc7f0a04cc9e50ab819489d8efef3bd29f9c1e017c95f3bc7b0ebd08b
 EBUILD netbeans-javadoc-9999_p20151126.ebuild 6293 SHA256 defe699decfbfeda9b00368cd1d2939888349dc1e24989efd10f6d4882161261 SHA512 e4a4846eaf21ac060d034a9711d494833bbb34627fc600f2bcc66d114830ac858bac27a9ee535cfce7f43564dca52400b46fb93385c189fc6b4839029a0f8075 WHIRLPOOL 783f170311404922d38342a58bab3406b29e86cf45b47b4b8660b12b09a017a8c643f6060dd99b2069b597426a7e44aadfd3067ea108814771fe719c56844a11
 EBUILD netbeans-javadoc-9999_p20151127.ebuild 6293 SHA256 728925e637805d7d3286243fd19fba8e3a292dc665acd27a7954f29d98df02d3 SHA512 84509ab93acdb64ebdfa5bbba2b37071eedc31307887ccddeebd8d0585f91270404655f1700df807d02cabd12de158a897eb43c2f4e5ef2adb8b9924b53be3aa WHIRLPOOL 8709aab591dfbf25dbafd7aa684f278dc1413fc0460169e775218c379f71807e5c37eaeb82fe63b725bfe49172e362967ccd0a71ddaacd69c3a207acca3eb4a7
+EBUILD netbeans-javadoc-9999_p20151128.ebuild 6293 SHA256 10e3e18d477421bbb576add2cb177b1ec30aada6c238dab06eeb392b37007fa8 SHA512 309af6eded7735afcb9cf61f7a1862d6bd74d9d26b7f178423afae5d653475e7b419bedbff18fea58c8339bb48bfce90dd0b111fdf2f2ecf177726c5853f6d14 WHIRLPOOL 76de253d6f3baa7357412667e987af03ce5008489be207fd5a2946c39b192eebc14fb15ef0767633d6c5b607f4b15d7f88e35ddd2c39e625b33ee52b2264fa41
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151128.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151128.ebuild
new file mode 100644
index 0000000..a96ce72
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151128.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 64e12d5..1e45e7d 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-9999_p20151020.ebuild 4717 SHA256 9283235fe5544df58cb5962dced7108a333d8ba68124cabf6399a08435557670 SHA512 68f866b745bcbca8090a92896c0b5c29812eee41fe05a41c3f962f76a7026b98c6ca18ee441d394af0b11aab59a14bc9be50f5b4f87d257784ad3f2397e44dd5 WHIRLPOOL c35b1b34da5a61f3984a89dd10caa875c4bbe117964565de4c05a2417253c4fe311c5fee7c16f2c146004844007e0d90ecef359858cd89c3b9ec4357fba8d4cf
@@ -68,4 +69,5 @@ EBUILD netbeans-javafx-9999_p20151124.ebuild 4717 SHA256 da36975af65d9ab66c6d8e8
 EBUILD netbeans-javafx-9999_p20151125.ebuild 4717 SHA256 05047579fa391d9bfc5026c90503eaeeffaf0983208aeb8ecb6e9a8c1dbac24b SHA512 fbf63aebc9bcb3f41945c468e58dd5a2891765ca0d8ac2464b8780e877f61892dc43796c904277d32787a4722a5cf0c6520ff4d5b7dc7ad1cf3c125f4ef330ff WHIRLPOOL f12d5dd46112d7e155bf0b7151d850f5323016be9103a64084615d63158697b1a18c50a18bf3b9820e93f7dbe1ba72444262c32c43545b4da3ef44d2f82f33aa
 EBUILD netbeans-javafx-9999_p20151126.ebuild 4717 SHA256 26ff30c74a0cbf044011567192ac33affa8e3743c9214474072c31ecba32ee63 SHA512 01ef0f47599dd08c416bee775c16478ac66f8016b4926f497df4bcf80cd62da812d9078e4e9b77888339a1760906bdfeaaea657cf9006bdb56f3af092bb1f129 WHIRLPOOL 26bef7a0836ff6df5e0c8a26d2417035a6b04ee11625f5c68caa0ebd0cbfb26c7a1898fcd1d8318da9b7c3050e35f50282721bf979201b7b46c6f479af1c22cc
 EBUILD netbeans-javafx-9999_p20151127.ebuild 4717 SHA256 86a8cd3cdb6c8af1ba49eb3c2c3b02e1d17726f2a90e9d49052f1eb98735a701 SHA512 484fc61d3e618f6cce650f7b478ccbfc0ade39965fb76515f5bf40cf1e57abea9a2e278dde3ff182214864a7606f010e74d9a4593f02b150c6825b78aaa0a07a WHIRLPOOL 8c61d8cea0865700ab7196657ed7c730d40cadacc741009a43b2ca0dc58b44df1a2528e6ffc5a79e3cafeaa283afceca7d5dbc2690b1b681c981ff9384f52732
+EBUILD netbeans-javafx-9999_p20151128.ebuild 4717 SHA256 6ad3aae811a1bea0d2d981398a809e2de1872bcb7f19c0cd553ceab810d4b9ea SHA512 12806a6f75c791fe28a13cacb700262292700db3f5a64fd323aee1b7720797b2028fe5fc15c5e12be096c1fa4929bc617350abe148aaaa8154047f3ac2b5b35a WHIRLPOOL 478b0e0471f588ffa3df4eccb2c2f2d32c582cc6d0c32023bbb2ed8f4770f6fe8bcb3705f3abfc662997ec1660a2c6f810d430f5f8313e094dc422970f940370
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151128.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151128.ebuild
new file mode 100644
index 0000000..a8ed982
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151128.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javafx >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
+}

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 009df75..3797c2c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-9999_p20151020.ebuild 4412 SHA256 1d8ef002e80070069c10a8f22e7f9ca36c3b42853cb5c703a8fce60f083d1323 SHA512 7034bc012801d98a05a011b2802d9afed49c382e120b6b09f4dfed83fa5f4a0c2532192ef3f436e6e579800f8302c4993f1c2892178f5959ad5fbda80f0c0aa7 WHIRLPOOL 503a6d3c20d7786ea062933e1dda16b596aa37f7744bbe40085981de931b6175b43589398e40e54ba9870073d3884a7315098766412e949cfe955497a575b549
@@ -61,4 +62,5 @@ EBUILD netbeans-mobility-9999_p20151124.ebuild 4412 SHA256 ecbb6f544630892061958
 EBUILD netbeans-mobility-9999_p20151125.ebuild 4412 SHA256 c8304352bfd298a615aa3d14a1dcf4fe7175efb3339678fc05d79538133a15a2 SHA512 f6c65f312a50d855088e487af744b8599b727e2ecabb75992448dc340766b052e17ac7950b6ee6add6bd5981dfd1788755f6267c7c4030fac9b8a543882be8cf WHIRLPOOL 4e7a634787cc1a9369353a4b023fd33dd390c2a6516b2b91bec3bdf552fe414fdfdb0125431c0b43084625ab72950e43317fc058ba55f9deb4f94038a83cbcca
 EBUILD netbeans-mobility-9999_p20151126.ebuild 4412 SHA256 06881435e8e537eca6e9fd48fdfb6cb921380e82ad9f592b2af5e3038321f8ca SHA512 60c15eb42dc5305042f71dcd46fcd3eb42a51793dcbfff208446886810b781dc14942b3ae5c7bfd369c096cbf5c21a590e21423e516b28846c90e6368bfc01b0 WHIRLPOOL 6d6cc998a92fac5f601c1103981dbec63d97af8aa16de43facede795f26e45242e15914f073ca0d69115f5322861ddf5df3ff851156f0d3967a6084e4f2cd910
 EBUILD netbeans-mobility-9999_p20151127.ebuild 4412 SHA256 081361272459a9bccb0f5e4069949fdceb6142567423715301f60f1e32244bad SHA512 8d4295e45d86d2b98883269e6b25b5b48c5bb24fd042ea3771cdfc887c142d537e8f8f2fde0f63d88de8e8a618c7ce29ce93746cc253a8049547610bd89cf2d3 WHIRLPOOL 8c6f96b4ef977b4e40d35a62335e41f903e7e3d135562f41662ab949e759a78a47287976a78efc93a23f1e194df2f2f8482cd45c5ffc56fa98923c067ea72699
+EBUILD netbeans-mobility-9999_p20151128.ebuild 4412 SHA256 23500c7ea64c821d370916b1add467cff4483066f57f6b84d2aebc8fd2360de1 SHA512 764e202b2a8b9cdd96f54a3cf93e74f2e48d83414d759e64543407401b063013d15c87f6b0a77aa3c9e9ed818a207743d57cf3fd8ac7585d2d3ab7145bee5fb9 WHIRLPOOL 2300e40760380877e9183863b518d6589eef2a0ea2f2da296eb4025391ec40f5c630cd66b51d59345e53e7131ca7394f36ce832ac799df9d9f0906e0de7ce0e0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151128.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151128.ebuild
new file mode 100644
index 0000000..f493c35
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151128.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 0a62073..07abd94 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-9999_p20151020.ebuild 4997 SHA256 9de1dc3e412e0221882d29d7c5fe185864b7cd18da96967de4c0548f8382c0b8 SHA512 e60354e81cd6278f54d71eecb07ad618cd8f9cc67e477bd4b4147ade941bb1316d39f05803dcd5e0ec559f075f2e1322909193bccc814722eeacdc5e074f3c33 WHIRLPOOL 04317326c50a78e843c281a4abd0e53cf1183fda10035a9ae3e120500a20b9a0a201ba990b184004635608a6fbccf6ef54a3ba0eb9fb3109b5c54a677405ed06
@@ -64,4 +65,5 @@ EBUILD netbeans-nb-9999_p20151124.ebuild 4111 SHA256 112f3a4c698164e6de192b5fc73
 EBUILD netbeans-nb-9999_p20151125.ebuild 4111 SHA256 c1729efc020f64b791b9a5f13d0eaf365bd7e71a1cc5e4a4bfa5214f5c3fe2e3 SHA512 00e4f0daf8a2c4943551fe1587e6377cc892dc1ce597113fb9ee18840e43169a51fd47700fd499ed6e9e534481b8edf63b2311d3b98f0ecce42b74a7eeebb9bc WHIRLPOOL d471879d38b20599cdcffe20025afed25abf757e176810556697e1a2df04f07d43d3f2b9484652ad4a599b5eaf73f98037ee8fa05894d22127672a4695c3cccd
 EBUILD netbeans-nb-9999_p20151126.ebuild 4111 SHA256 58be2d341eb13fdc062180fe042930eeebac524ac8eeeb03c8b35f82a0a30bdb SHA512 01ff7d2280531062eae17edcf5b4c1c0d585e24f01a2b7761e31df453871a74b4bc987feb5377d0b9f8fe7a62a31f7fd7aac6bdd9994d9b9bd9f1c8cb5849258 WHIRLPOOL d0e2f1527144ef1b2cef22886d30969169d3322392ad893f9033842a4f684ade40cd0b4420419ccb5e09dba3bf7a81352a2f6a6ca99bd5f02b4ad3ae5ac0bdd4
 EBUILD netbeans-nb-9999_p20151127.ebuild 4111 SHA256 78d5dfd5d1ad824dc2c34b7eb917924817ca0b9f708e7228bf50766c31ccb764 SHA512 4e61b4ee55974613a01f93e916ec8fbbde464281a4ca65d9292ed8f6b1a552cf7ce6067e57e13769638c745fa6f796d7c9a515255132ecc3f1696953ae9bd152 WHIRLPOOL 503fdfb476b6e286c9376f6b8a21dd44fe265529c36064374ff6c4e78b4f07d1b57b968c8b3e164efc56dd32c32037667d4b726e88fc87c5a6eaea49a3b8a006
+EBUILD netbeans-nb-9999_p20151128.ebuild 4111 SHA256 0396bb805bfd44538161aab96cbc3d162df5bb4cb71c2e1fe61bcf27a5eebe04 SHA512 ecc928b2f5d0833d9d6e8cec25467b66bc539c76c9f587b808fce0856431f92c23546d97c49a78a97cd2a7d931c77ccea30f6862a35bac7d38e8e711a5d0be5b WHIRLPOOL 59905eacf370f2cc6d27b9357fe37f2970b14d8cd4511f2b2494503b15d4d09515ef47123fa0d32d0f10dd92dc4976a7a6e2a12372e7aac97aa62f6d8052ee5e
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151128.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151128.ebuild
new file mode 100644
index 0000000..2050390
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151128.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 74f6d8d..b28dc88 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-9999_p20151020.ebuild 4417 SHA256 208c7fa12dd52de0ce78d242a9f427ba5b41adfca6cb259fad7fc4ace2df820d SHA512 3f73c670d6dfe34c28379c6e107588c293bd283b5de32089c83f8c7770baf9b1e53a284ad62c82b96df9590e08b8f45653a679603326a005063242bbf510b1ff WHIRLPOOL 7014632a49417d2062092a771c83b140d31b2eb6586673af3c766fff1d8afbca1b749b1866a407378f9757621ccce816c19a08eb12a50d52891ec1c6fc3776fb
@@ -65,4 +66,5 @@ EBUILD netbeans-php-9999_p20151124.ebuild 4417 SHA256 0f22fd374eda92634f2f86e466
 EBUILD netbeans-php-9999_p20151125.ebuild 4417 SHA256 8fb92088f6fbd34249d01f54e400f1131fe4adf909f7eafffeabced80f81fa7e SHA512 29da10038e6eab01aeee3da8f479658a125f1866034fd4899c1d4583479ec0febdeb59a5fa5b29617a6059eae52656967ef2d776e68a1c5c46fadeec93a65503 WHIRLPOOL 926630abb3ac8d316d34812ee71e82c85cdbfed0f9e439d35bae519f74ea23940937552cd2e11ce649f1cf823153edc5312691b52189e03cbc92850af02dff38
 EBUILD netbeans-php-9999_p20151126.ebuild 4417 SHA256 8a985cfe6e3bf06bb277244bde45d50778f1d04fd9bac1920a64ddd7aa48cce1 SHA512 1f97f69d007adc1c009fb24441f56e6e34c048a4cb7cfd3ba7e9e8e7fe74350b00e9818c9372426905ef21d1dbcbb71ef640037bb32c71e1b0ab362bda892be2 WHIRLPOOL 694ccd7771560c8907eb2616f5b56dffe492cd0cba39c54be3f357e203e086a4b63dbb2cee952e682904f1cbad5f1ff10543725f2d9fe01fd425e63eeabb44ac
 EBUILD netbeans-php-9999_p20151127.ebuild 4417 SHA256 331a534ad2bf9c8585b0163236f7c2a9383ab0a377130f1b4543632cca36273b SHA512 9f4c359c414aba3f0e6351019cbc637eb760d8e55c4bbd6cf629cb47a410b2ee0bc30eb5573df7f9316b4ceb389c9a8132905d5cd2e0b87f300ce1b68476191f WHIRLPOOL 3c318e35dcefd27a8e3ee5557e926da79a7962d0aed06433b509e59cdbb14c0f648c619b4ce5ef12c6fce72a9e834b4f63f7c9a13827e3b2c2d7511b23d3acd4
+EBUILD netbeans-php-9999_p20151128.ebuild 4417 SHA256 239621698a1d080e6f1dcab4fb54ad67cf350e9acccf34443762f7238d21d8e7 SHA512 7b87cf750e5757e50f3dc1116f0c0c9f251f84aef37c9eb996bb44244995548f9df64ffc32b83e55d702a330a4c782ada404c5f6a3552a224da0476acf0d6c4e WHIRLPOOL e71551ae21599e1edd52e934019fa1b95e3fc21ea39d778d8f1efabc00b9e02a3419abc7889699a6a05e75a23c61083da31fa22d5b1148a18e0a0a0bb9520313
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151128.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151128.ebuild
new file mode 100644
index 0000000..b005cf2
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151128.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 6315e43..9d1ae6e 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-9999_p20151020.ebuild 9382 SHA256 db617dafb475e4324a21b071b145e661f9a79d786e95e7f396234d29308dc595 SHA512 5fcebabf4c0035b7ab436ca6da2ddf63a19a3d1f91e87193a0dc806b25d03c0f4e406b43232460bc4f54155a741d975b77dbeb2ec621a300276dae0b1b2f3033 WHIRLPOOL ec49b99816e734a41606e73d3d5bfbcdddfb9bbe73e667b5596919696f683ea37bbe8fcfc118ab63be48029de4708d4315944c38e98891a07e635634de7c8e0a
@@ -77,4 +78,5 @@ EBUILD netbeans-platform-9999_p20151124.ebuild 9367 SHA256 43145fbfa4c483a587f4f
 EBUILD netbeans-platform-9999_p20151125.ebuild 9367 SHA256 b45fa5f45198a14f6209aafc35c58c4b9a5b8a213c79ab6019433c84a63589e0 SHA512 742d652a6f0a529afc45a0defaeaf5b8aa4ca8ad8ece4cc24f0de77dbcad67e0993bf469e807678ebf836d2661642ea435190321a5178b8e5af689650f9aa4c6 WHIRLPOOL 7cb1d0601080d20a5085ae2a82b0bbe93c1d0017d2930bc980aaca143fda5c440cc6ca57b89df4bcf7f4a87737a2b143d1edfe7ea365dac59f772ab993c82464
 EBUILD netbeans-platform-9999_p20151126.ebuild 9367 SHA256 0fa8b1670e36eb5d72e627cedb375bafabd26ea76235b126992b78d761bd1214 SHA512 9bbf9c62b03cf18d69029db07201f5d8058f7d072d9864104c94cd81ba62f0f1f961d426f0ff1663fc4eff8ce6599160c3d546b8efaca842026d9e50113c4b98 WHIRLPOOL ffd64fce466bda51fbb51a477a8a9d757c3bde6d6543872793e2d36de24169d0b0e30f5aef40bb70acbe61ac738d6fea8cfc7272b338aa85d52aa23519a21233
 EBUILD netbeans-platform-9999_p20151127.ebuild 9367 SHA256 b4c4d9e884cac3d1e0c0e07a5852683a1251e55bffe425925d9fd5af4f581aeb SHA512 1d8d6c533f320be2258972d601c46c3a29d4b9d85eb3aabb7d8a1a588cc84f999f62575590140e10cb0df268e72cf05a372052d39a001d708208074be0a2d0c8 WHIRLPOOL 2a6d66758c0ed575e611719a91ceac89f2af7bcbde74dbb20fac4f6323b35a05bf988e66db05872ed3b6e6c4857915a59adae12e270f97cf3e69e615af281b10
+EBUILD netbeans-platform-9999_p20151128.ebuild 9367 SHA256 e651d1c27241f90a76b196817299e6132e26c8da23eb8554e690d5f8732ae587 SHA512 d12e6a5a44d926ff9aad8008a0346a862449297c2bd5420b866d0808e52e36b5191515099368212f49b96a3b76fee652a232433d13e11802e0516707a529d09b WHIRLPOOL 9fce7fcd94bc71a414c88c29c82157a0739f71891ac7e7284ef647b2250fe6415a13d0382b4017f08cf0585d4fd4e2f21f33009e0b75ccde1960704bc707b45e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151128.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151128.ebuild
new file mode 100644
index 0000000..6521e5e
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151128.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
+	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
+	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
+	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
+	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
+	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
+	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
+	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
+	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
+	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
+	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
+	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
+	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
+	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
+	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.3.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index c12c93a..1e7abcd 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-9999_p20151020.ebuild 3472 SHA256 2b1993d329fe5afdea67c7e24a85fafff444cd7c28b57c9caf5c62b1ecde78f1 SHA512 db24778ecdb2490041c2ec371f94bbe417d1e2712ee1cd43b39b069f3dec7d87b23c494fbfe85408f7d202caa8c3e8761346070d07bb51233d75c24cc623b206 WHIRLPOOL 48caf83a0980a80af45609c9067e4c7f3df4f78f405fe2b545a14a63abf3fad1f316181767f1da3f5b945eaf0bf566ead544ad18516604c5fdc2099a493b7f04
@@ -61,4 +62,5 @@ EBUILD netbeans-profiler-9999_p20151124.ebuild 3472 SHA256 e1e6e276414d763db2730
 EBUILD netbeans-profiler-9999_p20151125.ebuild 3472 SHA256 2d4431b6d9a7df2c56c1c8b284ed8a61bedb531a07fcfab2498ac61cfcf1c0ef SHA512 de90df04fb89242a9a377fc575a702db5875d414ec2bcb2ae88a819ea7ee29ab6a006b390c768dccc35df5f7d8bf39ce9896a1eccbe00cb6b4275ea899641827 WHIRLPOOL 270eb3eab8a1fa55816740d8b2a99a8908432a65f9a9c4249c3dacedf2009f7a4239bdb995626e66626af6e2bcf93b4ac1055301f6bacf32fcc24f4177a6d0e2
 EBUILD netbeans-profiler-9999_p20151126.ebuild 3472 SHA256 a6b1ecc5d8513e8eb2700f263e012ae959b1ec10079425b773216bc45ea8d802 SHA512 866dbd4e7379da2a825a0ac0c2805d8edc48e921e8d4a66193c6c86d3ca3bdda1aa299b6ecde2e5058f5422b64944d0d450bef3916f8f27152a24415181b864b WHIRLPOOL 4f97e376565941cf9797c1969723670a6a05285545683068687c35db42b672c9279b1df0a7baf3391658a728945088a18877e90a73656653416898ae1ff97e7d
 EBUILD netbeans-profiler-9999_p20151127.ebuild 3472 SHA256 13315f1ba9b671cd4b3f97e3a0d0101ae1e51c7b4d6b9deaf28a22b17d4b84c2 SHA512 df9eabf88809f6cbc0cdf4783ea5fb149936af9f149bb27b1203a93d29ff1671fa6ba8573f3ee89cea3a2457ccc2b970975ecd7982dc9fdd0a0430988c886e3d WHIRLPOOL 0250090cf7e17ff375a5f726cb2beb3c1df7cd7e4c34fd387aaae25cb6dd906903b0e5fd1e605906c005334024b425ae2d0044ff09d0a30fff065d2abe4ab7b0
+EBUILD netbeans-profiler-9999_p20151128.ebuild 3472 SHA256 d3e50fe70252b33a5203db57236457931000b4a9ce059860a552f2184ec9c65c SHA512 bb9b112def0c0124d897faeead92c4d647b3bc5fdeef3b5395921bac4f3309232b986e3e513bd9006fca748cf583cfa997aec484837ebe2bac90e52b627e4271 WHIRLPOOL d4ff022ba3928c32b4eea87b82cfec9b2bef3f43b883de23009f822a5cf9dbe114c1298b55a1a3c41b8d0b9285285fe75261222ec53f685af030b4f384c94cdc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151128.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151128.ebuild
new file mode 100644
index 0000000..88237b6
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151128.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# Binary files needed for remote profiling
+QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 77082a3..c24ac29 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-9999_p20151020.ebuild 4991 SHA256 d0ec398501285ef079063a9136b13a1cd191a422b54a035e2c3dfc4ba7603b31 SHA512 480a3b051ef36de88a023d53f764b522dee66ec02d1acb730d43cf4e8dc7f3f66690ce847fb3ce37a2f8b0234a0fc9fef3e6683ca40f858cd2dd0df1eda15687 WHIRLPOOL bc2873d5be22616d0327e9f40bc721549b75f4bb4d2288ab415ce3a5ec18c77ba0c1e8d9dde7524d0efac71142f95fc68fb951c0a786eb40dc22fec52991d4cc
@@ -70,4 +71,5 @@ EBUILD netbeans-webcommon-9999_p20151124.ebuild 4590 SHA256 9f29ac471ddc7e44893b
 EBUILD netbeans-webcommon-9999_p20151125.ebuild 4590 SHA256 55b2bc892d888f89140d90e9907704777e287fc6f5b7ac77495dcfbef0bfd03e SHA512 e7d8da1b1bfbade4bac86c9b9ede476043d543a6de97edce6d85229535bb241fdb437303908354803276e9cef574d9c685a834771289f5c34a2fd9642ef0dcd9 WHIRLPOOL ea80cb85898884ede0f1965f9b15f106a652c598f75579a5d6f45a31cd1e7de41328b5738b1a5773bee49f4639e5c0c6e2407d2b9a24e15508debda0d4949d08
 EBUILD netbeans-webcommon-9999_p20151126.ebuild 4590 SHA256 640e087569d2b7923bb6c4150d1c05c20537d49e633eb60e43e44d96f0675955 SHA512 dd8b6a02c93ef9248eb0516d40f435d2e6d56a514134fe1e2ad92118572033f194a8ca4e1dc499752c8d31aa1db56d8580be91f0928c5d96e81d1e20089da3bc WHIRLPOOL 511dfcd4a5e0f60d8aa87a41057dd319c951890ca4aa47839f5b070a343bafc05dca213c55b8056c155a3bb0b4f8d0e58ffac4e4c07907ece3a35d6ec7c83ca2
 EBUILD netbeans-webcommon-9999_p20151127.ebuild 4590 SHA256 ef2931223dd27f3b63903e9590a407f8d4e2778475c7955ad86fe64755148d1a SHA512 2dd063ea761bf197bc2f23a3bed76b72bbdf1958976008ee2f95e58a98f7a2a90df42b78e1829338a6b718a696daed8e5b6fedf848a6b9d442a20cf0bfb88765 WHIRLPOOL e15b1986cfa4d269ed1b33c70bc47622dfc82feb18892efe72fc5aebcb0f1eb224c938ce1a0fe6db58007d4c62275e4b42581ec6d8c5e91cf9cbbc03098b2c57
+EBUILD netbeans-webcommon-9999_p20151128.ebuild 4590 SHA256 ba44e0aa9e24f49905440f78c4d4ce2c8b5131ab24bd7c4f3530f9c3a20ad541 SHA512 6f9d4546d0a32e624b5e1b66d278433313211f2f1a043907c419b1d055fefbe622b2cacc572bf50e1a2374895651d2ba2decf8a39b31a5e0b30ab3c2f8e0f7d4 WHIRLPOOL 12535aa896534b67ef632864e82014e074852b219e364075342b9dfe42a37dbe30bf7b057ee62fb2480a7a8787cc9661803fdd2eec76ddcbcaad206832816197
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151128.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151128.ebuild
new file mode 100644
index 0000000..cf07349
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151128.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 208ec95..b31618b 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-9999_p20151020.ebuild 2721 SHA256 115ff09c7ff247c8b9ef65d7452406d05c17a740ee65c47948d9930276f6a565 SHA512 27ade14dda248dc3af18dd95798bf50b1bb777decc2c7c19757bac3a23fd6da256cce671acbd5c17c46c3c0ee2713f6ea1a901f5e48e2af74bc5a4c141686666 WHIRLPOOL d663e9681d67ce23e5147ffff7215a00c11a2ea3414ac04d27d7f4a94fb4853a1a51c48005a1cd78aaaf0cb788850315982b39d640cda5d6ad80a69bd6906bdb
@@ -61,4 +62,5 @@ EBUILD netbeans-websvccommon-9999_p20151124.ebuild 2721 SHA256 9c2b3e303409b3064
 EBUILD netbeans-websvccommon-9999_p20151125.ebuild 2721 SHA256 ae6f0b467716fef58a134f9216484f5255c1df5591abaca6be8a368bedb009d7 SHA512 8d53f5e62c71730df31e99e6f039bdf53deb01cfa176d59448bac091cdee5911ec2feba44c5719d69c6f2faa6e7342cf0c443b7005ecd3e542922d48bb2ef6d3 WHIRLPOOL 832be05ffe1daedaad6e381677492ebf98c3b28f070835a7b1e8bfe56832889838d715f034233db573b071fc51340cfa5b859cfc6807cc2b6e42d493d97dbd8e
 EBUILD netbeans-websvccommon-9999_p20151126.ebuild 2721 SHA256 2bcd76d2e7bb8903293be4b95cc168e17872ccbda5d50e5ce326c52196310f4b SHA512 d9f3ef5bbe98d0173b99ee020b3602a6308ad03a0299ff68e8126a4aa52b6857fda9597c2485e265d8d3f3147bafbd4ac38e40b454839f4d2036e2849ebd0229 WHIRLPOOL 6aa56df196ec3de85415303ca0539b01264dabeef7d6c4f2d900cbd0fb96f2e6f31fec8df62c0ad28251df888c61b8d10bc480169e2b8832d4ca91ea35914f2e
 EBUILD netbeans-websvccommon-9999_p20151127.ebuild 2721 SHA256 e1b90641abd3724f55ec0307d8aa481887b33af9b423f331e71c6bceebbad000 SHA512 8b99515f0d80c3a6a9833be008e96a44b556b47c16e3a3095342b1ec8e55f2eac543bbf8b1a2515bc077d35e97e8b15271f74c547867f8daca0ed29a24ffed90 WHIRLPOOL 4292a9625f0c24881f37d3a1813bca4a938c0b0e09b5cfc240330136fdebda81443d0762db49ebed3dc750bfc233fe12d98ec6d6cb9c8a8fe8c3e42a44a7ff02
+EBUILD netbeans-websvccommon-9999_p20151128.ebuild 2721 SHA256 9f642a918ad51bc9e64046bb553f19aab4e170a0de7ec8d5b8f3f5e655aa0a21 SHA512 eee04e1ee233806f7f4ac1b3a39e245be7bfb1ce3783cdc6a64488027eea72e03533bb55e0c4682577fe94da35da7da5e17e1a821b789a253df3fc759ebbbc61 WHIRLPOOL 2fcdd5310d66027068b90f95c73d7688abedd4dee80926eac3034f9fc44d5af9a1479436cfa3011398b4ecb76de833da9870c2f5542554da0ed2a93783e308c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151128.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151128.ebuild
new file mode 100644
index 0000000..84443a9
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151128.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 0d5efd8..a2cdaa4 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201511240002-src.zip 209016790 SHA256 f7cf4fdfefab6b
 DIST netbeans-trunk-nightly-201511250002-src.zip 209050331 SHA256 c5bddd15370c7b689caff156e3d447575f1219ebe8a40973df3c4065f68f259f SHA512 b2b02288525f68ccbbb3f1a1d7cbd236cefe0c4298d44279c49a7742637791ea9bd2c9cb34983fe881235efb143e511aa62e949efd254c610ccd5bb061a0e69a WHIRLPOOL 7ddf332ee1ca12ebf95bec63bcfaae141150247d1009ea4604891a43c03d4a45ae324930f08a06147f79270cdd1e0d897d4516b28e22dcd29d2022a69be93929
 DIST netbeans-trunk-nightly-201511260002-src.zip 209054508 SHA256 769ce945b8cfcf1b62447d9ecf2fb5dcd37e0e00150ecf8cedb5bd0c65180bf0 SHA512 cb92510ca140094fa77d891305dfca96e64d7aca5496b6b7b47a13ae51d71106511c910fa6c93f1e101f0ecdd2244333881ca8816cd9c863511135b445e8c120 WHIRLPOOL 620d089975058b262ff82084e27ac499e63dd9fbf2d395cee151f3dfb1b05bf29e8fde0c48fe00d5d08c9bf6f5901068e03acfeda54e18b93bf33f1add558036
 DIST netbeans-trunk-nightly-201511270002-src.zip 209057113 SHA256 a5ae7083bc58b9506a7d026bb107fcd414d9cc22fcc16dcd2eab2417d2d445b5 SHA512 a1f6377d1fedf4b9c2eaf576c11e09bd838b49d9236ffaaeed9390b0f056e37a86da458fd4d7db38155917b4a05775693568d56acb2105f35159e06224052301 WHIRLPOOL 953deb9ba6b05d459c780eccaa0c9578397a86d4491b088b55a0f9834655b9e26f0808fef0fa29d35dc30bf18ad22f4d5a50cf021dd14de2fa47c066e1eee88f
+DIST netbeans-trunk-nightly-201511280002-src.zip 209067071 SHA256 4302c5a2625fd2ce88690813a9a355aa431f013e71d72a43db4466aba0c1399e SHA512 6774f00a6dfd4fb717432e7c3fa0cb3edaefa60711bcbd1f18961d9d0d8181cbe7c251a1d5c5f4ee09465f43d109f2877ff8b3357f47550ea81459a71edbc35b WHIRLPOOL 71b5cf8f6c3b82cc6194ae015869c6b11bdfa5f6dbd2c5a86c97a5f7fa17fdd20212c37523f0b0d0c4b7660b81f1a4589998d67b53c09280fc81a798b003bc1b
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
 EBUILD netbeans-9999_p20151020.ebuild 7210 SHA256 a6b6f167d3b234a13eda7a8e03cf567afed94db4b32b53507640ed566e476909 SHA512 5f58a49a0d4ef7bb7dec98279eac950a88aa9f58f6c4f0a15b50c1b894211eceac8a4e1bca24d38ac6a1c1932678b73041a86d6818057afa24d0fbd503ce2546 WHIRLPOOL fd11fe87d841ecab50b36276d770a2e4b52566d6346cb92a69f22d606f9519c6a7cd244185e288dd9bc76ca08a2aef383576ff397df62d9085aeb2c09f0f573e
@@ -64,4 +65,5 @@ EBUILD netbeans-9999_p20151124.ebuild 6938 SHA256 175d7cfda6ad4ab65e8893b9caafb9
 EBUILD netbeans-9999_p20151125.ebuild 6938 SHA256 a77720b0eeda9e431920fd277296cfce620f6591a991eb98144dd94cf08cb1af SHA512 8e5a0d6ed73287eac9715c7afc8f4f232831c6a79539375f4d7faded39176467616ecc7cfad756646b050578d12338909bf5dfbea447e605f83cd69c12f4eac9 WHIRLPOOL da13d20077581682f976d0292047e67a0eaf5b1a4d87c359059ce63e4ca7c580e7284f0743416e9d17a7e166a001fea528597fd8e23292a4a8c7fe97913dfb03
 EBUILD netbeans-9999_p20151126.ebuild 6938 SHA256 fe435e4e2427b7375aa985112373362bd57a3070b2a4406c40f21788c7097a98 SHA512 5f6c862f668e7f64ec8de918d4b9a807c37d01d313ee31fb14998732caa2193a707985b725a57508e3fa8c4e28424c2084cbf6f8fe928c93b3501a76c76fcb19 WHIRLPOOL af229791604b6a090aac859dc7a874196d9e2575acda91386edf2c624a3121152fae9273d16fed4e73b7daa7d78a3aed8eae2945ba1f2b083e69d06820f7476b
 EBUILD netbeans-9999_p20151127.ebuild 6938 SHA256 24ae51ef3f81140d3d3fe92950721130e447b2d52bb71e29e818dc4b572828c2 SHA512 4465a8e88143c243d7786f362b7d979fd8b21c9767f888401407b12fa18074491d4eee58ed34ee66fedeb478cc6244c07e1c2040521d920d7ea73c0c7cca2b3d WHIRLPOOL ee67180360502405f9aa27e660c7e11d7dd9a377dac65db31b5515c3e06fadb4ad111a9101f010986986d945961d01fc3ffe7550bbcb65ac51d70e2c9600d8f8
+EBUILD netbeans-9999_p20151128.ebuild 6938 SHA256 6bd558e967211724a7c714fa14f4fe8624a4f562ff2094d7e3e69a8c3e143481 SHA512 b5b455b51e10f93efbd07e88d2bc8904ea43451f9cf3ea662c3f7f183c7a979dc0d0a8672008716663239ea5d6ce1aca071b874f59cecc89f32c68eaf895d686 WHIRLPOOL df7e3479ef136c52ba456e13ca066d5d1d83f08bde83c7124d2ecaf700430bf087a4de70e6b001f5ef475cc68923b88d1d11c741e387bcb488d2e1f03b7aeecd
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151128.ebuild b/dev-util/netbeans/netbeans-9999_p20151128.ebuild
new file mode 100644
index 0000000..2803f16
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151128.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-11-28_00-02-04/zip/netbeans-trunk-nightly-201511280002-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="linguas_af? ( ${ALL_URLS} )
+	linguas_ar? ( ${ALL_URLS} )
+	linguas_ar_SA? ( ${ALL_URLS} )
+	linguas_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_es_CO? ( ${ALL_URLS} )
+	linguas_fil? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id_ID? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_nl_BE? ( ${ALL_URLS} )
+	linguas_nl_NL? ( ${ALL_URLS} )
+	linguas_pl? ( ${ALL_URLS} )
+	linguas_pt_BR? ( ${ALL_URLS} )
+	linguas_pt_PT? ( ${ALL_URLS} )
+	linguas_ro? ( ${ALL_URLS} )
+	linguas_ru? ( ${ALL_URLS} )
+	linguas_si? ( ${ALL_URLS} )
+	linguas_sq? ( ${ALL_URLS} )
+	linguas_sr? ( ${ALL_URLS} )
+	linguas_sv? ( ${ALL_URLS} )
+	linguas_ta_IN? ( ${ALL_URLS} )
+	linguas_tr? ( ${ALL_URLS} )
+	linguas_vi? ( ${ALL_URLS} )
+	linguas_zh_CN? ( ${ALL_URLS} )
+	linguas_zh_TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_extide
+	netbeans_modules_groovy
+	+netbeans_modules_java
+	netbeans_modules_javacard
+	+netbeans_modules_javafx
+	netbeans_modules_mobility
+	netbeans_modules_php
+	+netbeans_modules_profiler
+	netbeans_modules_webcommon
+	+netbeans_modules_websvccommon"
+IUSE_LINGUAS="
+	linguas_af
+	linguas_ar
+	linguas_ar_SA
+	linguas_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_es_CO
+	linguas_fil
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id_ID
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_nl_BE
+	linguas_nl_NL
+	linguas_pl
+	linguas_pt_BR
+	linguas_pt_PT
+	linguas_ro
+	linguas_ru
+	linguas_si
+	linguas_sq
+	linguas_sr
+	linguas_sv
+	linguas_ta_IN
+	linguas_tr
+	linguas_vi
+	linguas_zh_CN
+	linguas_zh_TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.7
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}
+	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
+	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
+	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
+	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
+	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
+	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
+	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
+	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
+	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
+	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_LINGUAS} ; do
+		local lang=${lingua/linguas_/}
+
+		if [[ "${lang}" = "ar" ]] ; then
+			lang="ar_EG,ar_SA"
+		elif [[ "${lang}" = "es" ]] ; then
+			lang="es,es_CO"
+		elif [[ "${lang}" = "fil" ]] ; then
+			lang="fil_PH"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id_ID" ]] ; then
+			lang="in_ID"
+		fi
+
+		if use ${lingua} ; then
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-9999-r14-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-9999-r14-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_id_ID ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-cnd/, ...
@ 2016-08-08  6:28 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-08-08  6:28 UTC (permalink / raw
  To: gentoo-commits

commit:     b017b02e69f99f4969f654a2b6aa9e741500074f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  8 06:22:50 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 06:22:50 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b017b02e

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

 dev-java/netbeans-apisupport/Manifest              |   4 -
 .../netbeans-apisupport-9999_p20160629.ebuild      | 111 ------
 .../netbeans-apisupport-9999_p20160630.ebuild      | 111 ------
 dev-java/netbeans-cnd/Manifest                     |   5 -
 .../netbeans-cnd-9999_p20160629.ebuild             | 127 -------
 .../netbeans-cnd-9999_p20160630.ebuild             | 127 -------
 dev-java/netbeans-dlight/Manifest                  |   4 -
 .../netbeans-dlight-9999_p20160629.ebuild          | 101 ------
 .../netbeans-dlight-9999_p20160630.ebuild          | 101 ------
 dev-java/netbeans-enterprise/Manifest              |   4 -
 .../netbeans-enterprise-9999_p20160629.ebuild      | 266 ---------------
 .../netbeans-enterprise-9999_p20160630.ebuild      | 266 ---------------
 dev-java/netbeans-ergonomics/Manifest              |   4 -
 .../netbeans-ergonomics-9999_p20160629.ebuild      | 101 ------
 .../netbeans-ergonomics-9999_p20160630.ebuild      | 101 ------
 dev-java/netbeans-extide/Manifest                  |   4 -
 .../netbeans-extide-9999_p20160629.ebuild          | 108 ------
 .../netbeans-extide-9999_p20160630.ebuild          | 108 ------
 dev-java/netbeans-groovy/Manifest                  |   4 -
 .../netbeans-groovy-9999_p20160629.ebuild          | 111 ------
 .../netbeans-groovy-9999_p20160630.ebuild          | 111 ------
 dev-java/netbeans-harness/Manifest                 |   4 -
 .../netbeans-harness-9999_p20160629.ebuild         | 114 -------
 .../netbeans-harness-9999_p20160630.ebuild         | 114 -------
 dev-java/netbeans-ide/Manifest                     |   4 -
 .../netbeans-ide-9999_p20160629.ebuild             | 374 ---------------------
 .../netbeans-ide-9999_p20160630.ebuild             | 374 ---------------------
 dev-java/netbeans-java/Manifest                    |   5 -
 .../netbeans-java-9999_p20160629.ebuild            | 280 ---------------
 .../netbeans-java-9999_p20160630.ebuild            | 280 ---------------
 dev-java/netbeans-javacard/Manifest                |   4 -
 .../netbeans-javacard-9999_p20160629.ebuild        | 134 --------
 .../netbeans-javacard-9999_p20160630.ebuild        | 134 --------
 dev-java/netbeans-javadoc/Manifest                 |   4 -
 .../netbeans-javadoc-9999_p20160629.ebuild         | 168 ---------
 .../netbeans-javadoc-9999_p20160630.ebuild         | 168 ---------
 dev-java/netbeans-javafx/Manifest                  |   4 -
 .../netbeans-javafx-9999_p20160629.ebuild          | 124 -------
 .../netbeans-javafx-9999_p20160630.ebuild          | 124 -------
 dev-java/netbeans-mobility/Manifest                |   4 -
 .../netbeans-mobility-9999_p20160629.ebuild        | 126 -------
 .../netbeans-mobility-9999_p20160630.ebuild        | 126 -------
 dev-java/netbeans-nb/Manifest                      |   4 -
 .../netbeans-nb/netbeans-nb-9999_p20160629.ebuild  | 128 -------
 .../netbeans-nb/netbeans-nb-9999_p20160630.ebuild  | 128 -------
 dev-java/netbeans-php/Manifest                     |   4 -
 .../netbeans-php-9999_p20160629.ebuild             | 127 -------
 .../netbeans-php-9999_p20160630.ebuild             | 127 -------
 dev-java/netbeans-platform/Manifest                |   4 -
 .../netbeans-platform-9999_p20160629.ebuild        | 167 ---------
 .../netbeans-platform-9999_p20160630.ebuild        | 167 ---------
 dev-java/netbeans-profiler/Manifest                |   4 -
 .../netbeans-profiler-9999_p20160629.ebuild        | 121 -------
 .../netbeans-profiler-9999_p20160630.ebuild        | 121 -------
 dev-java/netbeans-webcommon/Manifest               |   5 -
 .../netbeans-webcommon-9999_p20160629.ebuild       | 132 --------
 .../netbeans-webcommon-9999_p20160630.ebuild       | 132 --------
 dev-java/netbeans-websvccommon/Manifest            |   4 -
 .../netbeans-websvccommon-9999_p20160629.ebuild    |  94 ------
 .../netbeans-websvccommon-9999_p20160630.ebuild    |  94 ------
 dev-util/netbeans/Manifest                         |   4 -
 dev-util/netbeans/netbeans-9999_p20160629.ebuild   | 254 --------------
 dev-util/netbeans/netbeans-9999_p20160630.ebuild   | 254 --------------
 63 files changed, 6623 deletions(-)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index d3a3b58..238d2a2 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
-EBUILD netbeans-apisupport-9999_p20160629.ebuild 3384 SHA256 3fdfcf8f51c94feebff30161abaf8596121dff51ae4a5094dc34f3024daaaf08 SHA512 7428e5a53211d40fea6c9d9d586d463b24ef903b91f4b72da6b82952341ae635932797a68cc95f3cd1bd6af246be2896fc94a1bf8092385b35429db7c005d84d WHIRLPOOL c6b26d3994d587f3f4d8e67a51810e8e8060110b806725d726117197f5966b6006fc31be3eebe63db6ba3887a21f8a2e59289e1f11451cad497d233aae06e50b
-EBUILD netbeans-apisupport-9999_p20160630.ebuild 3384 SHA256 c0b6d124da980cd4d2a690a2029b260f2147a12e827b957a9f2608090635a6cb SHA512 43f13339305c6b25df318a6f9754cdd1d847f952a3176b80f46c8883e4bb5a55a9c8695472267792e926f0f883e1670cd27865cffc622fab3d8d59498905273b WHIRLPOOL f4430df4b3bf4d26f5257e9f35274cd9644ca940a38ea5cbfcee03efe71fd64e25f45363a0c039e6de984788d8669828ab89d8348c5fbc40cbef2daee6257c64
 EBUILD netbeans-apisupport-9999_p20160701.ebuild 3384 SHA256 23ddf90569b909e034103f3833b095c9b80aa2ddf369b8447e48c837fc615e8e SHA512 d32cdc40e4e928572805643841606f69e5517e8e010561b36c50dc6890524bed236ca442d8718149ff6dcd65e7c8412ed4bdfbb228e663e1eba4197c79c53953 WHIRLPOOL 18a0b2e081835ab23b41e2da27e91b4b217f80deb3b8f4e4b2e01470219d1b2f46ff43164d016ca214d2b9f5d1fcfdb8d3f32297e1b078edbeb86667a015a3c2
 EBUILD netbeans-apisupport-9999_p20160703.ebuild 3384 SHA256 9ef07c0f89d66838dfb548c6aec4c06f78e8efdac91b65190f9a8e7bde75202b SHA512 cefea52998b294738ce78e05888329400a6fa819551b294692cd571ce67c3b82538b3911dfef80541a76c61ff7769f2dbe5b62bc8be570f4eedc0a5f3d051b44 WHIRLPOOL 56ae1c90226179dc70b09ef10553b91f847b5100dad310458e903bd087fbf96f1fcc77b0661738462e207a0f0db2af02cdd989c5a83d41d58bbb40bbed8d1230
 EBUILD netbeans-apisupport-9999_p20160704.ebuild 3384 SHA256 951ab1c28c6b76a5d18cfd1b50bbb1771fe21d594464a28a1c029fc4c99ed4bc SHA512 fa8a3098a038f03709a0f3919b9ae60c73336198def27515643a2345e215c180531f984a47183959ff7f6998529fa12a8ed0570972da633979547ad35ed7d421 WHIRLPOOL 36398dc5715a9ed007b5a76193989a54a5bacd24c6f1f69668d3c17c0fcfb46869b0430049fa472665c69522d16beb2fee06d400166cb10c443ba0b9a5ec5398

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160629.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160629.ebuild
deleted file mode 100644
index d2f46e6..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160629.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/apisupport >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
-}

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160630.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160630.ebuild
deleted file mode 100644
index e292b47..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160630.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/apisupport >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
-}

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 4c339e4..16f3042 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,4 +1,3 @@
-DIST 1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip 8610458 SHA256 b0d2581ad9f99b9d81bef35470b5b582ee286a0897395f5f0765494a7e7539eb SHA512 3d1cd5a9a0fc68300510e63cd4eec76227379a6cf58585aad7f82c25e837b90f971b2d90145fc83f273013adb5577abac118d2598d9072f1c33635627ba56234 WHIRLPOOL 8abd59083bd1e503fde7030116a2825c4922286d96ae923872826a66c6387ccecb37a7a7fe6a25386ca4f15f1d08a71194e3d81c78b414b38ca527e9632a6bb1
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
 DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 SHA256 d97735f723292f9fe534d0821841370ee3a14a577c3fc959078ae865c16201d4 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852 WHIRLPOOL 8a5f7ff0b4b94054a0fcd7366d37f6cc34f3c5e90d94172447993b9bc06753e13d57fbb2d2c14fe2a4ca5b15285b5165fc7f66b6012710669878cea67c6463e8
@@ -16,8 +15,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -44,8 +41,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
-EBUILD netbeans-cnd-9999_p20160629.ebuild 4790 SHA256 3947dba3a41d59419448c102176ec03d42a202cfe2581c69c2e43b55665f1230 SHA512 726f246e63511149d5745dbb8e69e3d7627692c2dad034b890afd5e947c12b8aedfe0bbf1f349a4b234f01ccb0357771f11fb8e40c78026e29493fa583894731 WHIRLPOOL c681e4673b980acb05a3eb7a1cb1dfdefdb63e7bc8b31964fd2d07b3f3fe82b38509a4ef88b5a0e9b11807c0adae1702761f525944b68b311a5be1965f883a1c
-EBUILD netbeans-cnd-9999_p20160630.ebuild 4790 SHA256 4fbd1088c37f203ef0bcf1fff49366a6d8fc6865ac02afe0bebebf8a84403332 SHA512 f2b297e1abe3a6987109384d2317d541320f25a125026dca43dc5b8041725c4821ef1d8df585c01fed6d35940cc64d2e5eb2e005f8d2502cbc47f18dacdc71f5 WHIRLPOOL a485f8b5b39f034af07dd830ef01f746c7a7fd8a2cc33bc910e2e26b2ba6d4325ecc73c51637d251a754dc79b945f4d4f115edb6829efb06889221f132c76944
 EBUILD netbeans-cnd-9999_p20160701.ebuild 4790 SHA256 2408eb3f64253d3f307d2c423a8a161a6bfbc900aeadda0f277d60c2ad56762e SHA512 7c7f8739a628fa9a76cf835c7a535bb02dc20fefff441085e98be115c4bfd70a68027f414f574a8691dd67847d177af11446830a329c42c99fde9f890e433bc6 WHIRLPOOL da6455a33ea8a7022491ff6b2bc4b07a58e1d811b8a6e7ecf199085bbef0185f7a515beb1f8b14335f7b4e6ec8f44f00893f3c1be371ade69b3fdfd181b16b00
 EBUILD netbeans-cnd-9999_p20160703.ebuild 4790 SHA256 c523d0fd4053d15b0aa5856d69931bf91fd6306a014c3e6fb873d8e021ab532d SHA512 c22035a8e6454480721278965d03513dc1f50e28df959c55355d14ddab8a395c0c3e9e76070e93abb733c4a52ee593102d4df374eac9705193ac28cb15dd40a9 WHIRLPOOL 958a194633e5c13deb8ddbb7e04c38d8f962e894a7fcc177612128f63150d5529469a44fe6006b310850282134b989007cf357f4dccceaee2900bff9eb3ff829
 EBUILD netbeans-cnd-9999_p20160704.ebuild 4790 SHA256 ee2e074ab100f5cdbbf9581ae6eff719f119d4685071eeeeee56f43e9d08398d SHA512 8e7908f351f3bb750cddc471670d18cc54bedec4592b1f18568b098f9b47b1970b6b7dd7751f5fac013a413ceb19ca139daa3c5222a2119196091add96436352 WHIRLPOOL 3a9bf321a4b34dac9e6584bb1485091f17255e6fadb78ab8576797ccbc13290d5b0967af2ed519a242e8794b2aba0e909916e5ea91fe84d3bd3b9392614807a2

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160629.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160629.ebuild
deleted file mode 100644
index 297ef03..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160629.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans CND Cluster"
-HOMEPAGE="http://netbeans.org/projects/cnd"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
-	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
-	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# These files are for remote development and debugging
-QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
-
-CDEPEND="~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	>=dev-java/jna-3.4.0
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
-	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
-	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/cnd >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 bin/dorun.sh
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
-}

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160630.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160630.ebuild
deleted file mode 100644
index cbc7b43..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160630.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans CND Cluster"
-HOMEPAGE="http://netbeans.org/projects/cnd"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/5F62670605D036468D158D3D02FDCC6FBAB5D20F-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
-	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
-	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# These files are for remote development and debugging
-QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
-
-CDEPEND="~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	>=dev-java/jna-3.4.0
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/5F62670605D036468D158D3D02FDCC6FBAB5D20F-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
-	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
-	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/cnd >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 bin/dorun.sh
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
-}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 3a7c117..b0a87e0 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
-EBUILD netbeans-dlight-9999_p20160629.ebuild 2968 SHA256 9c6a5702731dd8d67223462b16d07c889cd18318f4738fce2cbca0a52fa40afa SHA512 530f7d5d9089173f25d1dd19681903e396b80db9d46b17202615e1e3f4cecf0040124d247ad442de1eeacf8205dce08bb4f18749ff7d8efd09a11690fdfdfcd3 WHIRLPOOL 18fea7b2e26ef4ef2457ce88d26e35298373f50ccabdbbd118d3a054f8695aa6343e6e26db392053791e516e32aa1e92b211d8d91d27137b09a7b7e5856f4897
-EBUILD netbeans-dlight-9999_p20160630.ebuild 2968 SHA256 151f88f9c269e103fe3a319810e477c10414b25f772c39150055779ae1e5013c SHA512 8108cca35d437cf6a0f790e8b404ecce4a7194ac07b47e246dd0e1d69e5ef409bbc6a7effb16d72f3afd3774aeef329d7ddf96dba20535b072d022ec14d53bb3 WHIRLPOOL 3f1086fd3be26688fa97dec41e0e9bcbda0d662bcaefe9c8738aa39d9a8ca1024273ce87eb5f7d2c4c3ff9a1473255cf39b3abe12a7838d9f6bc54ca38328014
 EBUILD netbeans-dlight-9999_p20160701.ebuild 2968 SHA256 c42d40f303a188eb4eab79422cebd86d57380ad3055bba40519cc673fd04fc93 SHA512 5d19b80f6599808ac4b1d228b3e51d294ba2f8a10a78bf8671ee7aaf5c6cef1210019c573ae3ab4c821c0da6571200cb9c175c12b2142f601dc219045c827857 WHIRLPOOL 1f89275128b17e0733ab61dab34e9ce032e7e215ed93e9681d9a145e986cd8b33459e808fe7cc776eaeaa6e3eddf71d6ee6dddf293ed0c91d3c10850ccedfa07
 EBUILD netbeans-dlight-9999_p20160703.ebuild 2968 SHA256 a3d7fd8c65576aa6946f5c2fa1c83f20a1ea9f35d232612d73f76767dbaef2cb SHA512 6e57b9195beedb5f0d3ffcbdb92d96247ac8f5453319739a0e8849167d28746b1e2889210a969ab716c6f269e52f3d4ce64acf4e19338268fe3c441838394f54 WHIRLPOOL 34f19128334048599fb0331e306679aa1c47fdfb55f757b8e7063a02dcf061f8182e7015afa6ce6a2f5bc04e918d9b7d6550ea32ddbd7cd99d7ede6981415cbb
 EBUILD netbeans-dlight-9999_p20160704.ebuild 2968 SHA256 b69ef07eb1aac09251cca079445d47a644e78a035f30ce084995c352619c14c4 SHA512 944dd7a7aa278a6657fe7783b7800d37286b07f8eb4f42253565dcb9ce41257fc3178b606b5687b00815f80252afd6cf86f936f7653d4b0ef9602bc60d2ed44b WHIRLPOOL 9625e043c7547f9d5d9add96ac797b25767e4e73c4fbdea423af8418b0a82670a0d5651fbcb26ff087febd9b360e2155ad5894cd4c5894f97e981d491ed80756

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160629.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160629.ebuild
deleted file mode 100644
index 0d2a34d..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160629.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/dlight >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
-}

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160630.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160630.ebuild
deleted file mode 100644
index c27c283..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160630.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/dlight >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
-}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index e05d53a..ee61d7c 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,8 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -63,8 +61,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
-EBUILD netbeans-enterprise-9999_p20160629.ebuild 15825 SHA256 11f57bfcb0e6c75c5b6db35bc5287fb9ef0962faee72895d733e02182bbfcd04 SHA512 89e2c89a917a48198a2642e83e3f9e84b07c19bc9b6e4ba4ae96f831fd210a55bcb101614664828ee1df3167fe84a0372d326b13b248c5b5c09b7f41b732a99f WHIRLPOOL 9206c61df238922a70e4647cb8cd15971a9962ce70f4692d3e47b841d9fb4a89c54ce21307a50fcfc71bb4c1472ab3413575e7c935df6d8102b89abce1e53eb6
-EBUILD netbeans-enterprise-9999_p20160630.ebuild 15825 SHA256 bc6797d11f7ae5c6fa0733383639e2009ede80a1e0cd3b97b4ce432a340a598c SHA512 1b0d67dc1cb7a7b7a5d5072fbf48f6be0e35538d488e97a79b07a9a3ac8265d7113c0c6f97886c624c56089fa050a21962e8ba35f6f1b4b944e62a60688b8b67 WHIRLPOOL f0701486928212650fe3e287e6460999a109d913cb8b35b9e6262a3e6b2e90e7ed8ee35b16cbd68499dab3f82a3b8837e9b4dedd5424e4b5b54b0b018a575bac
 EBUILD netbeans-enterprise-9999_p20160701.ebuild 15825 SHA256 972d11302e41244601dc8bf7b9a7de574fe7d7536f87c507e79077c367314e45 SHA512 36c7a9637ae9c73de230cb361efa06c85262ba2d4d9dc68cc9c2bcdaf35826d664f05aafb38ebc0792d89e15e88ef72519bbe832ce38c9519c1dbc4d59e85d70 WHIRLPOOL 5b4cf8f2b40c641a44ab8b6590d5128fc264d9881d618eab5ad5ad8158a436cafd731cb0083e82ffe7e9750681d53d5f528a730a0763df67fd2ea9e373b4c9b9
 EBUILD netbeans-enterprise-9999_p20160703.ebuild 15825 SHA256 ebba0ae1b9d43156670aa6c9b7ff17338e8ff65b5b82c9c4df23eee53f11b7e8 SHA512 2d65e67bde091ce23acf3c2667f33671910b37b9ed44276bc5ed0f115abfe455e2c70fb8609bc7c05353ef0bed2c9b82bdd2d19d9971100467cb2b9476890311 WHIRLPOOL ade8544202c9f120b147a5ad8a87e67a7932d756dfa5e436d528d4a83bbe61181c0bc3276e3026f7fb5117f9ceddae343bf08cf666e5f19ccce32b5da485ac9e
 EBUILD netbeans-enterprise-9999_p20160704.ebuild 15825 SHA256 46d7aab48f8a7b87117fa6f4fa2200c2861caf900e9a7a6921ebaf26dcca9160 SHA512 3dc8fa6c55c1bf6b44211445ed1825a08c7359ab50738f4251e8ac731430c589563893344473c2f9b28d521b2426a0bb760ec6228400c757f8a85f8a46b53758 WHIRLPOOL 4908e88bd3626eff5a1ad17300d7cfc36bb1e7d260c4025c379f2738dc9f78a3fa37d1001273cefc4ae248dd2be4a74b90a9de54ccbedf38bb2ec9acc6afd903

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160629.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160629.ebuild
deleted file mode 100644
index cdb4530..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160629.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-codec:0
-	dev-java/commons-fileupload:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jsr181:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/bsf:2.3
-	dev-java/cglib:3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-validator:0
-	dev-java/glassfish-persistence:0
-	dev-java/guava:14
-	dev-java/jakarta-oro:2.0
-	dev-java/osgi-core-api:0
-	dev-java/validation-api:1.0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
-	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
-	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
-	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
-	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
-	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
-	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
-	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
-	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
-	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${instdir}" >/dev/null || die
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
-	pushd "${instdir}" >/dev/null || die
-	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
-	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
-	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
-	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
-	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${instdir}" >/dev/null || die
-	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
-	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
-	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
-	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
-	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
-	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
-	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
-	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
-	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
-	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
-	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160630.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160630.ebuild
deleted file mode 100644
index 8b4595d..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160630.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-codec:0
-	dev-java/commons-fileupload:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jsr181:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/bsf:2.3
-	dev-java/cglib:3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-validator:0
-	dev-java/glassfish-persistence:0
-	dev-java/guava:14
-	dev-java/jakarta-oro:2.0
-	dev-java/osgi-core-api:0
-	dev-java/validation-api:1.0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
-	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
-	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
-	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
-	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
-	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
-	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
-	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
-	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
-	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${instdir}" >/dev/null || die
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
-	pushd "${instdir}" >/dev/null || die
-	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
-	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
-	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
-	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
-	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${instdir}" >/dev/null || die
-	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
-	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
-	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
-	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
-	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
-	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
-	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
-	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
-	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
-	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
-	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index db8a0f0..9440467 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
-EBUILD netbeans-ergonomics-9999_p20160629.ebuild 2913 SHA256 13940f982e267ed269408cad3fbc8dc90ebb9159f2edc60633c7742b24da5ce7 SHA512 db512c205ed6539b19ea670783b268630a7fafd4f755c999e3e5e17a8fa0bb336f6d9842183a1cf9d3f046a46e4a649174437c99e78ae0b840d3acd31a8f12f3 WHIRLPOOL 42be192d17e6f9977d68c5b85052cbc4fc6c62c548e007fea8cdafa322e725c83ceaf3172c1335b4e21d1caab1ad2bb55583bd276eb539aa58cc0cefd3deeaa0
-EBUILD netbeans-ergonomics-9999_p20160630.ebuild 2913 SHA256 d1f52c185611e0203dba0b6653d18805a93cd83cecc09bc90a95467f325f3d37 SHA512 f4b30de29908f98adf987f70ce6ae99879ce0c625b65719652a89db32cc38670878041e4089a108fda8ccb1e6c7c99280383d1687aec8d6da120625547f5c2a1 WHIRLPOOL d81aea7642c1c197b7ce214a9784c31d10cca10dabe7111babe3afeb48837b4a91e168bae55b6f50633281a312abda514226e3ba2533707c0d7db1ab259f14c2
 EBUILD netbeans-ergonomics-9999_p20160701.ebuild 2913 SHA256 3a18a7f12e35e887afffb69d4949102032578c10cfd865d1ba4e76368abae25b SHA512 635b3424c39000343302fbf4e07d48f1275b42c6ae24e4ce41be3f1f5f3752df92e5b963e066d8fd087f2330dd4f079bdbaa6caf6a75bdfe9eef6fd9fe1fc7e3 WHIRLPOOL f0d27ec9b86089d603cab707736ffb77948ce8f0094813314f25e82c7fe94936f74385f9d611c4c44d44c8f2436ef06ec661d62a48e9f5f73872da065d5f14ef
 EBUILD netbeans-ergonomics-9999_p20160703.ebuild 2913 SHA256 a8cddebb47cbb92c07787e2506db7b33ad55505993bfa07f2596617c2e634b56 SHA512 5e785b2b13e9f16754bf422a970205677cddc0c561c178be22ac248f0d5df18deb4419162e5fa6b72bb1733b0705079a86253d78f966f191d9b8d7e798a0be60 WHIRLPOOL 9064f8ad43d0b7fa5ec62ace7089b709b39b199b22a3d04357c4a98fe3019142beb4744753ea3c03a246386423ca8dd83b25d99049c9045da9bc21049f11eb3c
 EBUILD netbeans-ergonomics-9999_p20160704.ebuild 2913 SHA256 e5ded9a6fbbeaa0c1a641401c9e8f3420e2e837455178eedd5e5a2ed9416d169 SHA512 e3bd8a5677d7406bd9d059c068d93aeeadd217b62af32817d70517f7931c8e1a2a47abd59099519dc71353cbdf9e029ab731382c2b5643b9f3562de81fea1a4d WHIRLPOOL 7a6fdcaeac3cfea9ebc6952d49513159028d3c939cb8112132e7f25572b75d639921272798608ce109666e186405d33d16c6cf3af51407e6002ded0f50ae2df9

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160629.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160629.ebuild
deleted file mode 100644
index 0c6a0e1..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160629.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ergonomics >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
-}

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160630.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160630.ebuild
deleted file mode 100644
index 2cb4100..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160630.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ergonomics >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
-}

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 7c76c5b..667fb2c 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,8 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -35,8 +33,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
-EBUILD netbeans-extide-9999_p20160629.ebuild 3377 SHA256 3170816d19c52c4655d6659fc0e5c3d1b3213051f8b57af1aeffcbbcfd9d860a SHA512 8dd8d4fda80dc6f215ebe4b2b2cdd25bdb7c4258f1452bf6715375d9f1f17561f914c0d7f9285c288bcf9673ba34c34b51a4e0f0660b9d68198f49fd4ca72696 WHIRLPOOL 26cced4c04ca73c74d87db2a864957845405ddc57ff540584b867c21bac3ab36e74667803218c0bf5962eb998caeba1820e73de54624b5e021c50bc692c8a2f6
-EBUILD netbeans-extide-9999_p20160630.ebuild 3377 SHA256 0d3c6af9a0e8161b3fa0b9b60c262ab5117d719f885486bdc4e2081dadbf63c5 SHA512 930b68b6f394bf920db722250619530be4deab7d175df5093d1f44b98633d4c31772567ef3944210f66fda68723d53e9e256a095a13f643bd468ba88204c3d93 WHIRLPOOL 2abaee375b4b3896b2732b5f7efdcdf97bc2170f21849cc720adf9e66154c2c33bde50553cce66889b951fe03b3ceb9bd00b25717b92ce9c27e40b9ea7f69041
 EBUILD netbeans-extide-9999_p20160701.ebuild 3377 SHA256 ccc4f9c6cb22ffd678ef66f6b60aea2717f8bfa18abf5c51da28c8a72e76236c SHA512 c9ee93605a215518e4f0b68e007cb78f7767913fb4d4b39f2468aef3d0d9cc06578f388f6c9431e105b0f72a1219742838da04c1b80e5b04e015b98f23f63dad WHIRLPOOL 71bdc5a14c664d4344b57e408ee55a0ccd83d06cf70f61a266841f740ee37195a9fb2104a2b574a625fa29c660530919d27209638eb817e94c23ea75c67c0270
 EBUILD netbeans-extide-9999_p20160703.ebuild 3377 SHA256 e5778092a56ee97249f69a2b6626912dd2b3a54791a1814cc79fe5671c34ab88 SHA512 e814e1301fc09e306f8039aeb0617e63485d3f7aecdaf1a4065e400315273bfb30d8e0dfcd72e125ba77c7eed90f3d39b789bf27711d7c7d1e494470495cf972 WHIRLPOOL ba2d34d7c3eb0e66a46e78bb83febab9bd93a050db572b44306ad8cfa78a6f85895efab6361fa18961cec78aaa91fb4b457906e15b4a909460407d4b3ebe1f21
 EBUILD netbeans-extide-9999_p20160704.ebuild 3377 SHA256 b41d519ead2f743826abeb29d9d7a03529bc044641f922ee5f9e8943e7b81aa5 SHA512 be900848494382cb149df6cd636bde246fc2e5165491ae8408569f8f15b5fadfae35e23306367d179b749950c34cf3c49535703ac9cf0b6ff9355d979857f042 WHIRLPOOL ba1ad53e16ae58014f22d68c6acf4d7ac09bdfe2b4e1e78e8175143abee95f19c81798df8eea4a6103589ccd499ac316ada5bf3cc3c50646305dbd609ab9800a

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160629.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160629.ebuild
deleted file mode 100644
index fe851fe..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160629.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/javahelp:0
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/extide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
-}

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160630.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160630.ebuild
deleted file mode 100644
index ff3cb6f..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160630.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/javahelp:0
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/extide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
-}

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 5cdba4c..00aae5d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,8 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -33,8 +31,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
-EBUILD netbeans-groovy-9999_p20160629.ebuild 3416 SHA256 b9a83d04dd6f79e5ad9aa01c9519da1e2087d2365b14a07dc98ff5f13a8a20ff SHA512 c8d2ea2b8fd411aff0dfb534e1742f91ee9fedf133636fb8a128cc066b0924466b910e13ef5d616dffd045e383a30cfe4fd7ceb73d5997d665660d99ce25bd7b WHIRLPOOL 7c9bae88294805c2bb98fe6de1675a533a009c4bd1537fc986c2ff63c4b606e1a2386f55ddb3ec5298b84edecdc0e69c809582b752ceab1df4b06d3d58f2c8d6
-EBUILD netbeans-groovy-9999_p20160630.ebuild 3416 SHA256 9ef9707035ebefaca0a3ec2c8aa6bdb934e77456ef96a97eaaaebe82ecaeb172 SHA512 a3920b6427d5cc808034ccaea68ec67c599d6369c99276c0341be7640b71761041cbdd4f3a62a3317ef4da638a32b8bac1238cc197e53f6401797b7a3a8e15a3 WHIRLPOOL 03b8c56d92f037ca96a7e90849533638d03172149745f0d0a680e43ecdc6f172102622561b2662377f355a5a16348c025b87ab5a8a1b444dbf4d39cc5a768b56
 EBUILD netbeans-groovy-9999_p20160701.ebuild 3416 SHA256 ea0bbd8112d5bf8d41e44b5bc43a1d9444ed551a37cc0618000e502a0c0aea9d SHA512 ec83732bdfdd2d2974f492048f746d2ebcf359a601d3c2714d744901395fcc2c11704698bea7beeda7062c063eefec1cae2f13ef307d168dd34c15b0e2831e7d WHIRLPOOL af3d6b95378cca5c6b8d0ecdfbe3ae74e1a9fc57e9ec7543f7f621628df15aa24b67b6a667e573ffbb2951423a01fb36adc3dd8802672b1ce417d1c05c1bcef0
 EBUILD netbeans-groovy-9999_p20160703.ebuild 3416 SHA256 9a87e96c45b2e84bded618fb60efb9f3f03533d816b018a8465671f64e68bc91 SHA512 032d10f214d938e42e4c7b724d69104c18ef4936d0e2c1ca87db56a6b0521e4142a4fc977ac9f92825e80741255a672ce54b53b23559297f2698e0f03fa0bff7 WHIRLPOOL cb9567751982b71596658d356eafc1f83b37a618aa4341809699b7399430169ed0980ea641be8e370a459b468b2a23000449850fba6626065526dc4b9712a7da
 EBUILD netbeans-groovy-9999_p20160704.ebuild 3416 SHA256 7a6dce76ab4e8b02e7a52d48938e58d2d3f2c403df2d198087739c7905b78250 SHA512 9d25bfe4a37d0d9a7b1370121f7848ee20114a03197f47a24a68da7654d695042da18b5847df567ac2a17136358589b4dadec8afa54b1a499bf25cab1feb2c48 WHIRLPOOL 1b3f764d3a0ce32fa7442b1efca3356b2060085fdecee160c68baa61d5bcab6ad95c6e1d4abc57887ee75a61c888dabd1db43de79bc8304efe83f7c43088b8c8

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160629.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160629.ebuild
deleted file mode 100644
index 3180424..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160629.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Groovy Cluster"
-HOMEPAGE="http://netbeans.org/projects/groovy"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/groovy >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
-}

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160630.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160630.ebuild
deleted file mode 100644
index a9d920c..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160630.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Groovy Cluster"
-HOMEPAGE="http://netbeans.org/projects/groovy"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/groovy >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
-}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index a85cfba..f7d7889 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,8 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -36,8 +34,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
-EBUILD netbeans-harness-9999_p20160629.ebuild 4126 SHA256 34ca6fef3595b72a03737a92c6b15f8875c2820b32cca229f19ef8e3d1be88d7 SHA512 4e49f975d8db981e1e55eb67e92bc5145e972cabcfb8dff452ffb1459ee26f0befe64b739a0b5938a25cd84aa36d687dd235d85623cba4e94b333e08f48fdeec WHIRLPOOL 743e3b95b6221223ffb18df4b93d29935b7e1bae4855cd0c7f3e0440f6bae666814c94554559985c92454d467c4c219044b1bee8a26705edb120efecc6739550
-EBUILD netbeans-harness-9999_p20160630.ebuild 4126 SHA256 1e20afd829afbee3b5383b89eb72c5f8d2cb5434b8ae07d69a35e2ef62766fb2 SHA512 680bfad181ae0dd712d628b778e4b5a1127ec47ff5b420dffd89719a43251dd0bbee2759f1f2026d04b75bff36a268a81d61b1215ace2a10b6acc50dd6a7a75e WHIRLPOOL 36b1bc8e8f1d97a2dc9888bb607979882a1e2dae6b08c585fa85beba0447ee2eda06e2384f3b01c0e81d8499c385c56e43f09e52fbb8fb882d5be8be5661a343
 EBUILD netbeans-harness-9999_p20160701.ebuild 4126 SHA256 556fb4c378f146091a5449097c6898309dc7e95890009f162e69e058cda113a0 SHA512 99d11f7e1e61d132dcc4693cb65b4921dc907cf8a0b9489beb11510f879e3d102c79608f37ffffce185c198c2dfb99318f37f4e0ee10f0af305e478feba69ee9 WHIRLPOOL a8c8c124e58b393e864c2ed054891333d6141b170e3b40abd87cdfe7ef42763b47bd7f748ac9b98d1a2646697eb3f401433d2f5d96ce96144addd30c4a7e51fa
 EBUILD netbeans-harness-9999_p20160703.ebuild 4126 SHA256 c8400f90fccb787acd82b32c2cc5652a8a09bef4de6fe3cdd5f5ec5be81f748c SHA512 742a0349c4807583eba67794fd6e31ea03f9d9b95e85c8b4ce9c22429e00ec3ef8c47af2e886508ae76d539d5eb16c1f90208c9a27c36c65b594d81bcbcd9d5c WHIRLPOOL 1ca2e87c03f82dca264f233c0dc2627260e96f48dc4ab31672232f98381a503c4c5f73aab01ad650a8116f565e05764866e5e98664a8d013fc30b18588dad098
 EBUILD netbeans-harness-9999_p20160704.ebuild 4126 SHA256 ba5fc6010a900721db190dbff3693a5e7272ea3da6d13a9cb069e6d02aff0d29 SHA512 99f72ddb2fac98eeb40dcffe478cbb84dd022e20e399ee728fb7e46d3e5132341cc5e6b2eedbe1afd77086397e7661814ee22e112642d6dd9aa3d62b9a664277 WHIRLPOOL 14980a150ccb49cd482d99e1ff369a40ea80a16ec626b662fdb3c5ac62a96a13c73142fadd52b0c1e2a1cc4b3e5b6df1e2097b8d89e5258180cb1d841564fc82

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160629.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160629.ebuild
deleted file mode 100644
index a6127f0..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160629.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	>=dev-java/junit-4.4:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/harness >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 launchers/app.sh
-	find "${D}" -name "*.exe" -type f -delete
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/antlib
-	pushd "${instdir}" >/dev/null || die
-	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
-}

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160630.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160630.ebuild
deleted file mode 100644
index 14054d0..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160630.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	>=dev-java/junit-4.4:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/harness >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 launchers/app.sh
-	find "${D}" -name "*.exe" -type f -delete
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/antlib
-	pushd "${instdir}" >/dev/null || die
-	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
-}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index fc31402..9e915a6 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,8 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -170,8 +168,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
-EBUILD netbeans-ide-9999_p20160629.ebuild 29867 SHA256 760997dd43b5afbea24aeb5132459f93f607110bb15155b010c2626dd65568f8 SHA512 474343f31eca8eab0b6bd9bf029519e1e904909ff45925cc867f9e96e6a39bce2abc82a1af63729cfa2ccb0340dc8ea85994500629629e11a194acc2b6718604 WHIRLPOOL 9c0fc771f3cc4ccec359307d9e5c9a20d5666b82e05b3deb8c85e511b099601f840fe0280dcb583959d95e1514469bde45442591a09e336855ecc03020dc7a3e
-EBUILD netbeans-ide-9999_p20160630.ebuild 29867 SHA256 4430d70cb7fa21c71b8ca406cf82ffab4608487e74ab3d45e09ddaec795a15a2 SHA512 f23eef33aaf47f0e71722965280dc742dea2502d9a91f224a16541c70851a5352603bda4657257f9e7071bc6940c34c6d37bf3e53c12e16db5cd2bb54e2aa13b WHIRLPOOL 24189670d441eb2a8aefb0c35a1af63ae030873eb373fa12183e5c2b127bf7d3cd933df19d14b8d65fb8dd58bf08a51ca133b01202f9b48a2a07da4e61fffdb7
 EBUILD netbeans-ide-9999_p20160701.ebuild 29867 SHA256 dd31ada77eb33d9ec31d6b157bc0e47b73a2c3821d4aa8797bfff8cdff853d0c SHA512 4183db5276dd53946121d309fdf0696e011bf52939161819117aea6afd2b25a735559920205636ad1c5754da4c10f0e874ba2f29942ea84d82e706b7b752ca02 WHIRLPOOL 3884a49c0303bc1e77a50d772c22018601d17b51db51b28c361ce71e431e8e343e1157696b1cc31b7d5aee2b45d2362a9189c9df7e71ddf749048c77d7e532ce
 EBUILD netbeans-ide-9999_p20160703.ebuild 29867 SHA256 265ef7ad1ee6240dc6c2e5fcc4dea1155d39df0dc9391c5b573d01da21814b48 SHA512 405e47c936863bbec00114957ea083ad07a2b9abebe75f6593fb03f3dda8e20319659f44088d8eef0acba1ec1f9e2bc89b6c616a58ec25e90230b120f87ebac7 WHIRLPOOL 13076fd6cfbd2be66bd1c383c62dd31e6a479811d518f15c463f2d805f829e76263ac31bca29086de1b2374aa2d8b280a4c35223f8658b234cb606e834d7a3f9
 EBUILD netbeans-ide-9999_p20160704.ebuild 29867 SHA256 cc9a9f0fd9cb88725e3fbe3c05081742a46e041f2d5ef4158594ab80db062317 SHA512 6724660509905200323ae61e340825c17772a4e94952fe0442e5352adf1595bb54c239562131af4a40b3afa06ceef5c2b43f3e4ebe02161d7e7449a69ea994e3 WHIRLPOOL 44ecc0bd24800e7641044f8d14c87b5e46081371957ecc1fec095706a2f7749eb26223fe65dcd4bcfffff387696594a21330ab75479c0e938386c841e7adc1d0

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160629.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160629.ebuild
deleted file mode 100644
index af2c41c..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160629.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
-	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
-	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
-	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/antlr:4
-	dev-java/commons-compress:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/icu4j:55
-	dev-java/iso-relax:0
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	>=dev-java/jsch-0.1.46:0
-	>=dev-java/json-simple-1.1:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.5
-	dev-java/rhino:1.6
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/ws-commons-util:0
-	dev-java/xerces:2"
-#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
-#	app-text/jing:0 our version is probably too old
-#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/freemarker:2.3
-#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/ini4j:0 our version is too old
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/commons-codec:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
-	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
-	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
-	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
-	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
-	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
-	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
-	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
-	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
-	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
-	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
-	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
-	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
-	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
-	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
-	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
-	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
-	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
-	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
-	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160630.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160630.ebuild
deleted file mode 100644
index eae000e..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160630.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
-	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
-	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
-	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/antlr:4
-	dev-java/commons-compress:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/icu4j:55
-	dev-java/iso-relax:0
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	>=dev-java/jsch-0.1.46:0
-	>=dev-java/json-simple-1.1:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.5
-	dev-java/rhino:1.6
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/ws-commons-util:0
-	dev-java/xerces:2"
-#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
-#	app-text/jing:0 our version is probably too old
-#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/freemarker:2.3
-#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/ini4j:0 our version is too old
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/commons-codec:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
-	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
-	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
-	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
-	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
-	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
-	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
-	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
-	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
-	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
-	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
-	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
-	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
-	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
-	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
-	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
-	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
-	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
-	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
-	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 8df34fe..6860e6c 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -3,7 +3,6 @@ DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2
 DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA256 7bfaa3a602bf388094c8fcfba989f0b121c0e71c6df4c3328244615a5cb24d59 SHA512 7669d2e11346b62420ab9db2e9a5a24bcea356099ae4d6f0a57c75ba168de9d24160277b8f044ca9a5f637c2591778150288a963787b6983d093ad64fac83550 WHIRLPOOL ba0f5a67dbc3a64ca0b21cb1f1a74b4e9b2d2c4d7a5f127de9940f375b70d0bc321f5ce6aa607bbe27d39dbdfd1d179b1457b5fcef65c0a0d4420e1194657192
 DIST 3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar 11763 SHA256 41706fa977afa65b9f6001b4ad1a8737502e6f2af8ebfc21ffb60042c4c913b1 SHA512 c834126f83008d75320eb33c5a752787d6ed7e96b4223aed329aabb08aad93d13d64a8be03d28f989d5f558e9233ae221e4eb9fec326df01b6be101ebab38b35 WHIRLPOOL 2b53e5857f8b3f9f3ba2acb04f623ff95aff1cb51b1edf389cbd4fe38d4f464d5f212e613f08103399e701158b36b1c9057f93fdd51b76517806f401ed4e0839
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
-DIST 47E8B11BBA8D4796ADC351499A07197ADF03383B-nb-javac-impl.jar 3043315 SHA256 5804376cfa37c0492304723f94fa97b35447cbf609441ec8e1f674bd8ff1e569 SHA512 959fc597d3e1992accf5603d30d9ba28a4246938acf73d8113e9e44a3aa692f7f2ff6c64c5e3f52db0a66e147c85dc29b9977f5ec671c4fea6559c9075315c44 WHIRLPOOL 7234e394005b5ab39b6beedb706de355416abfecb2f34aadc0207cfeda221a21144e89fd5a10cc13bbdec3043ae5f8d9c3e12aa1ae1bfbecb1d87b3cc5bf454b
 DIST 4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar 2259008 SHA256 058d3ee2b7f6916502524ace23d6695a06abce7a00378ca457c63e65f45de759 SHA512 058d88fad0522a9fdae80552eecfa743cd771c7325b630762d13c1456f5f51024c6e88111d3e92ed97c69cc1013cc3d2e81332b94063113fc025951f871bf881 WHIRLPOOL d1f61fa4fe98efa7c81e5849f83636e9a798816db8f43156098781ebb95012e0f9707b562a2620eb006c72ce8e911357f3bdbafc68a9d3a2e032f7a978e8f13f
 DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
 DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 SHA256 227c4888011550cad0aed4c07e187b9f8e873c01558a08f014d288987415a9a9 SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba WHIRLPOOL 20dff7b96369cda98dace4dc38f7e013de9ccf7119047183f936bd58e1d8c6154fa913f906dd1996d8e989d16a4e92502aacf937f730a8b63728208b96455a7f
@@ -38,8 +37,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -66,8 +63,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
-EBUILD netbeans-java-9999_p20160629.ebuild 15656 SHA256 94b39fc264595d8874ad8ac4e32be9ef9ed3772dd39cee46913a061c2c7e4c06 SHA512 09d3f1a6a959a2a39a4fdedfb3a5a0e37bb4f065b1654d0f7a6247c88463b51dcca65ca8e24b7c99dbe8a6c756520068d895331a3c2066321847c669f39fae1b WHIRLPOOL 75f086471489a3503f1f000966bb0017d11ed5c26b68e525c4d58566d7162456d4d6f0f2a10127fc3b623ee0853a619ead15f50c3d39368c9d89bbeace295c6c
-EBUILD netbeans-java-9999_p20160630.ebuild 15656 SHA256 e8c32ea6da188a35c907c524a58461fc42937cfb3fe2bbe73c39c13da831c2ae SHA512 4e391402d049f4920413f6dfd2cea54eeca5fca7678f0c1c835e640a7b51dc72d5b1baef15f9394797e07f679d24d2dcc734ba61c7250295171b55222b817685 WHIRLPOOL 19330ffec1177c233bfbc4c264d8b5d896b5f993afe3696f5c9a645d66e554056a54261af923e1fdee36b8426bdaadb93c756efef4701de3f507fe93fcc6fd7d
 EBUILD netbeans-java-9999_p20160701.ebuild 15656 SHA256 be7e4a2b002f9a878926a201eac8916ebb017b922149f8aba594c7b4c2cf1e14 SHA512 12d10a6db2cb9d188adc32876c2c3097eba5a8bc68eeaf0227bcbfa4e0d94efa81772b1371a95f59cdd042e1cb44a8f7a09d457a24841c88cd96b4ab031a7f06 WHIRLPOOL 598ba41ef173aa4a2edd32725f96b0d46676566bdd25d6f7cb60ce70343056e76d242e04de77c4f3e463d081d84d32e44cc47cb13f1c33461b50f1c5e1d4edf1
 EBUILD netbeans-java-9999_p20160703.ebuild 15656 SHA256 3fcc256725c5a332ccf91636fd739d1c0204ebe0f190398b0883ebee90c84382 SHA512 939cf64a8876801042af05a6e893d912b00db49d02ea3ca00ae14d3fc6a9f072eab0414f71ce1a0c63cf6499f19b89b3d9d34eadc4f95c20658c5c74a5bdaac6 WHIRLPOOL 05fd8e9b26a5eed4bfc53210599971c6283ecddcb486483c02e470e423785f0a5c30477c991152cbaa31cd082e5086f3994bded84a3c126deab63eba139e993e
 EBUILD netbeans-java-9999_p20160704.ebuild 15656 SHA256 85d002b3150e9944ebf7a268b0d31c5cb1bb5302d5513a08c5ca81a29c84815a SHA512 baf8c2924e9630e6d5ee2612310221318c915bd73ed26583dd35e527ed133bc913f7ecc7adab990284f39779ff905dfba40a5160b4603bfec3a198281449b333 WHIRLPOOL d97ae3b11a6539883aa6e1765885abf2dc6ff6309542881cd7300496655b0c24619499b37c7b5da109fde8916e229d7b8fe802039297686fd3044951d41a3ae3

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160629.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160629.ebuild
deleted file mode 100644
index 908f979..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160629.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/47E8B11BBA8D4796ADC351499A07197ADF03383B-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/c3p0:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	>=dev-java/jtidy-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
-	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
-	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
-	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
-	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
-	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/maven/lib
-	pushd "${instdir}" >/dev/null || die
-	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
-	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
-	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
-	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
-	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
-	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
-	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
-	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
-	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${instdir}" >/dev/null || die
-	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
-	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
-	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
-	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
-	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
-	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
-	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
-	pushd "${instdir}" >/dev/null || die
-	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160630.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160630.ebuild
deleted file mode 100644
index 88ec83b..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160630.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/D803BEB75E912EB3C2F2E042B808AC0263C066DC-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/c3p0:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	>=dev-java/jtidy-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
-	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
-	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/D803BEB75E912EB3C2F2E042B808AC0263C066DC-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
-	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
-	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
-	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/maven/lib
-	pushd "${instdir}" >/dev/null || die
-	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
-	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
-	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
-	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
-	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
-	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
-	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
-	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
-	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${instdir}" >/dev/null || die
-	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
-	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
-	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
-	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
-	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
-	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
-	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
-	pushd "${instdir}" >/dev/null || die
-	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index b61fba9..bdd6db1 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
-EBUILD netbeans-javacard-9999_p20160629.ebuild 4971 SHA256 4dd26a24283478bb99d31c49c03a548d6817a005fbfbec6069c13febebdb7aad SHA512 0eabb5dfd298cf60c7d766c85146d592efd2df0f948d6de28ae70fc9fda41cdf6a8568bf2838aca4f4b58a210fcaca3df7b320f56e4fc60987490c5599bd9662 WHIRLPOOL ce7a60d2461b148ce333f10835fa447dddf2cfe9ec83ef7f4e91d66854499bea1541c6fbd7899a7150a9f1c3fc1199b3856407f4273a037e32ff2555138326e0
-EBUILD netbeans-javacard-9999_p20160630.ebuild 4971 SHA256 c91aa9f5cf3d3be652368a7b839a544141e58e69f2b08b4620c1e702187660cf SHA512 2224a4a2d6c13d954aaf50afa9d04adf90fb108bc91213963dce7919c17146a9178a431669a34b0423890238c1bddb5d11b880b30f5624ab2be9cbec52ba2168 WHIRLPOOL 38ff77cb87c27a75af1e665a4ad977b124bc49656a7ff140b7b734f070fe0fe947577ea4915601fc2d096c52a33a13cdbc6319ab80438d9b384dfb0fb2e1cb29
 EBUILD netbeans-javacard-9999_p20160701.ebuild 4971 SHA256 ca20c7b1f0f49e4d72f14aeb8c0656eba4e601fdb19f33da9067b7e62acbdbd0 SHA512 c86db0f8f1915a20fdcf9e697e7af5c62a7a4740e25cb31a82aa7159814faaa90d8f1c7aab8392f3dcd9110d8942d8ce866bae0c8764b6aa4b7c43c64134010f WHIRLPOOL e6d299bbfe786f30fd8a640be8bbf5f3ff3ffa3b3a290fe334982c820ac464915e69909b43eb4c6b49f585cd04bc50f3c9e4dc4b1389d93eb8192ce24a04c15f
 EBUILD netbeans-javacard-9999_p20160703.ebuild 4971 SHA256 f382fb5dba85a7e23a10bf5dc162731d08e94a9497940f7c51fe7334748866b3 SHA512 2a458415a39adddee753bed5fface315b91464ba63af0fda5480cb78f02a54e4ff516ba45ffe8707ebaa2eadaef4657e2b1307090ef1a70c34ca1510cc8578d6 WHIRLPOOL e7f9d81d57bcbb8c4602baba11a185c941cb29408b77f9d65980702aadcd63d5aa81cd67b234fd10f2e4b6cd5051afe6ae548df60671b0a2302457cc1f5b7b4e
 EBUILD netbeans-javacard-9999_p20160704.ebuild 4971 SHA256 a16c5985a556ef75e6cfd42f0da8d55e71a14e405948749798d19b5022dc0c7b SHA512 dcb91d9399cdd3b282cb2c2a0d4ce712f216ab4012261e61fb71b212fbacb6af7025f75efa115283952c49c5da56f132ea0ded604fe99469019d747ccfca0846 WHIRLPOOL ac4eab54534988d1fd33edf3bfc7c7c7dd80cf488b9e7b02c48687ecc663c67023b27a2a2b77c9f7fdc4b92125b34b1ba5a191756107a5de779d037e6a5226a3

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160629.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160629.ebuild
deleted file mode 100644
index 04b118b..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160629.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/ant-contrib:0
-	dev-java/asm:3
-	dev-java/bcel:0
-	dev-java/commons-cli:1
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
-	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
-	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javacard >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
-	pushd "${instdir}" >/dev/null || die
-	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
-	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
-	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
-	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
-	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
-}

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160630.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160630.ebuild
deleted file mode 100644
index a8d0376..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160630.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/ant-contrib:0
-	dev-java/asm:3
-	dev-java/bcel:0
-	dev-java/commons-cli:1
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
-	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
-	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javacard >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
-	pushd "${instdir}" >/dev/null || die
-	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
-	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
-	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
-	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
-	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
-}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 0d1a951..a481d04 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,8 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -33,8 +31,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
-EBUILD netbeans-javadoc-9999_p20160629.ebuild 6293 SHA256 9e8876f9264bc95d99ac059b4eb580c81ea6ecf52b238c3b607ffc6ea6bd2a2e SHA512 6bb65358523a64d814d451e4953faaea5fba5a9abe24582d03732e2a3122ae18f315076414420a38425252976a9ed5a39e69b1efaa72a2a21a3017cf17d7b9dc WHIRLPOOL 097a0f24eb060a2d85d47042705e4dc28c88a0797405745334a72a09683731a417829e3e62de170b4afc8fa9df6fbe0541078c8dc6b582a914f0ae2e84fe37c5
-EBUILD netbeans-javadoc-9999_p20160630.ebuild 6293 SHA256 c4d9d977a855f64423f0ad73f72b2a3a43fe3b06a5cd6bf165bc3a727af55316 SHA512 600a7ca4c423837031fcbf7cd3bc5437d0b5e286e52f5f70a457e281432b3dcfa9719053752850103818746ee1a615ab25e9021cdfe58bd9c8364c64efca8f74 WHIRLPOOL 83b6d4ebe0918323150a3d609894c3cba34c58ddafd8f04481bdeaadedb654765520583870af7c989dc07f19430980bf42d9f6be36d72ad5c21d2ff5413edd7e
 EBUILD netbeans-javadoc-9999_p20160701.ebuild 6293 SHA256 e8545a0e790c537c163bc273e7dd33f76acfa7ff9bb9738ebd7c430b12b2b0fe SHA512 9de182fb4b3f72b2a7444f199c002769601be156792836b5096eb289cafa2c1ad3fd27538f35e97e5b4685bed872209d5eb1242ea84b26b7c307a09725a6a484 WHIRLPOOL 1b82a54dd811f83d89ca4bb80a773ab173f70b636354c2bc7682185a6f0e3aebcb95b86412f64bc7261c4c2a9a729bcaba81ec28577a2e161abcd025fb6e4788
 EBUILD netbeans-javadoc-9999_p20160703.ebuild 6293 SHA256 3e194cbce3e198089acd9fd63e737a36c74491d1f1d6b8ad81488c10f4aaf321 SHA512 6ec6169eb87ff1806f5cc244fd38c3b3d64be2e81937a2e3ce7a3d5d8dffb41c10f5a9a0ef9f2d9dbf2fc3b7892211e13def453be4a3ad54fa83307aaa45f1f2 WHIRLPOOL 10cc937c6d4d909346cf2da1e01cff86d5e4b31d14a3eaf4a01e253880c62b944559c31ad5478e82648196eb561aa752cc2edf57c3302cd3a6e874abe4bb7fee
 EBUILD netbeans-javadoc-9999_p20160704.ebuild 6293 SHA256 facd790a162faf661027444b75b5668b36b153cf73a42e9925f700dce9395c03 SHA512 f30c8ef1ee8ce2ff7fb3c13c2cd60d3b18ff81fadc2ea51e08237ff92088b24ac155515535a609473beae40dc6f09c3b8f968176e00147e5a66e27f8e57be717 WHIRLPOOL de51200b96ba0d00d419f764cb50f58112c3e6a25ef03d48abb17ce41575cbad02429c9364c83181bc304c75daa518ef5517d671217fbea0ef7aa841c4cdf7e8

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160629.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160629.ebuild
deleted file mode 100644
index 8c736e2..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160629.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
-	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.cnd.built
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
-	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ergonomics.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
-	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.groovy.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
-	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.javacard.built
-
-	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
-	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.mobility.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-php-${SLOT} php || die
-	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.php.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
-}
-
-src_install() {
-	rm nbbuild/build/javadoc/*.zip
-	java-pkg_dojavadoc nbbuild/build/javadoc
-}

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160630.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160630.ebuild
deleted file mode 100644
index abaa46c..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160630.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
-	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.cnd.built
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
-	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ergonomics.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
-	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.groovy.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
-	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.javacard.built
-
-	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
-	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.mobility.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-php-${SLOT} php || die
-	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.php.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
-}
-
-src_install() {
-	rm nbbuild/build/javadoc/*.zip
-	java-pkg_dojavadoc nbbuild/build/javadoc
-}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 4a23d55..12d2167 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,8 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -39,8 +37,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
-EBUILD netbeans-javafx-9999_p20160629.ebuild 4717 SHA256 bc5e4d8cdeefc3dfae713e53e12787e0d6066dfdc7dfefefc5897b90580f6781 SHA512 7c71831c87f2fb55704f5c6286420ed55a1dcc61b8a1db7d38f5ce07a329a5edb45fe17813bbce063dcd446ed6c63f2afa50f8fe8b5d0681e9e21fe36749972a WHIRLPOOL 5195604559ea7dc003739f155053bc7afd5205c5b26ab06a06ce2fce4e60887497290c97fb6f5b4d5b3a4baf9b188d2b1fb9a8ace25005a1a1e29880d234861b
-EBUILD netbeans-javafx-9999_p20160630.ebuild 4717 SHA256 6edabee784826f7c2d071397b7247faa325fddbac560f9601f79b87067263466 SHA512 63ddc4a2f48745b7be67f6ba0575792833e596fdbfa39fc8f49a301bb8ce4866346bf72d1f7f1bc1d79df43da58217ca7bdf00dfd09294ffa74b578998ebdb7d WHIRLPOOL 5e432f9205528ffebbbc105997b2f15df264491b9e4a3b31794166b21a921822b063541eab502eac05844f15b38bcfbd3dee7d38cccb2eafd705a0cde6eb4863
 EBUILD netbeans-javafx-9999_p20160701.ebuild 4717 SHA256 073a4aa3261480f4ccaf57e6f5379a86c3ad20f8b282b1263b6ccece556773c1 SHA512 aca1cab07c16d19d5cf127d6aaf32594d35550510347020c89d988e344d6836fb4b68496cf7dd19b441c666d328aa8ed0895bbca98d3f5b9265e13478ed5695a WHIRLPOOL 6380e563ffcb7e47bdcdcd00c4386b9b6d3eeca8e0be9f4c555ba199fff29b4dce242c49570e984a262ae256d50cc42a06c55ce8d9a7d2b1fa5d04daa6f3e15e
 EBUILD netbeans-javafx-9999_p20160703.ebuild 4717 SHA256 4bb1e976a5430af00fee9eadbee17860ea212e8440706762d95e9a05f925f529 SHA512 2ceedc57b817476c1742eb2a544ed51c0d5fb9d88790f5afe03f9fd619bc869a2b99654213100b230467ff75a0767bfd82a198c7a02d868db7a03a341e446e45 WHIRLPOOL 4ad1a6d03c3134552671c3b0e584f8dffba27f148460bab2add640bfb245f585605451fa4c7905768840fc16a590c1b8a27f7049004f2dc164d67e669573c1e3
 EBUILD netbeans-javafx-9999_p20160704.ebuild 4717 SHA256 ba15b86def3276e7cc7393aabb6b30bcf459e8606e062c64dc0a957b52b9ecfd SHA512 44a826bca25d4ed92b8c7257fd07583dd7784c9a1a80a99d1056b2d952c56d53e27427e84613b8bef659d3116ac20b7f3690789aec0ffaa4990e8e9ee3ed179a WHIRLPOOL 50e2d803a4d4ec68590b8f1990ea1912e4ebca811c5c55fc0a61d220d1190d6d19f067fb9b81a1e4aa65094443d49569603f86582c263926bd438902f5b90818

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160629.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160629.ebuild
deleted file mode 100644
index 5bcc397..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160629.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javafx >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
-}

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160630.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160630.ebuild
deleted file mode 100644
index cd1f8af..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160630.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javafx >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
-}

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 69780dd..7abc682 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
-EBUILD netbeans-mobility-9999_p20160629.ebuild 4412 SHA256 648e2262c5bbb91513d395f2f86f056e10f4a77f60970131987da3e13f454233 SHA512 2c74f3b4e3ff7079fb47e62d57f4107b082752a3c17456f62b86022763e875fa3597a78b3816fbe244af0a44fd7df74cff8630c52b42f1f1a2c7c15cb53d1c8c WHIRLPOOL c596a045e493fedcb96ec368890a7d14f28f24d564ba82321fa34ea0cbf730abe6361bf43675dddfa94b1c022adfc31e5b82347faf7c843e3205cbbfca0144a0
-EBUILD netbeans-mobility-9999_p20160630.ebuild 4412 SHA256 e32b041292bf8e4bc05873c668f64aca27078eb053592d1da441202e9703113b SHA512 7a278d841edf7d34b004f2ecd335ace3bc7a9ff3df4a2510b35db0a92c908672d17a8c12cb2b8a81962275453d89f4022ea75e9a1fe9f63dc6bdf6ed2167b71d WHIRLPOOL 10daf018f5277004fca61c9dc68eb029332f2f6967461e2ea636d0b046993cd2e2426c303675b0c16a5aaae7d7c764a0bce3f9fbee5fc5c20d6aeb1f428451b6
 EBUILD netbeans-mobility-9999_p20160701.ebuild 4412 SHA256 0e7dc45b843f10c2b39d47ff65d37093bf1615a5a5182d61f7f0e4c00428988b SHA512 54b00648496dde999076b408cb327679c175ab755d8e009b2ae58de6909472dcd5b21384e3badbaf757f78aca904728ec7e8725df38e3db704a7a087e27f8c43 WHIRLPOOL ce27785a1b6d36f3702222401d632c46649b0520694798ec76233760080b765c31771db17a0bc4ecac544975fb71d524ed06d1b1b37df843dfc17ad854afca96
 EBUILD netbeans-mobility-9999_p20160703.ebuild 4412 SHA256 cd7979651af160dbd8814d4484dd0119c6633ceca956b8ee3bc245b1ac9ea29f SHA512 9083589ecb98032772051ccd29606810fe1888bc084c11ee833f43a4c2729b5135d08465f80aea7b911681fe134550ceae7feff305c7de140603a10cfc9323b0 WHIRLPOOL 0c6dbe0d65570bf85717687e215412de5a17269661284d52791c56b921f517aa3b00fb26ca4a5960dca6fc059ab95d676ba4c810d0d1f112439905191ee28a0d
 EBUILD netbeans-mobility-9999_p20160704.ebuild 4412 SHA256 8166ed2971b3111b7851c73425907f7c54a00fd1385ca2faea0907141b640c46 SHA512 fb9bb5e8e9e63dd969f7d0b96ae0290e29cbe92cd90372865917acc13297c935e06e97998092a0cc65a7590881ec776eb75b4605bffa796bcaeec9ef8b43ded9 WHIRLPOOL 7c2a27497595d2ed82a6cca087306b7d2080c297839d90e210598cb9ec2b7daa407bc8b2c144605a654b095a89611cc57b90767f12f02917d94481ffd986e13b

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160629.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160629.ebuild
deleted file mode 100644
index 6764e94..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160629.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
-		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
-		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
-		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
-		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/mobility >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
-}

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160630.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160630.ebuild
deleted file mode 100644
index 1faa46a..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160630.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
-		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
-		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
-		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
-		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/mobility >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
-}

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fa48c81..a278ea3 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
-EBUILD netbeans-nb-9999_p20160629.ebuild 4111 SHA256 44b08b44dc2978d1df916fb039640a8fae17d81a4486108df922b250d97d7af3 SHA512 8d31ff0d73f1c107a595daa66486a4622a654d4bf5def914ce096c9348f43ffa0e07ba796b8daec2ac46114175a9bcc212954819f8e1fd524695fff8f0f0bbd2 WHIRLPOOL 41be443ca44390dfe17b270b7ff6a0d84c3a9aca0d98c124a41d4ecc8062984ddebb39f793a92f9ee9d67914a1f81388d9baecd83e38e6e04f6927a384adecd5
-EBUILD netbeans-nb-9999_p20160630.ebuild 4111 SHA256 25848c805cee3d0cdf442978db8376fcb147ebbe4dd7b3806d709c64093c15c1 SHA512 d72896f92f985d35f0f21c72ad710b381243ecf5ffaba7a3d47f0e93b27656368cb6a51b5576a1e8545a0553a82fb9e6f89fbe98defaae7a5c6eacf26e81fdfa WHIRLPOOL 7e0e162afc6d40c89fa96dc2edd6785d1e4d2b96b1b71e16420e890f636f33d54dcabc7e82e387b3beceb1cc9e87305960e8cac4e332a72ec24637912f10af02
 EBUILD netbeans-nb-9999_p20160701.ebuild 4111 SHA256 362d6a095e1c257ba1666b31df4bfb23fdc8d4f8088f7908ec113ded940940cf SHA512 98937edd208e7a88a4a80ccbf2f7b856c6a7fd53ff1c58280aaf52864bd0c321696a054b92613e94aefe664eaa58e562936546bf8bd484a80d4a7da3643d31ad WHIRLPOOL 1038f5c84e1a0fd07bae5b17b447cfdfec91bc210bc925ddf14b0fa2378e3a64b29c43d3c5703f3e7a9a341aaa513778c767a4ced152196737b3dcdd80fa3cae
 EBUILD netbeans-nb-9999_p20160703.ebuild 4111 SHA256 297453e28beff4fdbc4846cca69092b1f81c57184ce1fa0326aa2cc1f290c9e1 SHA512 2140c0a32f09a44477bbe141b3e45da3178709d8e15214c1b4bf2f146251304f03229168f43975e39278343be8a16e756a56dff318ac2563dc6401d81a95edd3 WHIRLPOOL 90d6c9dbf5b7770d84f19d71e1794d8ba716993e71a6447e2db483f1048b73209e257c525c81f1695128035fbe8529bddb21ddce6ca0dbd586a219704c68df2a
 EBUILD netbeans-nb-9999_p20160704.ebuild 4111 SHA256 e2a1051b907b8d24a2db073f53741bafe90be2456f76d6b98c6db81219606486 SHA512 f87e748974287662c73ea951b9e100a806af65877c6b5271b04f2b3afa328ddc2f42768a18f9a74701a5c9e9c42cc52dc87cee623fbfdcebaae6df9053c71d0e WHIRLPOOL 1fe3f3425bd650b2b22d946f887a0cb77255e84a8897fa37a4d388247ea2ed4602cc1ad88f8e68a2a3fea97870ec809ed34a1275da38b2a9c0fd11cbfd57f208

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160629.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160629.ebuild
deleted file mode 100644
index 2b1863b..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160629.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}/nb
-
-	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r nb
-	dodoc *.txt
-	dohtml *.html *.css
-
-	insinto ${INSTALL_DIR}/bin
-	doins bin/netbeans
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/netbeans-${SLOT}
-	doins etc/*
-	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
-
-	# fix paths per bug# 163483
-	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
-	dodir /usr/share/icons/hicolor/128x128/apps
-	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
-	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
-
-	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
-}

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160630.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160630.ebuild
deleted file mode 100644
index a5ba898..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160630.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}/nb
-
-	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r nb
-	dodoc *.txt
-	dohtml *.html *.css
-
-	insinto ${INSTALL_DIR}/bin
-	doins bin/netbeans
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/netbeans-${SLOT}
-	doins etc/*
-	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
-
-	# fix paths per bug# 163483
-	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
-	dodir /usr/share/icons/hicolor/128x128/apps
-	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
-	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
-
-	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
-}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index c8cc0eb..cdc63d3 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,8 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -36,8 +34,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
-EBUILD netbeans-php-9999_p20160629.ebuild 4418 SHA256 11d47be338b1ca237c468a5fe3185f818fda7f46f8927e4023dcf5af02303c8e SHA512 81526613c6fbe4059453be97ce75d1fc121bcaa248c318cdead82a29bcde2ee16100c7afce783f051900fdbf745fbd99ae7319d1117b71fdc948b2d45e85e50b WHIRLPOOL bd11c27e91385a7527d0fd8fe2084873f3fa4b287b1e13ec4ec53c59bcc77c4f8e8a5b831a9e07d3dc221c6f5a9111c76589753cd93957ace920c808aa65c1fd
-EBUILD netbeans-php-9999_p20160630.ebuild 4418 SHA256 6010aaf38fd8362861f9b806c2b64677b04dfa1c58d9ec66883b8538acef6d40 SHA512 383ce987bfd97089a1b378a29444677d9af8cf7a76c3cf2eeca7c2dd9efe4df14ace107815aaac7cd6e48c7e7533491415e5374c79a061fdfed24deea4498d60 WHIRLPOOL b9b0f59d8ad9057582008479ee1e512cc654088a1e7ad41b001510dc65c0c128bc32b2ec9b377da3f2649c87e6bf49d943176c6bd68145325e22fbcc8af304ee
 EBUILD netbeans-php-9999_p20160701.ebuild 4418 SHA256 01223f49ba6b96b258d2c7e7c502b168f12b2edf2e0e8af7fdacdf4446796136 SHA512 5b8e985e1c5e443c345ff621b38810ec1626aed1fc28aa4dfb6d7f4fdd7cd8b493346666bcb69fdd2539ed6fdd0ed73a3cfdab744eaa723f22203dadf8f8e540 WHIRLPOOL d2ef1262516dc9b42cd3ac6a2ccf01a526c67cd1988bd44fbf55c0db909d5f4da92dc19d790e67e0ff912b8ad350ad8cd97ac92ab32c8c812362c71dd97b9736
 EBUILD netbeans-php-9999_p20160703.ebuild 4418 SHA256 91a9b546b3a4937c422ed37561448532723d56f17389789c3688e42ebb350e26 SHA512 b038ce6d0ebfa1e8129791955c5b877c10086d2a63777f58cdfa6a0f1824ca331fa263dd34f44e8f014a095ab432d0122703c18bc9437e491c22b7f318b5390b WHIRLPOOL 00dad5a18eb93a723bdab010da55fa30ae4b39545e1a35316f2f82a8a1fc5fb20c30b1195dc803b1af2e153c785fcc0305ca2f9c93e1c1fea66a1914e3d82be3
 EBUILD netbeans-php-9999_p20160704.ebuild 4418 SHA256 00d1ed6228d6465df71e721b11bc4cfe46eb5bc00458cbaf138959147b52b361 SHA512 84d6c119ff17db2f4e5027ab7bb9ac0e617c7e5855de53643a3e1e63425f36abd076f11300ba0d01616a28872288c6f4a40fe070dd515956c8d6f80282ffd360 WHIRLPOOL 4c6521587826815e05baa69796029404fc2d5a88bed3f7eae969f7f7bfe34e6ec7992ea9260fbbf8d992b7d813e1b5dfaa4f2866fdd320f48023ddc3d2b8ba52

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160629.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160629.ebuild
deleted file mode 100644
index 83bab88..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160629.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/php >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
-}

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160630.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160630.ebuild
deleted file mode 100644
index bac4762..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160630.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/php >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
-}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 92c6a0b..9f04049 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,8 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -57,8 +55,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
-EBUILD netbeans-platform-9999_p20160629.ebuild 9520 SHA256 0bf3526d550909a3f9395d5982093199a23ccd632d07a65f06a1eec59745287c SHA512 19cedab72e8ca9a692557fdfa8d669f06d270b3ab9fcbbfca24d6d7ebf92ab0588f008d114d40185d3d070c2523f51374ece866af29d4197194f8680bac50892 WHIRLPOOL 6b35d62ea994764e82492bf169c7e590d6a6a21fda5d220d35e1188d1b673c0405b2bb7ecbc3e1070b95e13c919609d1f30551135acb78ff0624c904b9ab1af6
-EBUILD netbeans-platform-9999_p20160630.ebuild 9520 SHA256 8d27a23a3f18d02205b602f815c308a4c8246ce753be78be741857c76ad3513f SHA512 298b1e8e8f31a0e84daeb1edfac9db9a6b6c51e1605a224600a7a6f6c8b775467469cc9d526ff2b5f6660501eefd8bab4a5741a8a431bc1d677b9280e05dc037 WHIRLPOOL 9fecf9a6b5eddd1c9f152073c2323bf70b59ecb506df9ed524d0a0b84da320d96e9cd209342b4b29a56bc82a1ebd5ef1027f10817b0d5a0dd4bcb6d4fa5df9b0
 EBUILD netbeans-platform-9999_p20160701.ebuild 9520 SHA256 ffd5c1ab67582e5447635fbea6628fded4bd4538ae0132f23355bb6c02b18f6f SHA512 16312c828596ddea8f21d1d03f94c2e7628bdfdfd22aad8292a475b8da1193573cf72ab919d28bb65d96920a96b2ea766aa431afbc8660d831ef1addc8e460ba WHIRLPOOL 72252feff38fe227f5001ab9fc55fb173ac921da30f81f2c4457c82f9c09166a1711f9bba1cd4efd34aff6f755c9e05344eba2b603dc2744aebc4338c817c3a8
 EBUILD netbeans-platform-9999_p20160703.ebuild 9520 SHA256 3b04e535b26734284dd6fcfb8d2a153ba4cdfbc91620b124fc0341d33683d38c SHA512 e94afff5df96eeaf18f6ca825cccb6f45b6c7700e12fc1e3e5781691aeb41e9b159ad350d8722152663869ae4c65e148b3123db3602fcf7a359a50d16943dbeb WHIRLPOOL 3caea5b25594ca14313ee25cd6fbac9f9c3184df22d2b5fbd11b738d09d4f8765f462296f8af5617f764b6e76e9e72c5aea4dd4e0bcff6288fe79a0900682755
 EBUILD netbeans-platform-9999_p20160704.ebuild 9520 SHA256 9a48a158cdeb133516fd4f7b041626608d58d100ea529cef8af2b7dffa762865 SHA512 32e05bc7776eddeb2b539811d37c03579c7d93adcbb8ba72777948d37df471451e95b5eff6378b57510af33f3e5865b6397cb4657a6b8bb7079f7856eb3387e4 WHIRLPOOL 906d81b0de79c2e3e053204d1847cbe43ec3e306a1c5dd728bd47e7f52da18352d274de03dcb59de53f20ffd73d0805f95d1fe76e797241b4df833d396775ea8

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160629.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160629.ebuild
deleted file mode 100644
index 7909b6a..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160629.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
-	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
-	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
-	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
-	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
-	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
-	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
-	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
-	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
-# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
-# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.htmlui
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/javahelp:0
-	>=dev-java/jna-3.4:0
-	dev-java/junit:4[source]
-	>=dev-java/osgi-core-api-5:0
-	dev-java/osgi-compendium:0
-	dev-java/swing-layout:1[source]
-	dev-java/testng:0"
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
-	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
-	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
-	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
-	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
-	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
-	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
-	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
-	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
-	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
-	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
-	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160630.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160630.ebuild
deleted file mode 100644
index e8c6763..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160630.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
-	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
-	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
-	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
-	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
-	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
-	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
-	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
-	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
-# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
-# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.htmlui
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/javahelp:0
-	>=dev-java/jna-3.4:0
-	dev-java/junit:4[source]
-	>=dev-java/osgi-core-api-5:0
-	dev-java/osgi-compendium:0
-	dev-java/swing-layout:1[source]
-	dev-java/testng:0"
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
-	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
-	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
-	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
-	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
-	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
-	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
-	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
-	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
-	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
-	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
-	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 6604fe1..5e9eee7 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
-EBUILD netbeans-profiler-9999_p20160629.ebuild 3472 SHA256 400f9c8fd8d2ac203576d74f7f2124b0eb0c0b8c3195d7631f07def1ef16901c SHA512 540230b9d19253d3268fd0219a677c586efd9232526c75e8cea53d19c05e8c0a1d9619fc8f49708ff0b086c7b0d2aef3b6e845db7ab3d64100b86b8746082903 WHIRLPOOL c1bf20139867706bcafa86bc1978f1ea379c6699532f40b3da644736d0eaccc9bd5066509301cd4a192d40e14c78247ecf6ebd63d8c9401f8e1917e79474f570
-EBUILD netbeans-profiler-9999_p20160630.ebuild 3472 SHA256 99b2aabe6c38e44e9da1223f800bc2264bd27716b3325696d851669aa02e4327 SHA512 b34a95550e7c81284e89aa6a4db42ce9375eda58749a1c4ab4b16af17d859624be96667fbccc5e00d7311a84804b7a2f512e1fc56488c1753603f5c97053b13b WHIRLPOOL d047fa55173d99b94048e3e7b87d4d421ab8255f898e36112daa7e2e7c01de44c245b261e8cadf75ca9319b1f0acd9850ec4bf8f22067f21ca472610816dcc71
 EBUILD netbeans-profiler-9999_p20160701.ebuild 3472 SHA256 b003e864b0d1b28e937959eb1922f8b000e2cd0c1ccb7a31d84cce81b705bf20 SHA512 c9999b8c8552f22e957f0c25c9b07a9c759f824c02a623f27d69132fd98281d3c6f133fbb089170216792a6aa1e101e50d644e77da99253e88840a080832b4a8 WHIRLPOOL e7348d82b438e95ee58ecdfad13b85de3f82115e4157454fd40f0195e8e39ff41b66ad85b54d43aaa114f335cce526fd4c603e102019b0bbc98ab71f6c5d99a4
 EBUILD netbeans-profiler-9999_p20160703.ebuild 3472 SHA256 c3274064fec10aa0458581ae124143dcdfa5f380c3f166e1e83b833595cdf895 SHA512 eb37cf0163d9032e43a3bcfe14f94ef7b0d0c7dd4dfc1452e7b85f8491203559980f83e359317b233fecb1d48c85b82b24a6a7395768f577cf9b0058d3231136 WHIRLPOOL ecfda57e947224e486c3118d1c2b035f6e0ca23e29f69a9af311268b80001d8e28bf84c13a3d053c122afc98a05e23343f725e1f81f556e4cd2f7f867e24ec78
 EBUILD netbeans-profiler-9999_p20160704.ebuild 3472 SHA256 a1af52990353646259df8954ce56388655a96796153e0731b14ec6cddd47ecfa SHA512 04e27a0ac592d4a5b52cf07584cb29d93f1a7e8834f29026661b711e4683d9716260916f3658eb42ba1ee7444962ed5fc57d838a8b78ad8558d09661ddd63476 WHIRLPOOL df399c80001ab63c840b3503cc7e209225464423f15cdca9f6b253034fa935656f81beb5727d0378aebf76054ff1a30d2f009faaacf1327d89bb6117efd1967b

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160629.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160629.ebuild
deleted file mode 100644
index 28030ab..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160629.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# Binary files needed for remote profiling
-QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/profiler >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	for file in lib/deployed/cvm/linux/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in lib/deployed/jdk*/linux*/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in remote-pack-defs/*.sh ; do
-		fperms 755 ${file}
-	done
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
-}

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160630.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160630.ebuild
deleted file mode 100644
index 5e078f9..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160630.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# Binary files needed for remote profiling
-QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/profiler >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	for file in lib/deployed/cvm/linux/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in lib/deployed/jdk*/linux*/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in remote-pack-defs/*.sh ; do
-		fperms 755 ${file}
-	done
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
-}

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 192a4fc..dc07955 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -14,7 +14,6 @@ DIST 7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar 278471 SH
 DIST 81483881778F37D0495C07323E445361084CA1DB-ios-sim 102548 SHA256 eeecd2d1ec484095f1d1d354212bfaf28578ec26588b42cff0f987f4a8b5023f SHA512 a1255952d7558552ddc25cb4e880429c7d7251dc6ccafda4380c688c8e4398f6274b41003b31fd445cee5811ede02f0c46417fd323983a412fd1bf7429034589 WHIRLPOOL 3930f1c1e17b63f3a0216de6dcfe0ed7eacd0df7ead08dcad8bbfcfec588e8b26788e72e7f0185595e577479451aa150ce7ec275610432f7dd365770544e918a
 DIST 9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib 10084 SHA256 862445bab777d39a227ab422dbd5dca457adefb35fcdbb036318e3bb11e303f2 SHA512 29949fed6bb31ec878416fae691dea24425c3785ccc717ef5b86ced9bacb87d8c698d74485474b39a66e61c0d05b41045059444805808b90a904a5b306fa3012 WHIRLPOOL 19a56da07d776c61ee688c0d1c03536cc4604b63ed2d17c408a283758153c9cc2c8fc00d39728ad78d2a3dba7906d0910ed5c5941e7fc7098e8528504c42a8b7
 DIST 9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib 159252 SHA256 052a881362a6d99e7b5a8c70531d4f70d15706e4b16570d0ff363f1a24e2130e SHA512 71d8d0c7b6ed247f705815c9e21cf9224c9c724c33cf6172ee864b5fb1807c4f2504e9b23e03c2636e5acaff89a09313b9e1d0bb3bf0ec9a26c16598abe98376 WHIRLPOOL fb85a22a37b265f3c630d5fed48b9f0a00fa41310c4a5c6702b6b93075b59c130da15e3ca4cc60f5615f1ba1c92d48009b9e4949053315bea6b790ee44babbfb
-DIST B68D8E16F5FDDB40C481465198E2768516E3D741-com.oracle.js.parser.jar 266524 SHA256 8831b8de9b0a50bdc7195191d13867ce58f13ac01afd47c009eeae2bcc1bc6d6 SHA512 084e8ca1f848a073d171dad3d78cadeae2d2f5dea7922849fb03f4b2f6c8730b99be6633cc0ab4700f7961a1791aed3995099bc2f98b07c8661d26f4d07f8df3 WHIRLPOOL cb6b04716992a672a6c935fb3d91d3bfba68ab7b175ac3874997155294c81277c6bd166e13769cd8caa4885eb2610e3bfeef118d6eccda7835c2557b87aeb28a
 DIST C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib 29404 SHA256 8e9a93c247c814e597e6cda3102d0cfc540d6692bab44ce5fe069269eb64c2c8 SHA512 c7ffc8890d7c605a6815edb34fe9b5578fa42b9111d2b40ddb128917ae04066292303c3cd11223d2e79526bc4b2f25025e1eee1449e60dc90ca98ffb11cc70ba WHIRLPOOL 652f0da52d04d35a11e828f0b85356780f39215a61ff72a9ddbe9493d5c940c2a72ac5f1ae9de830d6afd684f5f34f1cd53d90609e656095b2f26860e4f5a283
 DIST C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip 32928 SHA256 97442d0827a10745f607db2fc1471cc0cdf860add3eeb15d113f3b94ee343d1c SHA512 055810e141e29ef139bd6bcb0578d2f4790dc43ef6e4fd044f26a59c69ab6fe8af8ac9cb39b336e74bc3235d6a5de6aa7ca93b797c508ed8061c20b5d4588f6b WHIRLPOOL 202a4c5941a557af634d2d00ed1a1de5a2724a14b841e686a5619e9b711be32a1f0b3bfa08875e44c63137e9bff56f091c8a4c7241d5a26ba651283dde445e33
 DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 SHA256 9e60b24c8cd7930d04517872e5926dffd761f06501b14caabd9456eba5f882c0 SHA512 bafbf999c1e64da8a4b72896514d1b9e6dca2dc5fb4d66dbd62fb5a986348faa42834da7960db4cd1455104f0d0dd0eaf6e56edd47affefdbc903a2320110da6 WHIRLPOOL 4a05b2eabf3688729d4a7f77c4b18fb6de4d2c88a1f206ec6a49094826a3fcfb9c5eae5947b9d8461e284c10743c7bd35c909caeba896b4f7bb1d1aaeb3c7d91
@@ -25,8 +24,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -53,8 +50,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
-EBUILD netbeans-webcommon-9999_p20160629.ebuild 6242 SHA256 26fa0c9759e3ecca05171327d4b5f6f6f19c4c211b13bf6f5d2a4aab0a2a9161 SHA512 52c38e186e47668946cf14f0bd0898e7dad972f52473365d7911a0a5f58635fb43fc0183afead37ef7b7ac91872fff0fbdd3c74cc43bc3f4e8676094802b6434 WHIRLPOOL f0c7761e48852a8621d2cc155dabf8c6190f4376a803407d328aca00859860dac14521d4e03b4724b8af7589a64335f1d239a1cba3b0d4ff95973df3c8ca3e59
-EBUILD netbeans-webcommon-9999_p20160630.ebuild 6242 SHA256 9c217ac02417695459edba8050d2360bd5f1e0f085f8706d0ad2a1807c82aaa3 SHA512 be4ecd6cc59e877398f96bfdceb17048e3f4c69fc03fa6e896646b25d84a998736294e9f2c6cc82d3d3964f1ecfd9fa2f6defaa60227df28c3590d918abd6874 WHIRLPOOL 3cd416e9664794e970e23af2d9fcd9b3fae05667d5ed7ece7b794cb4abf89dc1d34e4718dc97717a718ed0a41cc8e1b8b6749ec91e638e773f215efe93e7c56b
 EBUILD netbeans-webcommon-9999_p20160701.ebuild 6242 SHA256 0c39818df923716655598daac17daf8a191217bb24783b8fe1ed45898a32d76a SHA512 669f6ea6473c4e92bd2e99ff7d108a173f4458c497e061438995e7ec0699ce363ff9fa56bce0d01983ea0e12f800fde337b6237860c48b2fb2b75c54e3e9af7d WHIRLPOOL 7e239f05594127725b00f5c1619465cfc183ff36c0b6da96497b97d28c1129cb5efae1b265183bccc7f8cd64a56d3e337ab7f86837f6684f062f0169a578c3e0
 EBUILD netbeans-webcommon-9999_p20160703.ebuild 6242 SHA256 5ae26a642e641d0e8d3989b2441cd87b985652885d101b6cdb0f959d981c8f03 SHA512 1a435a50e5251660a77ea77153dbc5c559076bb4a4a48acd75a99b499c2430a58a4357acf377664b508b947b51df1c9f4aa65c065b49f1376040d4c185da0ea0 WHIRLPOOL 1e39fa9140d6021c592f3ac4f0106f6a0e698485b5a06e705e056b9008e3f6df0b231ec5ba1cbd8fdfe0ee34a3356153fa66bfa77e9d6c6c5b82959bf0542e6f
 EBUILD netbeans-webcommon-9999_p20160704.ebuild 6242 SHA256 27158da014ce1d4f743b6ab16058ba1abb528b05b512075e5d34b061237be00e SHA512 1a56881a912a67fdb6691b36c596fc72667134a788b668e3278235006815c4869a2b55755de24d9ad73c8c783a093a5d9f0ab4fb9ceccd8bf6dd7bf8fc0b56e3 WHIRLPOOL 1e69d63511f223746da904e1c97cc392991b78d02b6b7439a85c5296ae82df9c78da4b4fd93df8869d463b171ad7cc684a4dbe763922110aa40126be228f9466

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160629.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160629.ebuild
deleted file mode 100644
index e4d4805..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160629.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/B68D8E16F5FDDB40C481465198E2768516E3D741-com.oracle.js.parser.jar
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/B68D8E16F5FDDB40C481465198E2768516E3D741-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/webcommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
-}

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160630.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160630.ebuild
deleted file mode 100644
index e7dd70e..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160630.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/B68D8E16F5FDDB40C481465198E2768516E3D741-com.oracle.js.parser.jar
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/B68D8E16F5FDDB40C481465198E2768516E3D741-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/webcommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
-}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 7474eca..9e99a4c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
-EBUILD netbeans-websvccommon-9999_p20160629.ebuild 2721 SHA256 31b16740d9c5b5f0dba53536a474ab9ef34841f5414f125cfe1ba0a182affc34 SHA512 1f23b25d36ad6e959f5cad16357bceaba8bd7cb4da62c876b6a13ddb76f069eef18290835896a167c2190d928add56d61a976ec4ac866db26201488237665678 WHIRLPOOL 134ad03608f379efbea024ace5c653519510d3c2e54d8ab2cfc88045c86b737980b2a4fd7a9a7b9d87a5a23f0a354e073c046a9b1681bc9084128618c06c3630
-EBUILD netbeans-websvccommon-9999_p20160630.ebuild 2721 SHA256 23de0fdebdd2cd62dc0d9ef58e18b6d62947ff0c03862ed021f0a2cc48a79684 SHA512 8816743ee02fc3c919e7bfd2409ecad37de6bbbc95ae81baf20fb68234d86c1cef52111446ba5be8e15a2f284c4ec96f152776d3a98f8124a4c61dbd7452ca05 WHIRLPOOL 27088983c59a56537825676f026a8fdd597213fe676e7a76613a63d98c8b5f3f0408d11f702cdc5222bbc23cc9b240320a3dd7c98bb72224b658a6d7dcc9d97b
 EBUILD netbeans-websvccommon-9999_p20160701.ebuild 2721 SHA256 cf027c12663df0a41c36419e8433517530be2d0ca4e8d8d49316aae88529eb43 SHA512 1359eb7cd6bd6c3bdbd4c4e70de12ab00c2c42df6cc253d52102fe2d39281c7c486d5de1305ad4739823b3f3d28fa2bb76b4d2cef4db92cfbf4bfd462c96c04b WHIRLPOOL 0ed8e01e9d265e3d82aab748575f6aa7e2c2cfa062ed7d0d0b64e66f24418183f4cd2fe46e762a52bb26a7038e7afa52cdd1a542dbd0e8103ccf8cb6b7c4a7f9
 EBUILD netbeans-websvccommon-9999_p20160703.ebuild 2721 SHA256 ebe2d8daac903b630639b7a1d6fc6e14a0acfbc93a13f8699ac6fc2c0aecbc0c SHA512 9e46365580e115131e85632eea0a24c80e84abe12581f3c8d96d07853b6d1f29736ea8235fe4455facd2597f62d9dc552a2af213520ded892dbf8bbfb3f9e5ef WHIRLPOOL fb48e0d44c677b3b7efae2d9f27f41d16b96543f8266ee4b6a4c7737f3d38fc0c3e05d2f8609af589924a4ff32bd2fc0b28cb0efc4a24f90e8b1a9132b710f8b
 EBUILD netbeans-websvccommon-9999_p20160704.ebuild 2721 SHA256 ff9eba591e89477f019a53dc4b82784c1173abcf508fddd51ca69367a038857d SHA512 ce9dc4e8e5c24fbfd6b6628736c094c337acab0d2adc1a878c575f3731755d975b209c4f670eb66da75e1853681110d4b2273d8e8b1d3b2a493530e2452a954f WHIRLPOOL 1f22220757c374f5e32e3d9e6edfa79c928ccf80cd9b0e658b1b582456ffac4c31bdcc252a2e6b2fef508329f7f58bc5a16dd3067da3360e5853065724a9df20

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160629.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160629.ebuild
deleted file mode 100644
index 690ef40..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160629.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/websvccommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
-}

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160630.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160630.ebuild
deleted file mode 100644
index 482a914..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160630.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/websvccommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
-}

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 4dc0b9a..97a58c1 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
-DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
-EBUILD netbeans-9999_p20160629.ebuild 6939 SHA256 7d7a99cae16080f9451ebfa095406a24ab4b84ff20e7840835992affcbc13602 SHA512 ad291eea5ffa6e139f2ea7284174e7c65df5bc59b741a463cc2d3b07f6678897d2d8debd92e957d284ef071261f3ca04064f55a6a58f0fd1a23f88e3134820bc WHIRLPOOL 9c8f78e356e76cc25e2dcb60fc030f2f499e77e9802e4a28bffed4fbde0f73ab1fc8cb56073aeef820f0cd534ccec41723b1d117ae7fbe265de202c506a5281a
-EBUILD netbeans-9999_p20160630.ebuild 6939 SHA256 f5fd58e599cce28a31bbfef0cdd0439e4e9ca2b77e3ad24a2b5aedf03fcc6253 SHA512 f80a07e8255c519770edb3cc7059b6a74411960912fde261004cc09e3bb74fbeedcf4d17e5681cad4054ec977270e3b04796f420ea11667f1c60e60cb775ee36 WHIRLPOOL 97f51865187c7815cca18869c9067c31990eafe1ea314465e830704812e44ea4b263ab387bf4fd470bf0d44f091a6f71e2ea6e710f4235492c6960b733b9be25
 EBUILD netbeans-9999_p20160701.ebuild 6939 SHA256 d0d49ec67a9a634dbd210d5f3348d586a14feeecda8b8acaf9340d4446228645 SHA512 8e30e5b71bf1079b504235bf356c7cc6fcc7e0383eed94982a759252fd5aa6e0517876ba5da24709250259a8ce14e03029753113b0a24bc6bbf85d44d14b0d5c WHIRLPOOL b4752d5d37423c339bd1108c8513a20c72d2eb57c3374419e7559e4e52f41d8df760902cb95cb19709753ad734805b78a29afab56bfc573acae35e54de3bf012
 EBUILD netbeans-9999_p20160703.ebuild 6939 SHA256 bb32d89b2b352baf8a90c945f3ac328150ddac7dddde75788fe2ac963020dbeb SHA512 74a1c4728cb4b47dae8ede7c107229eed7f80d0403ddcc9f111001c295791bed1c167d4bf34859c5edaa163333060e71e5c8bac00d458356e62ee1b97db3645b WHIRLPOOL 6e8faa9164f5d078ee3555898afc148ec4ae5a1b5c279cc31f6e0be6d7656b170e5b6e67a4346294978c541129845f2f2843a0935e1fa5eaae08cb6cfe4fd17c
 EBUILD netbeans-9999_p20160704.ebuild 6939 SHA256 dfeca6651d8e2a47638bc7f8c1bb686d699102731932461367f4e3c5dc5dac9d SHA512 a9e442c6851df0e2d71355cb84c941933238884ca2d2248a05e45c14ee0551bd0a51a9a5598acc98b62ad38f8d4fcdad75fa2294610724061a58ae7276405a2d WHIRLPOOL 5c52ca7550d1b26b1b7ef9413b554688c0dddc7fb12847e56730f7751e8ccf68e42a4b3f53e9adacfd90a78cd1c7209aff9cba26b5246c38f5527558140c120b

diff --git a/dev-util/netbeans/netbeans-9999_p20160629.ebuild b/dev-util/netbeans/netbeans-9999_p20160629.ebuild
deleted file mode 100644
index c067eb7..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160629.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-29_00-02-33/zip/netbeans-trunk-nightly-201606290002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="linguas_af? ( ${ALL_URLS} )
-	linguas_ar? ( ${ALL_URLS} )
-	linguas_ar_SA? ( ${ALL_URLS} )
-	linguas_bg? ( ${ALL_URLS} )
-	linguas_ca? ( ${ALL_URLS} )
-	linguas_cs? ( ${ALL_URLS} )
-	linguas_de? ( ${ALL_URLS} )
-	linguas_el? ( ${ALL_URLS} )
-	linguas_es? ( ${ALL_URLS} )
-	linguas_es_CO? ( ${ALL_URLS} )
-	linguas_fil? ( ${ALL_URLS} )
-	linguas_fr? ( ${ALL_URLS} )
-	linguas_gl? ( ${ALL_URLS} )
-	linguas_hi_IN? ( ${ALL_URLS} )
-	linguas_id_ID? ( ${ALL_URLS} )
-	linguas_it? ( ${ALL_URLS} )
-	linguas_ja? ( ${ALL_URLS} )
-	linguas_ko? ( ${ALL_URLS} )
-	linguas_lt? ( ${ALL_URLS} )
-	linguas_nl_BE? ( ${ALL_URLS} )
-	linguas_nl_NL? ( ${ALL_URLS} )
-	linguas_pl? ( ${ALL_URLS} )
-	linguas_pt_BR? ( ${ALL_URLS} )
-	linguas_pt_PT? ( ${ALL_URLS} )
-	linguas_ro? ( ${ALL_URLS} )
-	linguas_ru? ( ${ALL_URLS} )
-	linguas_si? ( ${ALL_URLS} )
-	linguas_sq? ( ${ALL_URLS} )
-	linguas_sr? ( ${ALL_URLS} )
-	linguas_sv? ( ${ALL_URLS} )
-	linguas_ta_IN? ( ${ALL_URLS} )
-	linguas_tr? ( ${ALL_URLS} )
-	linguas_vi? ( ${ALL_URLS} )
-	linguas_zh_CN? ( ${ALL_URLS} )
-	linguas_zh_TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_LINGUAS="
-	linguas_af
-	linguas_ar
-	linguas_ar_SA
-	linguas_bg
-	linguas_ca
-	linguas_cs
-	linguas_de
-	linguas_el
-	linguas_es
-	linguas_es_CO
-	linguas_fil
-	linguas_fr
-	linguas_gl
-	linguas_hi_IN
-	linguas_id_ID
-	linguas_it
-	linguas_ja
-	linguas_ko
-	linguas_lt
-	linguas_nl_BE
-	linguas_nl_NL
-	linguas_pl
-	linguas_pt_BR
-	linguas_pt_PT
-	linguas_ro
-	linguas_ru
-	linguas_si
-	linguas_sq
-	linguas_sr
-	linguas_sv
-	linguas_ta_IN
-	linguas_tr
-	linguas_vi
-	linguas_zh_CN
-	linguas_zh_TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
-S="${WORKDIR}"
-
-DEPEND=">=virtual/jdk-1.7
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_LINGUAS} ; do
-		local lang=${lingua/linguas_/}
-
-		if [[ "${lang}" = "ar" ]] ; then
-			lang="ar_EG,ar_SA"
-		elif [[ "${lang}" = "es" ]] ; then
-			lang="es,es_CO"
-		elif [[ "${lang}" = "fil" ]] ; then
-			lang="fil_PH"
-		elif [[ "${lang}" = "gl" ]] ; then
-			lang="gl_ES"
-		elif [[ "${lang}" = "id_ID" ]] ; then
-			lang="in_ID"
-		fi
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r16-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r16-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use linguas_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use linguas_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use linguas_id_ID ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-}

diff --git a/dev-util/netbeans/netbeans-9999_p20160630.ebuild b/dev-util/netbeans/netbeans-9999_p20160630.ebuild
deleted file mode 100644
index 3c7e925..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160630.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-30_00-02-33/zip/netbeans-trunk-nightly-201606300002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="linguas_af? ( ${ALL_URLS} )
-	linguas_ar? ( ${ALL_URLS} )
-	linguas_ar_SA? ( ${ALL_URLS} )
-	linguas_bg? ( ${ALL_URLS} )
-	linguas_ca? ( ${ALL_URLS} )
-	linguas_cs? ( ${ALL_URLS} )
-	linguas_de? ( ${ALL_URLS} )
-	linguas_el? ( ${ALL_URLS} )
-	linguas_es? ( ${ALL_URLS} )
-	linguas_es_CO? ( ${ALL_URLS} )
-	linguas_fil? ( ${ALL_URLS} )
-	linguas_fr? ( ${ALL_URLS} )
-	linguas_gl? ( ${ALL_URLS} )
-	linguas_hi_IN? ( ${ALL_URLS} )
-	linguas_id_ID? ( ${ALL_URLS} )
-	linguas_it? ( ${ALL_URLS} )
-	linguas_ja? ( ${ALL_URLS} )
-	linguas_ko? ( ${ALL_URLS} )
-	linguas_lt? ( ${ALL_URLS} )
-	linguas_nl_BE? ( ${ALL_URLS} )
-	linguas_nl_NL? ( ${ALL_URLS} )
-	linguas_pl? ( ${ALL_URLS} )
-	linguas_pt_BR? ( ${ALL_URLS} )
-	linguas_pt_PT? ( ${ALL_URLS} )
-	linguas_ro? ( ${ALL_URLS} )
-	linguas_ru? ( ${ALL_URLS} )
-	linguas_si? ( ${ALL_URLS} )
-	linguas_sq? ( ${ALL_URLS} )
-	linguas_sr? ( ${ALL_URLS} )
-	linguas_sv? ( ${ALL_URLS} )
-	linguas_ta_IN? ( ${ALL_URLS} )
-	linguas_tr? ( ${ALL_URLS} )
-	linguas_vi? ( ${ALL_URLS} )
-	linguas_zh_CN? ( ${ALL_URLS} )
-	linguas_zh_TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_LINGUAS="
-	linguas_af
-	linguas_ar
-	linguas_ar_SA
-	linguas_bg
-	linguas_ca
-	linguas_cs
-	linguas_de
-	linguas_el
-	linguas_es
-	linguas_es_CO
-	linguas_fil
-	linguas_fr
-	linguas_gl
-	linguas_hi_IN
-	linguas_id_ID
-	linguas_it
-	linguas_ja
-	linguas_ko
-	linguas_lt
-	linguas_nl_BE
-	linguas_nl_NL
-	linguas_pl
-	linguas_pt_BR
-	linguas_pt_PT
-	linguas_ro
-	linguas_ru
-	linguas_si
-	linguas_sq
-	linguas_sr
-	linguas_sv
-	linguas_ta_IN
-	linguas_tr
-	linguas_vi
-	linguas_zh_CN
-	linguas_zh_TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
-S="${WORKDIR}"
-
-DEPEND=">=virtual/jdk-1.7
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_LINGUAS} ; do
-		local lang=${lingua/linguas_/}
-
-		if [[ "${lang}" = "ar" ]] ; then
-			lang="ar_EG,ar_SA"
-		elif [[ "${lang}" = "es" ]] ; then
-			lang="es,es_CO"
-		elif [[ "${lang}" = "fil" ]] ; then
-			lang="fil_PH"
-		elif [[ "${lang}" = "gl" ]] ; then
-			lang="gl_ES"
-		elif [[ "${lang}" = "id_ID" ]] ; then
-			lang="in_ID"
-		fi
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r16-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r16-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use linguas_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use linguas_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use linguas_id_ID ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-08-08  6:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-08  6:28 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-cnd/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-11-28 16:59 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox