public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-webcommon/, ...
@ 2015-09-24  9:59 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-09-24  9:59 UTC (permalink / raw
  To: gentoo-commits

commit:     e0e252c5c4c47d34582d1528dea1d3b48a5d91fd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 09:33:26 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 09:33:26 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=e0e252c5

netbeans: version bump

Package-Manager: portage-2.2.21

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20150924.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   3 +
 .../netbeans-cnd-9999_p20150924.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20150924.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20150924.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20150924.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20150924.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20150924.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20150924.ebuild         | 114 +++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20150924.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20150924.ebuild            | 273 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20150924.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20150924.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20150924.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20150924.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20150924.ebuild  | 148 ++++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20150924.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |  10 +
 .../netbeans-platform-9999_p20150924.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20150924.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20150924.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20150924.ebuild    |  94 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20150924.ebuild   | 264 +++++++++++++++
 42 files changed, 3335 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index cd6adb7..3645632 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -14,6 +14,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-9999_p20150901.ebuild 3384 SHA256 187e107dda837afe5fdc0b321a4bba2e5fc6f18dff1eb359c64c122ad04b9e86 SHA512 ea07d62ef5f4ee8d68f17f69fb3b10924e37ff38a6c15147f432232f354d3475f4fc768a535503cd12da6a3d6b2ad303abec714e362506bd723ff23cbef4b36c WHIRLPOOL 9fc6fb1c7f4bbbf79d15eef81c9c440c3a98a2ed8ff4f04e73ba4a0e36b9c54cad45e50ea89e04e5a8b175a3d9d56c9f3e3af47fbe9dd21b9d8c367bb3623ea2
 EBUILD netbeans-apisupport-9999_p20150903.ebuild 3384 SHA256 13a7a16b6a12ed08e9ad7234bec1ad5e5fe209e4f13e4587bfcf4d28a8869b22 SHA512 cbd2dbb4d8c01b1f6c70ca8a7835a58c2ecf94a0ec084ef2b2c73b675734ec61497925791bc2045fe7b36d372676309057a520a669828d604d93dd279306e9db WHIRLPOOL 08fc78eac704d29500bec5772b64ed2b159130e3414c9f7beeddb786ad3233afa0b74086d7de80d66ca335af56b22eafe254513a847839cc1ecf7584cbad832d
@@ -28,4 +29,5 @@ EBUILD netbeans-apisupport-9999_p20150918.ebuild 3384 SHA256 a43565b334be32acbc3
 EBUILD netbeans-apisupport-9999_p20150921.ebuild 3384 SHA256 9ff68b5a869dca4869bdb948e7524d25c938d8b08fe4a40b04d3c26e73c6a75c SHA512 185c819aed97b08edb941b429e7ded24a756a54f89967f4f86b0c6c94ab11327e6cd3c333bab4d7acaba1d4cdb8b5d2c5a5639123f58d17d542abef925a40754 WHIRLPOOL 6ad5375a68af0f36cbad5528bdeec83da81e315a354c66c4f761a028863a4ea0fe5bce7a2c985e209700a8e60b03c009131071eb8d14ecee8e4b9506a2bd977f
 EBUILD netbeans-apisupport-9999_p20150922.ebuild 3384 SHA256 8ce99a19d486f4bc619acde3a6f62361f988504da0a2cfeba17226f30ce8e42b SHA512 57858c1784ad0100f2c0b36bebde5873ce5bea3a87ba60e918c3e4c8cc27d92c87a1f5771b3f8af2d3d6550cd04b17b7c4313f8702e705f7de99624fcaaa3f2b WHIRLPOOL 3be54362b1a715b908fb9d62c6d28e51f37fef1aa6f2cbd6edb0347cfcaf81339d11c7af63748416841ca2ab14e4d1e894bb8a2f796ad9132c589eac3274a451
 EBUILD netbeans-apisupport-9999_p20150923.ebuild 3384 SHA256 0df65ef5bd88ee939ff058090b1b4fc44f512fb8e5e6e7d9b76b1bc39ad385d2 SHA512 b109d9d7fbc34f665369becb58d9c5ba2d283f8a57517a9b948c06c64d03ec6d87ced0802b4db3e9783ec43f13652f60ce85ac0c7a99bdfc2d264dc72df590e6 WHIRLPOOL e1398ceb66bd8ca96cf096fe4d6b79a9baae4b5c99b082eca6a1434fcc39429fed75e0ba6ba0ffe0af91dabef619bdd360a0b3af809ab33b2ecc3bd9ddb409a3
+EBUILD netbeans-apisupport-9999_p20150924.ebuild 3384 SHA256 309feaf4f8cc24c494a4c79d9faf8c26faf34591cb9939b84d2983ea8873007d SHA512 734448ecee1173232a33044acef5d7b1aa2625c3a30b8155151ecf67f47b3c4e92934430c4a14a3e49cbbce84fd50aeb8e34fd92431d68769f845fa85b950ef9 WHIRLPOOL e46cbbe3efa2d49e29b9391d31e7ceb5fc5f10cc33f699ba5fb7a4721283ee3c4caddcfa4bbbaf508f3d94d65b347c974ea8f75c25255bb0d8f33ca5f2328ab0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150924.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150924.ebuild
new file mode 100644
index 0000000..0d7c2fe
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 99128ba..ed1894b 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -7,6 +7,7 @@ DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee45
 DIST 3E8BABDBD19DBDC2EC829ACEBBB3F44B5E6FC620-clank_0.3.6.zip 7485362 SHA256 c0edc7f32a682614b893e43726f0526e2002f0ecbfd98a429577926be0803c78 SHA512 81c0d4b4d7bc89d2eea35309c7f55f45dae73d21b935c9199d1de5f5c27d32feef9a8e709a8c62b33929095169f901a92c8342668871276094cb64955d240b29 WHIRLPOOL 93871b7fd9db2e25246083305c7fac9464f35f84573b1ae3568326892e3f8706937f3bf54d0d211372847fec7d856bd2c13a2b72c1e67e4d5d78a108bdb05960
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST 6E655079DAB13EED7E53AD961F24664274646299-clank_0.3.6.zip 7723898 SHA256 c0f2b52bb3badea9fb74071ead110722b1a6e716b37eb2dc59067c7a2dd3a1f0 SHA512 8a76ffe58a101ddf351c0d13afc15c720d2b9718695ad2c51f4910ec90585b6a546ee267e33bf3f7266b80ddda2732fae53b00382f5b5b662c9fa5b3b2f0d261 WHIRLPOOL 86a1df3f152fa0e3287963a91cc64ab6c35d34e60591ee23f635433835d016b9e8e812ab0d950c681247f1a18cf83ad61b6d75a6d061ec70010cbf010bf590fa
 DIST 91F81ED36683E7DA584C97FACA3DA8E21F6EBAE4-clank_0.3.6.zip 7290324 SHA256 b6e274a8da5889c0206f342d7e9549ea3b1563d70fff2029e3ad1add0b35b43e SHA512 e826bc72cb839f6f7725d2fff70b45c594645410f2ebab0131c5942648cfaaed67d407ea2dcbe9a1fe060b35fd981ffc9e8fc1bff3e486acb782d073d55d37fd WHIRLPOOL e3a910243d6519b66c45f197f918ef0146250f58967fb37cec8e6a9fb2271cfe9c3b548d58f953d81f2c333cc5b3440b5dd6a156c20903bd119ab6ab7df707e8
 DIST 998FF5E89B7386A5FF0474097C64E2D2D89879E3-clank_0.3.6.zip 7495324 SHA256 ae5588c113577c023ecac708d5836b31414bda68b375e18ad91ce7a04a3805ac SHA512 fbfc9e56c7539dc8c04d6fd89895d2808af4e933c52786c8b62bad2a932b62ffc82080e93cebc977337a2b5a9343a6dd773c8850d1a09c320f3e619bcb29a416 WHIRLPOOL 5773bd9f133336bee513896488cdc5a097b3ea30ed9c7587f3e39a83423e6cc7f619b333558327fbd062f445dd6ddc5bcc932be18c0d4157b3142db9d2f20a59
 DIST A8C1DD1ECB47D9424506C3BB0B40D7148278006E-clank_0.3.6.zip 8275014 SHA256 5ff9d23973dc3ad09d777d2baf9aec58f07c119d14ab168a98006bde20ddfda8 SHA512 b2c58cb116312e8ff06f8c842c0924b8a5db5fba3010e333924318ca5b5963025bcc3a2d048a2333a5f666eca8571c8a59dfb3d8ded6ba3cf99c07a46420f0b8 WHIRLPOOL 5bd5ce58a35403f516591f43b9a18d68be0a4dbe0e0910d3702df390fb7ceee98271cf0c08d92dd1f8627dbb1f1a09459c631c293169aff6639a62c7b3ec00fc
@@ -33,6 +34,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-9999_p20150901.ebuild 4790 SHA256 0be3c11a9af46d2d8aba83d0e15c09b935bd598464f43d5030887464d3f96f9b SHA512 f3b2e7de31f3434d6390bec0382fd6d77d2075470543cb9052572c91483ccfd026822a5db6f10932cb86b5974a0d2c5f390551873dac6cbd1f463b62560ab196 WHIRLPOOL f158e99c020c4e0f67c3ceec7a59d5f2cc455c52db4a9301bce821a123b7c8f3e570467aabe9281ac440d067dac36525b864dabd0c06b88ad86a2464d4e5140a
 EBUILD netbeans-cnd-9999_p20150903.ebuild 4790 SHA256 57a5694dab810fdf15990d575c3270fb7338837550ba4598e21703e4d904e85c SHA512 b5073782475520ba9126954d5341c0977a73f4b838ea4484835558b821baab49cbb52e3e07705f611e879b3eefedccb1e9a0817bbf9b98d80d17018e5888ad1d WHIRLPOOL 408c5a25c4877204b5e3a9ae8c4b7b23464a68527a8bd37e37df89a5fddf71fd23cc4e80610981dd72325d9289cfe2c5b3172986e3aff240be9911354b7d8946
@@ -47,4 +49,5 @@ EBUILD netbeans-cnd-9999_p20150918.ebuild 4790 SHA256 b2e97eb01204039b65a33885df
 EBUILD netbeans-cnd-9999_p20150921.ebuild 4790 SHA256 6ed2de03f2dd8e2e6a432544a93fbdfee235b48ccd9f222db7842a887797d38b SHA512 65800652286da9584e777c6dc4fdb4b8af70fa815dbce480ad7607fa3c0770d87021fec56c7eb9992430a80c5f96fa45b2070857fd4c864ecd991b229b852951 WHIRLPOOL 0f1f5d29da9137887074831f48cb919dcb88044c0ccc4b88467ae60af079e03d59497ead801a29e5e5f53b7bdd21b6892c58e1256f17c0cee2a2e0b897d2f7e5
 EBUILD netbeans-cnd-9999_p20150922.ebuild 4790 SHA256 b982f6466f4e54e21f00581697614e032ab2dc25d1c9cbc88be4832fbb38e450 SHA512 407d63b4819b319e98ed4f627fc2c4526815d492ceed83025fd80e48f9f5298c050f8c55ec00da0eed764772b8e5da3c9849f8e27f4202f62121f510f93f27c2 WHIRLPOOL 8ae2252bd6b6091524ffceb9a35fc9c94f85ae8e7939ce7f676546183d3bc698bae9765626f3f030cde5321e08f0f620c1b53867d9c19d8e972686cb91fa1b14
 EBUILD netbeans-cnd-9999_p20150923.ebuild 4790 SHA256 f944283bb71857fb4e66583e70eff2b674a59ed34f23ca671f7e7bd09eb17f3a SHA512 4ed5bccb7bf8a3609e7393d5eb389e517bf9b1e9bc8adcd8f69cf82c52045ecf33b940279e1d48354a83a76f6897f2e8146565405c8caae779ef8d6f78486c35 WHIRLPOOL 87a6d3e5c5ef43a79c4721b86d565476577a00cf7b9af0135340e0d55cf33f2c1697a64336d140970febc194a82ee5739173c0e1e29e998e88f696d8910ffa63
+EBUILD netbeans-cnd-9999_p20150924.ebuild 4790 SHA256 1e6242df1437ee478cd4bb792599cab312e7e62ac903bfd68c15e22c2b48482b SHA512 2b7e57699ca2ae3a68965ce1c7574946d5dd3af97342414bcba0acc3fd70d35010b305da1bc287d791123f0e98a2669c2aeee82121ded6107718be309fc28f66 WHIRLPOOL e40ec033df821077b8852fac390f9b538b270acf054aec4f6a77e966ce2904bdf2c50a9e29c5823ab683e6ba99c3fe0d1436f84363b393f683907b7e6ad6bb8a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150924.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150924.ebuild
new file mode 100644
index 0000000..258be27
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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/6E655079DAB13EED7E53AD961F24664274646299-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}"/6E655079DAB13EED7E53AD961F24664274646299-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 5d54ad8..220cab7 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-9999_p20150901.ebuild 2968 SHA256 f24ed1a628b18c080f9e06c1b488b101ebc2cf6cf0aa44c5b86f168fe52f912a SHA512 0fa494a731edd4f27e36d537e0a57ab868b8a04db394777b191d8352c452f75d06900ec23b0e25e4d08b18cfe9a8d9245890b01e24e510e52b2b218ebb91d2e8 WHIRLPOOL 439d07e76a1cb3967a1ef46540bfde542e11ffd7e4fbeb6fde5f198fa5f203703b6df26c4ba764d11d6299849fc8d4c5b7eb9f2133de02ccc586deee4cc34c34
 EBUILD netbeans-dlight-9999_p20150903.ebuild 2968 SHA256 e798582769fa118385293ad20cfcdeb51a4e10be437941396b37a71faf72bf3a SHA512 3080e3c87c9668b8c1646a61f2106ae937e1b8c9049e9d08aa933458b8e4dc4721c1caf84e12c37c397c4982cecfd53e39f2516c05617a59905182aa4e4190c1 WHIRLPOOL 5ea9f447ee4cd7a398db727ce0e3dd2944c58979d8af5f5a9c686732fd6dabf2403c2357c2e5d4d088ee36655b403dc6d574e2676d032e639b9cab3faf00bf70
@@ -30,4 +31,5 @@ EBUILD netbeans-dlight-9999_p20150918.ebuild 2968 SHA256 f6edd841e28d88904c0af91
 EBUILD netbeans-dlight-9999_p20150921.ebuild 2968 SHA256 affdf62850e90f0199d8c868c70ec1fabc4d14ce9a2d87bba283884e710ab231 SHA512 ba6962e7212f8b34f9aebc67c783e61ba78f08455881e51c1ef8dee9758343c8f4bf3988c0148f622ea2ef354c1bab75aba4ba48698cb994d2719f12f6a4a31b WHIRLPOOL f41543469ee5be7095bff427db2c1b35de1fd704cb9afeab04f08cea9df2e2fef327a808e70c6fa52a6aa8005b6c6c120dbf2bf7a8f347341b4040c0f4e63d35
 EBUILD netbeans-dlight-9999_p20150922.ebuild 2968 SHA256 403af1813e041afd958689dd4f2dbf758c9fb6c5ccbfe7a34006fb855b74aaf9 SHA512 6302ac9859482713aabe07d4e59c62445f8bebf86186b2aede3e7d2a56e607407fb21782e9f6e38c0e908fa046de83759ae8b58f1d07ce749b8e19702d8ca901 WHIRLPOOL 6623fd86581e33f36401ba7e8964d1fc6d6c5771e33868f18976c3124661b331dc7b6019ca5413f70a8502250ecdabd853a6fd1023fea097adff806488db02ea
 EBUILD netbeans-dlight-9999_p20150923.ebuild 2968 SHA256 2b221372d118fb453301879cfd96b3ab509b7353fc2fa5567ec20330acce9b80 SHA512 695d5d7ad3e703e1d6b234990723f79a5a4129b65e879b549b6c1e50f5a9f1f31588f63372c809fb8e91dbd63fbaad74a192495c9c9b7a4147fe4239996c914c WHIRLPOOL 3680eb3608402212df13506975713da9e9c45365ac41b92e1ead3b5bd50a2c555e3fa623e37e371bb0692917eb5d938f19059fdc5d2e95d0189f7f52bdcb25b2
+EBUILD netbeans-dlight-9999_p20150924.ebuild 2968 SHA256 e74b2e1e4f2473d588949d9d6fdaf8f67b0f86c1d2c830a8fc100bbb0d5baa2d SHA512 782d0c4254476989012242dcd967835e1b20b5078e56a9065b202a0fec71c1a6876459a633bc20c1815ce82c78ed88e5b79097a16f21274940a4012ce9a91ea1 WHIRLPOOL b6065bed8b3ee63bf831fc8f2a311db04b029333cb7a0b1d2370a8ce06cbd746cd827245b27ee4c4f57baa8c210d7cc6284cf4cf0c9d467ef926aaa3959a7133
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150924.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150924.ebuild
new file mode 100644
index 0000000..69f5a45
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/6396ED8427E5068B5331C0A3A03A2235135D6D75-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}"/6396ED8427E5068B5331C0A3A03A2235135D6D75-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 d2cd735..e7faefc 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-9999_p20150901.ebuild 15931 SHA256 44c06fa71678bc9434d41c8f580375f0e56c4756da1ad14de658574360a4ca8a SHA512 0e0800cd6259f4e4524d328a593ad4d1a40cb0b129ef53088403c0fe90b732f15eb897686485f629501cdaf4efbbaa69c60ce648e655a016abf4d24588a9191a WHIRLPOOL ee6d2a407a2d6e124f21912a7a0b1c6dfc8155cf228f9f451554c1c40ab63d497070d0264360aded0de23e7c03a52825593fde03dc4ed092b65789cbe083d47a
 EBUILD netbeans-enterprise-9999_p20150903.ebuild 15931 SHA256 2d15c63f7b1c6b590dfbda9cc26aa44ee36c043a695ad4ae06bac98b17f9f73a SHA512 6ca976ec3cb4b96d4d9794abaaadaa7e42dc0d4537e02a6cd0a65b0df7c2789a5eeeaabdb33b42df134271d4f8f0b5d54ddbeffb18a704e36c6e8a25f6d5245b WHIRLPOOL b0927d3c4aedd46698cba83fb07e35d5d0796ec9a50b65cc828534da1c45ab9b75701c58003583af3f999a2d4fa69a6b4a62abc3225d7591444dfca0353e3bf8
@@ -60,4 +61,5 @@ EBUILD netbeans-enterprise-9999_p20150918.ebuild 15931 SHA256 de7697400273b75210
 EBUILD netbeans-enterprise-9999_p20150921.ebuild 15931 SHA256 f7966be78f87e1af84f86214c083a0a4475aa4bc62975e6a456de7dd6e35f049 SHA512 417f03b21ce7971922408847401de3630dac6f2939e6fa9e7a4b606069bc76ec80bb77a5fe1913fa21e352d4fc8d1710ba14bbfa9ed2de3340baeaf50c7253f9 WHIRLPOOL ab227e9f115b40769cd194b4cb3887fac8ab95f427890b7470b34efece4380bc78f95114883b784679b018b9fc907f8d128f5b72fb64067149ab52a7373b6180
 EBUILD netbeans-enterprise-9999_p20150922.ebuild 15931 SHA256 549133f581930d318c6febf2f0b1626fc3bfe7bba7bab253ee7058acc0b9012d SHA512 05750ddc8cb5e305be698d4443d59071fc4bf0a9235b240e3632195572a64a48077c140ab3c3718f2ec4de4a4e7637ddf4e68a8e7ad43a8c66f4e375507e8f4e WHIRLPOOL 3b403bc19719d32ec03e4f867a8452331a4dafeda80cdacc24018f747c8bdd8578a3016a0ad84f8411dd88608b9f16dce4a390be92b5466ccfa0661f631b9a29
 EBUILD netbeans-enterprise-9999_p20150923.ebuild 15931 SHA256 65047c6434da308e3675534b5867361f4a6a2a2a5a73126938f7c53f072c1afa SHA512 9ae8307b6dd95a4e4344a325056dde34ca8b953ae49eef0bf61670817a73098192470ebbedda5c4a70d378e2f9223908cf921cbdbc8404ad033f438eb0110e6a WHIRLPOOL b30c9bb1cf001711c9ae353241d513f74d64fc74c5d70b8b0e4aa9b6e32e943976f5cf0859213eab4fd3520cb6a928bf12481078ded099d28d094beb0b05cf3a
+EBUILD netbeans-enterprise-9999_p20150924.ebuild 15931 SHA256 68b6cb8a497d46a59c4df1d0ed8b3d4469f8f77bbe5f4586b9521e6e5adbc570 SHA512 1041148a771e73854eb55fbaa93b69c327de91f0b5059abddb4d6760077487ac2b25dd01bb0d0b8212a9a713772b82bd0a955bf8eb94bb72b30bab3ea38ab901 WHIRLPOOL 488106f3cfac8c48af21b30d39dbfc6e256dc4c57005cd28364f28c55d4d648982c04c1c0b8417bcf768b81335356ebaf15ac63c359ca8b3a5aba02eb96b5929
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150924.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150924.ebuild
new file mode 100644
index 0000000..56bd647
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 d11ac3c..96873fe 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -14,6 +14,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-9999_p20150901.ebuild 2913 SHA256 5c3c619373ecaa4361d21b0686e634abd8e4f94f1d73aedbdc57307d50c64ba3 SHA512 d83f039014436f6e26b1f6fab2391ad2ecc33c184847574ea9c646a1b028f22ce3b566e4976a28d5b6bb00fd671043ff81bc718be76304077caa016613ef1edc WHIRLPOOL d0dbd357622f050e0b18a5c1262057050b740ce60069bdf6450cbdab0cdc4a78c81fc28e3837bd1fa1ab571666d3c2885fb975f5e26d50550b7c30ddbe17f547
 EBUILD netbeans-ergonomics-9999_p20150903.ebuild 2913 SHA256 08d2510fcb31a4ff36c702493e7a028659225e1678b6ad519c625b11220286c9 SHA512 5c5917f2498717d6d404145d13f2e1e75e1e93b08baaa451fbfa4c8e9b518f6207ec1eb86d7f6d57cc96ebaf55c0926f14b8601d7c2ea036c6566e95b2c5deb0 WHIRLPOOL 0e82e1fc32f080535e2b621f69111f0b5f453e08613b916c6fa1eb741cd9dfdb72651b31ac8f5c7bcf31b0b968aed41c3c6d9de6fa272b6d06851853beb1d57b
@@ -28,4 +29,5 @@ EBUILD netbeans-ergonomics-9999_p20150918.ebuild 2913 SHA256 f3eebb3f1c8bd7715a3
 EBUILD netbeans-ergonomics-9999_p20150921.ebuild 2913 SHA256 884da1efeaab92c2840ba99e5ab2d895249b3647238eb67c38a5a3c039c46c39 SHA512 20b0675316cfda755c530c1fcd0433cbd17b3efcb308a314fced28d4f916f3d91341fb2da1c766fb402490a3ebd83e79448e1f92785a91a59c5cb00bb942e17a WHIRLPOOL 5cca77e3c2f6b266fdb006b6dd7578e383185adb5bcb2378c759087e99f04a354db4ba251370995703698d8ce10ea4e78d96acadc280976797c885fe891a05a1
 EBUILD netbeans-ergonomics-9999_p20150922.ebuild 2913 SHA256 99d61bf90b07930aa0a82bedfea88509d6f896e6f70691b9e183b395dd03fd68 SHA512 e97cb8449622b3fb34ac953249cb69c034120de73f2e168471bf97783eeb75f48fb3e3a53cc24b7cbb05e0f7b3c6ea6748f71bc68558970b32a43989291e6cff WHIRLPOOL bf8b023716f321a3fa26b5fd32ef1dd713bc5c1f1d859633aaa87883babca3172a3a7ac2bcb3bd9f8d8c1147ca85110e7e072de79d10b8d3302c5eb034ea8dcf
 EBUILD netbeans-ergonomics-9999_p20150923.ebuild 2913 SHA256 b100ef3ff227f2c4ddc8f1a07c97f904fb181d754563322330511cb256913c61 SHA512 a19d34362ea59bd717dda16bec8b94048c6deea467b5bda04ef6ba5b3530637ceb95ece8ab918d2561ae444024de0516563400ed94d79b04b48b94240747aebf WHIRLPOOL d7232c6723b636d8e8d8725a6147b71c805fee1a66095f7c1fef5bc19f57fa4de99e950104db10fecfd40305787bd0699bccd34a6bd80a92dec1f0d5bc9af698
+EBUILD netbeans-ergonomics-9999_p20150924.ebuild 2913 SHA256 bfdcef4d4fa4557bc70f33486e379e005ba8b6ae7fdfdb8f717db52b6019ac93 SHA512 24e2d40c13545e895722839b1eeb109dcfa9cd2febf5f9db07a8328fad30d55bd068ff2a039b5c9e9e311b3889705d94f9cf64da7b89e1de809d743f682af38f WHIRLPOOL 52d46edcbd581a9ef9e372850270a3553e137d564e7f59933439e2f57e87a4336e4aeb3655cbbf4519ab3666b5ed6d4c061223b9ca81f6b33b6dccb0ee7eff74
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150924.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150924.ebuild
new file mode 100644
index 0000000..a847937
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 9e2db0d..fc1bde7 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-9999_p20150901.ebuild 3377 SHA256 a459e45e713807b3565add526bbbca698d49b86ec31dfdb90dde5de79a98bf4f SHA512 7221a46804530530304a4cb1a36d58a82c19717e9d6a61c4e5c35a28ad3cb58d108fb11341a5ef9005557b1c7e891478e64f38aa12efffc652ddb684ba94c0d3 WHIRLPOOL 8b4d65a5d5c72f544ea83b43681136ba08678b20a71a15d336e9f8cf235331e01d6ba21bb7bf8147deb638d9e857006eb1ead0a0016e47c3c21262012c03e8ff
 EBUILD netbeans-extide-9999_p20150903.ebuild 3377 SHA256 e0a7a1f3704f2521ff54dbaa7eb9672a10bb8b866026d359c6fd4ae287937afa SHA512 c0f77e05c7a78608804126a10738d46e337f38b0124e30f50d14fedb24e984bca9a94bf31ee8ff6cc3931ca8b74527d521a27384dba09f555f7d59bafc366642 WHIRLPOOL 73fe4c7dc37d7b1ab2794cc55864dad1a5c1408a14c028df00c9f26c5049f08ccb5b8d2a88d3b0f2ad72d5fc927513692157e38b943db69fce602f6256638ab8
@@ -30,4 +31,5 @@ EBUILD netbeans-extide-9999_p20150918.ebuild 3377 SHA256 286ba9ad66622f372bde97e
 EBUILD netbeans-extide-9999_p20150921.ebuild 3377 SHA256 c1274a517f291f18e3df092f339ee0b375f0ee74101834403621d061b4dab40b SHA512 62b560c94c0668a7d0d058f6926f711b8a3ea1c56f05821fd70e37f99751e8267ecdf5cde77d1ebb501dbe5e0c467c75e6c0cee21defc7314b54048829027b01 WHIRLPOOL 7eb44c589cef3faf294a648143dcbccde26ed90005986b9d7306fe91b14f87e946a7d73764b1f10e2208fe6b02b88f7710c42341f733d8e85ae85c72d7281b1a
 EBUILD netbeans-extide-9999_p20150922.ebuild 3377 SHA256 f4bdce5273270bf10b49f2b0ee282b0f60fa85ce8e231eec8ceed01d98b756cd SHA512 aa45b17fb90fb10d6125bd449fc8e5c4ccd876feee12b7f27dc25944b65642af695ae29f590c048e07903a5c4ce4d3d8011b4782df9bc7303e4af8f424b2db91 WHIRLPOOL 06c899e7b1ff151a479aee8ca5ba7b68d7c579b17915b023fe94ec4f8124721aa3d282c8211fe912dd5cc95225b6cb4e176c652b33dbee0f2cfac5dc29dddf26
 EBUILD netbeans-extide-9999_p20150923.ebuild 3377 SHA256 2cd816b16087a53f17f73a38fcdc5f98401c447548e5b828d32a94e5563dae67 SHA512 969db7beab82ad2339e2247a60f0e5b16ed9321d96f16ed47c5a57b00d88a31bd82d75ffb15ecc43822cf31fcd8df1ad9591b8fcf8c9541a78949919d3aaefbb WHIRLPOOL 9486b4eeb498d1b20e254702438e35f2eecce40578babb048ad43d5da6ed3faed789d1d02ebcb34a684115d422550164f78f6e55b23ff19082f03fb1d612e80c
+EBUILD netbeans-extide-9999_p20150924.ebuild 3377 SHA256 1188da08cbc5da731416edb34dbe840c0db15bb503491e85729aa4115223c0a1 SHA512 802ec93bb631ac19b5c5812709939e8017d73f32bfd85d681abf365e90a5400e95007e07b01588e130a26b4277338b23403d40786ef268bfc00c8ad20c5ac845 WHIRLPOOL ac4b2a2e2aeb1534ab6398f79f72ce5af9511623d06c592bba06753ce9ac435492c4d08508382140f39fb084c49c5cee4aedffb59c3f30b50c248f57f66d63dc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150924.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150924.ebuild
new file mode 100644
index 0000000..47215a5
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 e780a95..ee0437f 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-9999_p20150901.ebuild 3416 SHA256 bd899df99a2dfaf3081354ae331ad0494b5f2cdda81dc9039cef398ff8fcb10d SHA512 5753e9033ecb74072aae302ac814e5e8f3c264b159f4d82f7d41467f552b8089ad4a02141a277f154d8f48145a925b4214898e188d69f38d50dbb28af5b45b60 WHIRLPOOL ff875fab2e82d6fe6dcbabcccf334ff8056939ea7502773191ba622ecf597acbb49ac0a685ddca883bee01a890c220d9d531b6daa01189dc9b4a58cf41144c80
 EBUILD netbeans-groovy-9999_p20150903.ebuild 3416 SHA256 52900724587824fe2970ef01a4f6e2478d2b43f8068473edce228ae26f295f11 SHA512 15387a879c00dc1262cfe45c5d4d4bed353a15606531a1942a4921eaa7e947d89624bf81ed25a75bc9d76c1f8d7d729478e31f5dff416f08ba5c81280d1b88ab WHIRLPOOL fe65f7e8120c3586e0e35c49008c85296237f69eeac8f6f383a0bf47c86407e66c6f17c3ff01dbdb921ecd9bb4c71e57e106a1f779b276239b9fa3ccefa8d2ab
@@ -29,4 +30,5 @@ EBUILD netbeans-groovy-9999_p20150918.ebuild 3416 SHA256 afe84b876d8343e452591d6
 EBUILD netbeans-groovy-9999_p20150921.ebuild 3416 SHA256 46625cba6cb06d3c9b4d967f09da1ef643f6d518a0eb51a37a5021aa31b75bb6 SHA512 8fc77b393dee08609ea957b24ab8fee79444b22bf45a298ec0a9aba5cb27e3ca602d40daef99a048ff051b52492bce177f211f11dcc9b5303200c2997522b24e WHIRLPOOL 05ce06adf18cb9109d57571a00f221b4543e1b3d52dac8a9d0491383a02889f58b06b1ac0e5ebca92b413ae5b6d4530f2c971f7779aed27372da0d65282e433d
 EBUILD netbeans-groovy-9999_p20150922.ebuild 3416 SHA256 af55ad2b5a13535b46b1fa3da318e2d8b048ee879180359ca5bbf99d764e022f SHA512 6ab0b0484a825859b5e41a83e68b0206000ba713398d63f29a94a2d763b655a837e68968906e4d1280b5e61f63d0a567d8bfd406a74ec15f86eb983dbc2153d8 WHIRLPOOL 2ad823685f4d3ccf9cc3c6893723eb7ff3623e0ae9720a0c6594eec6635e4e416d855d66d53c02692e777c4640e34ff32fd8a21552879b4df05f548c84ec8fbd
 EBUILD netbeans-groovy-9999_p20150923.ebuild 3416 SHA256 78238d84d239a2d978d848f36b5f083e2929b37c7ce269827dc6fd63a37753b2 SHA512 af7bdba5bdbf0929367349c5e90cc2662254d8e0b72d43f3696ebe734786807f7819933a0cbb8a8a67d49a469ab8d94cb041d1d681cc7555886c1a5aeb07dd1e WHIRLPOOL 6139fbb2749be1692c685a8ce9fbe55aab402be1fd0f1b8c4d95f375dcc8cf3187af6a58ba153adc428701eae0266890c85d1c462e5771c2340bbea83d2b255b
+EBUILD netbeans-groovy-9999_p20150924.ebuild 3416 SHA256 508d788fe407dde8973b878f196f2bdfcee583a58974ca1370503a2852e68e61 SHA512 b4ba688dcfcb8ce4823af0495766e3e9443484980f326506e61569d316e04d1460ad399ed0393a6746a2f61be1dacee715b256b5d08d66b5e100154f399c04c8 WHIRLPOOL 5569f4c616b16dfd841fc7ec2aea798b67d18d4b511ce0031ecdb571760c5d631c4c65c7d26313eebd798e200219918eeea27c76b22f74ea6c2284064e57cf91
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150924.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150924.ebuild
new file mode 100644
index 0000000..df029b7
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 d21dd4d..dcb9ac8 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-9999_p20150901.ebuild 4125 SHA256 c9189bd6d9b770dcc22627aedb7041e6dd80a0464b4b3649a6cebf1352fd7dea SHA512 154f820f3b07192e4d8b35fd473cdedd3dcee70d81f8484e95a33846fd6c3e8474acbad1ee99ca2ee29574da125521ca695bed8a471e5fd10ab7724ef9d8f7d4 WHIRLPOOL 8b4a9ff80f36f06108df4508abd091b99e5ed96c6b297c1efe5b18b3f798890f6f23313c02d543d89fcde5169631bf3cdca15cc54a086747f8f52eda303d8f09
 EBUILD netbeans-harness-9999_p20150903.ebuild 4125 SHA256 68de6c9e0f914b0db958bcb0a48f9e74170cef31e65dcea5e8996f8796df32d1 SHA512 93a557e04df4f9fc4bc068b087e3b91d5fb409c30e8c16b625f2973b28e3f5f36474fa7d36ca9fc72c154bb2a2bd84b696a95241cd02ec14cf7ae4800291d545 WHIRLPOOL 4bbdb9c03f2b21ce25eba8f4ac8abe8144c4f315dc2a608d2ec4cb3a6adcd7020f4bae313924024eaba580e245d1e8e3e3cd19f3d1e6f90db4c6ca6f7c90ad3c
@@ -33,4 +34,5 @@ EBUILD netbeans-harness-9999_p20150918.ebuild 4125 SHA256 b002dcf97ce4c2c8e19c7f
 EBUILD netbeans-harness-9999_p20150921.ebuild 4125 SHA256 b6344471d30667a09318bd180d6ae32b5685a466f8fcd90a37e3a1c28ecf8dfe SHA512 39ec868ecb75427428d74c783e4a0118ed4153b9873154de49ac0f9ee8328a92daa0211ac12bdc6659bbe15e5b68474b5f91da93c4892b86bf50633820cfc001 WHIRLPOOL feaab1ed978c330990f5d0d46587f6649b1a4fc9e0105aa7067b72421a6d1987fa1093bcf59db79c817598fc0e776428070c2be8f057c243235c3d0d6968aa0d
 EBUILD netbeans-harness-9999_p20150922.ebuild 4125 SHA256 fb7a88d8116d3df5c70fe05074cfceb96827e219b1d714fc68caecbc4df67149 SHA512 4283a5ba623c659f96af03817d3487bfcd40e7d5313b6a56e1afd2a4509fa40a94be8d94bd8f353767acb0f432639473ec6c64236c9515524be1a016cb948658 WHIRLPOOL 082ea4ef322471467b6b989df00ea9491636ce6713f083d70023a7b8cd4f14dd5934b69852af1d787b3ad01490316016c3dc5c50040c1db9ff5f7683900f1090
 EBUILD netbeans-harness-9999_p20150923.ebuild 4125 SHA256 8938d3a67b01fe0d178a210c3e3b402a75d68aba430764933912d1849dbd3994 SHA512 a182972c9a1ce9c7a0b130000bc6b63934a3e5c34529c98730f9211dd0adb1280bb92eaa81f5b003a7e2efb72f6c624fa763907c15f7ef6d915db7b9dbd6944f WHIRLPOOL 7c60493eda014812b4636239f56e3e22496ba9b8ac56ba8c0104bfaccffb0ac0287913835a2cb881fbe633898ca2063689690cdf3c5362f749cac26a54d88d98
+EBUILD netbeans-harness-9999_p20150924.ebuild 4125 SHA256 ea1aa6d115ace52b0e6b2259453bcbbd1350540d210998d9d85a7ced00df77f9 SHA512 90757ba75b0def880e7cc247b625a5bc7c44eee6197f36d0536f39f5d623870a5a721ba78a4002a4103db96b27aac4c95951f63d73b2aa81062132d17883acdf WHIRLPOOL e998bf731f839b0e4f19c2f3da575babab8b75de2a9cfff42faf7b610391ae535c6e171ed52d7c2da6e13eb1295f7382aae82f4f938a1b79da1605e4b7265446
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150924.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150924.ebuild
new file mode 100644
index 0000000..85aff84
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 56d3e7b..27365f1 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -120,6 +120,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-9999_p20150901.ebuild 30334 SHA256 a2430eba1da126a548c390a52701aa5a9ff7f3c5afcf591492704f6270f49ee2 SHA512 ee3b7c4d773f16ae78341f8393397d6090055d11b2b45a579afc23e020cda5bf0f86b1348d47b99fe94280885db4869b3f54a15e5f70aafb62c2ead0e63bc9f6 WHIRLPOOL dae179c3bed6fdbfa5527a31d3b15a9e8f1eb7a805ce872b9fa512be27b1ee4e3393a0713bec6e461fdaf7d09c04857c68cca5b497f772559491a4f32f2ef4cc
 EBUILD netbeans-ide-9999_p20150903.ebuild 30334 SHA256 ae41f1ecbbaf9cfc10fa655a7ac439d418a40d7cd2ae2cf8e40009035c839f22 SHA512 c8d03b4c44ed1855b06f861347078aadbbaed51e42eced7f35f02c438440a269b055042aa44666ebd2c0d1fb16c626f07a70c751025bce97735393e4faf9c387 WHIRLPOOL 45c00d9dcc84161a15412652088d25e5f220b7d499da453ef2f482960c7e51cef8d6ac3e6b343e9a9b5b78f6cc8f68ba7aaab15c557c2734c0335bf27e48a531
@@ -134,4 +135,5 @@ EBUILD netbeans-ide-9999_p20150918.ebuild 30334 SHA256 f6b5d820973a9990b4a3a5d18
 EBUILD netbeans-ide-9999_p20150921.ebuild 30334 SHA256 7d7a5ab3eda6f6bf7a1a44cd0108b5fc5ecf46fbf84e69fc3180aba6d662b766 SHA512 c5e7da1081b5540454ba0cbc8468a0cc9c0a5857cb868b9ee770e0c5b68b84b1365164625666f3219362fe34cc9e9b37f6ef96790afe69396383b47294bde091 WHIRLPOOL 90e502b33618722260a21b9f906bb40dd59afbf8bc33cd9f27a05c7a6e2b59df529a1da47a3fc1d76e248923c2fbe00b052382c820ec0fc2b6ccb705a89e8b9e
 EBUILD netbeans-ide-9999_p20150922.ebuild 30334 SHA256 3612fb5cb93cccd7abfc41d62c6f084513851220a3e4496c3d4d33718e8200b2 SHA512 2dd6bbc851d27924b430ab7a7dea9a8b70840dc686d390931ab3803540e02cee15d1a02d8a55932bb22587d9a5949f8acbebc1570012128e3d3f2c9299b4ed58 WHIRLPOOL 3e5bc5b16558663bb4dc88f22f0cf01d63e98687393fe35bdb3d725ad69b185a2ea769a254a9a22ce880bdd77fc65b64f0122340aff2c7b911cc30888ae78ee1
 EBUILD netbeans-ide-9999_p20150923.ebuild 30334 SHA256 fc39a83681e844b1389dc24303683d541051f26d932b973da5014eecf465a977 SHA512 ebe494e3cc3767b5da64268f85d951f73474ff64718bd91b4a7b0bb13c602d33d46443ff0daffec604825b23462a4125730255708865a7fad133a38e01ef193c WHIRLPOOL 02b8819c413af8ec6ffa91bb4687426ece58a38ffe030c1c0a89fd1fa1e12e9121fc7634a6a819c37ce16e14ee48f5bf90cad86e239862fe94dc6814628a752e
+EBUILD netbeans-ide-9999_p20150924.ebuild 30334 SHA256 2b2f51c1c488b85fdf07e9b5a87b1aad9e381a3108f13bb2edeebf3771cabd8c SHA512 a01171ec42cec19a908285e5667637e3d58aa39178ea4791187d1d428522ee4120bf87903413100d0e29354bce4d65d57a255bcf4f48d856471aa252f5203f8e WHIRLPOOL 912421afa52a7aa9baf82fce3f068855fbfd642ba5ed8c95346842060dba6d9e5e2a613b3db119bd61f2c36b5a56c28376dac117596b9e960f9e2c02c19b7d52
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150924.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150924.ebuild
new file mode 100644
index 0000000..771c1cb
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150924.ebuild
@@ -0,0 +1,377 @@
+# 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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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/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/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/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.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/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	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/freemarker:2.3
+#	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}"/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}"/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}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.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}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.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 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.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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 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 bb78aa4..c9f43ae 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-9999_p20150901.ebuild 14818 SHA256 2e650037a388a620e743e8212f0099878e8908fe4dc1680b36f6ae8e9a72fa54 SHA512 b7d8475055812c78ee45ceec123fc103641b4070972f0f7e3572a0b07efee2ca2cbcd16600fcfc7f30dff461fc235ccbbc1fde941f528e27f4a2f742f3ee5cdd WHIRLPOOL bb23d595159c481696ba4fefba3e398797db9cea44e4c2f00eef7929fbe1f442362c470163bc460d349da5cb18f627a3892c6d63b17439112becf538352785e2
 EBUILD netbeans-java-9999_p20150903.ebuild 14818 SHA256 f34ba8d98927651ec621ec445d4760fc596073f6857194bfceb5688b2910089b SHA512 ce7c86a52990ec26660a9eee1bc7588a2e069e80e42eb5b521699a9784e1da41411d5e9965c4f77bd4771b7046e9bd99e6563511336744404dd716e54c11faae WHIRLPOOL 5477f4bda878bfa48ba3851b740e5d9f06f594fa953f5ea0fab0a37917c7462b7356f96aaeca5847e85623c37e4bb46df81217451aace87cbcde7c50c38146a6
@@ -57,4 +58,5 @@ EBUILD netbeans-java-9999_p20150918.ebuild 14818 SHA256 f647306f8a5f540804897844
 EBUILD netbeans-java-9999_p20150921.ebuild 14818 SHA256 d01b46e6f80a9bf20616d1eff17519bde74f7a50c9d27332dbfe1805f226d35d SHA512 cdc090442fb50fea85493e2dbfeecd6e8531fa2270b9e99c5c1d1f224de71e0cc082dc0ab350103652f7f33b818c09c657f18179c25f9c53d8febf48a9c64dc4 WHIRLPOOL 01b13a756a7ef83b528dc5fd0fc56cf2f543b391e0df3f738dd386f9935209ae4d68ae66b979012d615abbe56bea3eacef77258d1a0b2cccf5159f3054f952fa
 EBUILD netbeans-java-9999_p20150922.ebuild 14818 SHA256 348a24121519445a2d1bb1f027a657a20953d0a74391b82617b6207531174506 SHA512 cf10d10f7034b975d9effc01e3f64cc45a4b4fb72fae011ce195edaac5e1ec7ee47d4944f907d2c3c892c80a67675bb1c49f001af9c35657ef71ae9add0d9dd8 WHIRLPOOL 022fcdec29f71edd292de0e24b081c52b1296fff9debdecb5d4110a31f99db502f8f5dc7fa149897ece85598893c6395f9577e7b5665e65d3f7e129d521b9c76
 EBUILD netbeans-java-9999_p20150923.ebuild 14818 SHA256 9f4b5b668c10447c1578a2394fbac79395df5a28339b257587969ca318a24c74 SHA512 2d46647f4fcc44392f78d0890004e73c51ba6551a13f48cfd14a3dc7d83ded7e680503e412d710c25d43cd4ed714cb5f2c6c15b34f621e3b77f14f90574d6422 WHIRLPOOL 5752022bbef17168a91d47aa73e3a7ff637e09b85b416ff5cf0f81fa5116b09bb3562ceca505be888ace6e845114f6b8790a7dec19f6582b5c8a87cd461c7d71
+EBUILD netbeans-java-9999_p20150924.ebuild 14818 SHA256 cfcdfc64c907fe1a594e997f01b75e3c1c61b8c0b872597c3072169d7f21c5d4 SHA512 def4870e3e70555552f2fe6a65892c7a4a6da37c6bda3197a7af7e89aee39521b064b1aedd1e0060cf7bfd68eabec3f8df52d0fbd0082c6109e9066f2cec2e7f WHIRLPOOL 3202638e60fc8944af0fa213e10347c45022a0115a8a3927946c31ee9425cb8a5a47def8c1a5fb369c4683bb6bd7121829a1e452dd1c1bc96f15072763732318
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150924.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150924.ebuild
new file mode 100644
index 0000000..3404a6e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150924.ebuild
@@ -0,0 +1,273 @@
+# 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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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/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/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.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}"/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}"/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-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 9aa1306..7856ddf 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-9999_p20150901.ebuild 4976 SHA256 f8bbd7f2419ccc07c17b05c295359dc07c55f3cfca78d7760105b82903fa2b79 SHA512 53bb2b9edbe87daecc4feb6b063579517ccea53b52168fc4a6ed03d8351d3f254a819125937aec58f551aa926b4b5a567b5bde3850fc390fad437f45194add80 WHIRLPOOL 9403f1dc9c3042fb5981d340b02d3615db9aefde73f1b2ade96b9010bdd6a37f610387aa303625ae0c979f20ccffd57ca87115321bd42ff9b6dcb39bcff03580
 EBUILD netbeans-javacard-9999_p20150903.ebuild 4976 SHA256 20835b1551b3382cd7a6b3f97fcf7725597e77317e8a5ede489954f99f0eb4e4 SHA512 93dc8f950ec2d8d8ad83eba39699436121729915ceca17ab3a4593ea2ec0a9cbeb81263f52cde443fb2ebe43658620c438664cd112b30774290a8cc03f2dfdb6 WHIRLPOOL 69670cab1e9e12e074a2874ade1cec66b08313763f7380b1839395becdab4bbd617172987d0ddb021dfa29241654119fa2d6d61cb34d507584c3c8e7670f6b83
@@ -31,4 +32,5 @@ EBUILD netbeans-javacard-9999_p20150918.ebuild 4976 SHA256 f6f0450f29f166795c200
 EBUILD netbeans-javacard-9999_p20150921.ebuild 4976 SHA256 8aa2f20f0c4494989e0986741125f4d18516bc58be6c9f6f4827e685188e4449 SHA512 ee337348ae1848a2ec18605ca8658cddaec6b217af054876c4e1049696620a9c13980d8c609b7395276b50155af9eff279cbeaa859c54f30620669e5bf338f9e WHIRLPOOL 3a9c2f3cbe6f3e4f12ed304e43004ad3d41d9974ba1fa08e23ffd3d808a3826a827732e13927503b03aba82478062be654499d793aae06a52aae473b97e87435
 EBUILD netbeans-javacard-9999_p20150922.ebuild 4976 SHA256 919d62a90ad04af5c1873db61de3462d304bdf8cce68e5670e1dabdba5613ee0 SHA512 ef3cd38dc2e2164113f254705ec2dd3a1a1510c209176942b1919d11c4e4eff0b2e10b4909ee33542d3cf1b06151745c22bb1e9343566caaddfbaeceb664d015 WHIRLPOOL b40d9b399f5d472b24ae0cd9be20c7acc44b485ac1dfe5f1f867e9a93b08b43b81a76732f34c9e8089208da2539d9fe7a12f6057e5f35124a36f4a9c52057b18
 EBUILD netbeans-javacard-9999_p20150923.ebuild 4976 SHA256 58e94384eeb962687d8297668b691f465d65a5cdc1258b71f973004a83c35166 SHA512 a2938fe2d436ba51863145f67e7616b1e94525bc6e7e7db26e2134ba96903ba00d1201906c01993951e1906e99e83343ee5478b5f61ded7d6fe33fede694c8b7 WHIRLPOOL 319ee683fd8100a1b1df94241c6738ec27b63c708359b930b6930c35584fad04c1e75ec6e58704a50fdabd83f967b28f73177c20a57902e0aabe4b626bed803b
+EBUILD netbeans-javacard-9999_p20150924.ebuild 4976 SHA256 db09ee755db06f77e212e5b21e50205922eed49e8ac5f594b3996ab73282c343 SHA512 ba6bb3c2be5c3a9f866a58487dbd73e31e7b4f56a8440c812b5f66161ca79d6caaa31859e8b034e94271494581c8ec7c0a2a071a4f5ccec2e459befbee8d3b99 WHIRLPOOL 589440d8c08895334fbdd3c06239b14ccfa640e6660b7c147376cdb16a8a5d2f59d9dcb0b7afeffcb88f7c96d2a492cfd6c4fdfb4b82e367d7d01556517b876a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150924.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150924.ebuild
new file mode 100644
index 0000000..b395977
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 5965b15..e1fdd5d 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-9999_p20150901.ebuild 6228 SHA256 70adb18643384a52dbe2b88467c14663a755609b1a5098cf816c5c0b88994e9e SHA512 529fa63d125fe04aa06c4f444924b0e1390680092ff4a474810b6ede97925cdf907b14283016f9000f54bc9cc1a1d0e89835ca681940152a029eee0f370c2fba WHIRLPOOL e117f345fd2dde9298afd3f8b2f7ac1a699936336a68dee80c50cc33193aba40b069ed8867a1af84efe3a4621fea35daf8b0835bf89f7ca7f35278b60ddaa56a
 EBUILD netbeans-javadoc-9999_p20150903.ebuild 6228 SHA256 9f0dd0e792cbe63c9dad51f0b445a2245ac2931123c3de1fc8079631e3dd4b77 SHA512 76e8762c17b07fdbe1ab65cef9b6b6c0e26355deb5f1827b7d864cf582d1aeecac57c579d439a49f19cbadd6db7f92e626e0c97ef5ddf0b1b883cfdd6282ee6b WHIRLPOOL 0efef7d57f10a275fda7f97c209ae41fc61f8f9961de19325e34c117378d97e7d1b362ffab93e1ac71ce38b13881823937fb8ef10fb014c84e1cd61ae42b3d2c
@@ -29,4 +30,5 @@ EBUILD netbeans-javadoc-9999_p20150918.ebuild 6228 SHA256 3af026a5bd0350fdaabb3b
 EBUILD netbeans-javadoc-9999_p20150921.ebuild 6228 SHA256 8c485fbb948472e0b378f125144df3a566cbef9d9ad6e50eef379e327baa5cec SHA512 2ca6199dbd4cb378313bd65863a37e76c5274afc2c5b3bde2580989321ff94b3ab1a32b20cb59c098e778c3da78253ff8a62dd3cb585bd2edb468b4ad810024b WHIRLPOOL 24becfe76c43c5ad9b0ed1350c9a89c9e5f445eb175a8e213bc0fe156e2b882e987993156f17c9a0ccbbf5eb3b2612f4778abb8ea7ba74e26a9a862cd3e221a7
 EBUILD netbeans-javadoc-9999_p20150922.ebuild 6228 SHA256 b2f814969114a6591a12ae4d801646221c16f5a8df119e28204c0b32fdd1402d SHA512 808c39d20b9444df1d1481c6f8cba493e9a1bdb852cc9f2c89a5db9688dc8ab9d65cea47f69ebc5cfff4ee0504e695204c44f502369997c95c0dfbcba1392b80 WHIRLPOOL 75ebd4875924aa1fc8fe251021f3c38f42a7ab3c8cd12edca44bba6c2b598878a33ec2556df2958c67e9d495666230039ca817b31e64f981eedbc90ba2738cb5
 EBUILD netbeans-javadoc-9999_p20150923.ebuild 6228 SHA256 e1b83b70a1a34c40ae982904c186d7803ad521e38d57199824a251c89bc52377 SHA512 fec664c8a59140def6d74fd00670750a56aa280fbf30a4d1cef5b58c4dd54b6ea186abf8f1502b67ea79aa4adb63863e7bae0ca6a22760f9ce2c77ba3a8fa994 WHIRLPOOL 3a7a7c46697ef7c90421643ffdac232be9c20ecb215b47cad1038c11a4133faeec9f53ac2c9a9229dc7d2c6584fbef527cbab18ebe61d24192578d2530310199
+EBUILD netbeans-javadoc-9999_p20150924.ebuild 6228 SHA256 7a074717de8d444c14278fdcc0f0399c9531697f9da931fb72f54258a5c68d45 SHA512 70003d8d5b50d2a1b856fd022b88b277bed7c92b6166f87819111d71005a54c2cafe4fb586928d93566210c45aeda79f2964280f6addea8e56ab9eafb34018d4 WHIRLPOOL cd87caffea1334f9fad5b072e92f6682f74a960a018793d80b3e2a3e5f83704bb46d866032aab058924a71f363f24ce28f9d8d08a77804fa63ea2fcbdd6c92a6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150924.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150924.ebuild
new file mode 100644
index 0000000..cb79769
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 other jdks do not contain jre/lib/ext/jfxrt.jar
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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 -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -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 69ae316..132871b 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-9999_p20150901.ebuild 4717 SHA256 e95804f3d997f20e45ff63e57182227513494d00f034115bfea0fb80f7b06f86 SHA512 20431b8026fbcca039f412ab076e9aeea22745f964858dee0cebb070c08113cdabe35edefdb998efd0d146b0a9d055de441b21620e1beadfeb9970009e479eab WHIRLPOOL 1352d5de66acd787070011681f7800e37f7bc9f9420b7e957a16c490b7b0419d88408c13ce930f2e2507ff8a84308a93ed50434ed80c9f26b21e28356b73a716
 EBUILD netbeans-javafx-9999_p20150903.ebuild 4717 SHA256 f8dcd19435adff0ba1a386857b8a0d2624ba16b64e36bfd40f58a2da8616be5f SHA512 776aa675ae3ee669bff503e9ac240e801dd080c34a18f46a53ee9308044152eb4dd067b0ce9b3d89708a56f533426c2010e06d63d2c7465bd3e461193a71c082 WHIRLPOOL 12f7d33492850172e803a4c2fac724d0b6e196bc7d64746fb51f1382cc1d82df5714511dadc1167e5921d6a492e47d5e879f8f5fdcd1bb2d2501e14e2425407c
@@ -35,4 +36,5 @@ EBUILD netbeans-javafx-9999_p20150918.ebuild 4717 SHA256 77790919ad9710c918f3925
 EBUILD netbeans-javafx-9999_p20150921.ebuild 4717 SHA256 04a4c89006961cdfcce53d8888aa65f83638cd331571404faf686cc16ee98ce0 SHA512 956d40af12cb823a28896094d175aef572ddfbb60d16333a6ad4ff794e4a6a59124711d2da06b95a6d991351b5ad0f1d89b0ba328c70411d0a60257665f3a101 WHIRLPOOL b52ede459dde2f47353f7e068c3b098551c396aec89bfa8cf9004db9e52efcf69237d47f5c896de1f472887f99e353c14a93a8aa53a33a767e0169c90681d91e
 EBUILD netbeans-javafx-9999_p20150922.ebuild 4717 SHA256 4332eef96845d8fb617c9b6a2618b171cf27adcb5cff978381acd1f4f3114693 SHA512 7d0cb89e9b253f2ebcd4fbe383b56f74ab5846f96afb915588de576c48f56e56b711e941f62d3ecfbc4834ba1a5c6d81f9a146a324dbe0b0f631c8abd18112b5 WHIRLPOOL 7176257781de66f1355bca97abfb279550728363f0bfb8b7052371f738f740d1ea1f0fcea35b848b74c241b73b07c4fb0e14e664e9db32ff380a641f12b09f41
 EBUILD netbeans-javafx-9999_p20150923.ebuild 4717 SHA256 97c803a2ac5d392bde1cccdf82103735286b3520637bff52bc82e8488434c7de SHA512 95c03e22d532e87813ff30a19f897f872a8ef24986165a1d78d80a35d4954130a8b7df2f410f1a0b428b30b45ac7acf7d0d1e448a637bf28a13dfd0703f0d187 WHIRLPOOL 6b28f811a9bcf3ed289c69314c66c7e921ec03026c9be82b32adf7891ceb46e6372f05ba6efbfec8bc5ddcad2635de0860d6cd0299fb3ba9d1f184686a6a0b8d
+EBUILD netbeans-javafx-9999_p20150924.ebuild 4717 SHA256 766cd1df0358aded64dbd39780e54040bc8b553ac7a2b65ec4ff63665843f494 SHA512 501e6f2cba6298409412bf7e7fc1b630e2c8f7eb97b634c17cb2a552209a23af08f847b1c71983b91b049fd83bdf773db985875107cc5b90c41252af285a0e3a WHIRLPOOL d83f6394b04ce893ab02e639ad3ed834c642517fc4cd3a825ed04898a2de75c6d30bc9f3d4b515075f95aa30f3486976210062676cac7319cde36c84360942e8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150924.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150924.ebuild
new file mode 100644
index 0000000..fef89c5
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 2645320..659c1b0 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -14,6 +14,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-9999_p20150901.ebuild 4412 SHA256 24385dc623efa0f82a8ac6b377c867cc43863d1ef24a67cf0a55840d22d24fc8 SHA512 cef8f1359a5a8607376cf3db54b737a637a2efb7e08a3ec34ef911403c3cbe7c3f6201674522554875d96e8870a6a53b9fa54f9bb4d920575b7fd870d00f4448 WHIRLPOOL 7ab52bd93e70de0c6b3c184bce62b22086e81d736224ce66a157c40a052a57d9963030916f96fa54c5be7abfbec33536fe6be968696eff0461d1900366c0acb1
 EBUILD netbeans-mobility-9999_p20150903.ebuild 4412 SHA256 7ba27bee1e24a5cae28b92bd03db76751ef9815e6b9ca1f48e93302e33753edd SHA512 90aa1332c367f89d6fd7cd562376baac469928b71d878f6974bd0435eac1238c49a8215a53286092331fe2b87dff24357928e4811b093bcef8307bbe90d6eb87 WHIRLPOOL cf8378b155e8661bc366ea56ae4078e2e5c0209f9eb1363202b3daa3a9ab531ad21ecee420ac96e62a6ecd006f4e80ef9da8095cce60e9a293c644923e432656
@@ -28,4 +29,5 @@ EBUILD netbeans-mobility-9999_p20150918.ebuild 4412 SHA256 7a2e15321e7887c932a53
 EBUILD netbeans-mobility-9999_p20150921.ebuild 4412 SHA256 b2494af028fe76158e5164552280ea8f2309045fdf9cea973c72d19a65eb5ab0 SHA512 e4b4af50ac998aac06a4928f7b7dcb102d5ca370dc423d015f861a5a6af2e1c1c7e56a4a338dacbabf2c7dfedd2e0315f89368ea12756c87c465e6c19763050e WHIRLPOOL 4964801db67cd982ab92de2e21966334b58fc0b15314e52754ff49f8e7c3b592af43e11bb6e644b670a72998ea86782736e382e814129df5b356544ae404bcc0
 EBUILD netbeans-mobility-9999_p20150922.ebuild 4412 SHA256 2551a6ed15599bcdf7c2695454d8d295b409bb69dd333eac283fc7f3d839020e SHA512 316e9df62ee9d241f8b5754e108940b9a1bd6775d6e1230c5c258369411f6058eb002bece7245ff74ce6e7b5fee1b9ec4e24c4b50ab0d33f54b5793dc5da3843 WHIRLPOOL cdb0e2fca264e732c7a61359d886fc946fab2e11adaa5402c978a6229f030fc31fc782e76c6869a6463f72f7d684d252189d33298c220790caeec94a348496bb
 EBUILD netbeans-mobility-9999_p20150923.ebuild 4412 SHA256 f2686ed1e225c66b150d43bc4d603807c755ce526753e0203e622535e0712366 SHA512 12da96cdef98cae1d4d415621da26b125546ee6f95c97da1155dc3b9a6fba5a52ebc173f72abc625cb728761039fb0d5096eb8637d0c25545a131c1fa6745c09 WHIRLPOOL 7108f3a151528046fc3f93d89232a6721547f743fd3e2f1c1a19fafb74e55fe5a2aae2ac0559389159e80c8ad60a9ebb3878d7e8240adbeda3a5b24de3c92562
+EBUILD netbeans-mobility-9999_p20150924.ebuild 4412 SHA256 527eefabc406e61cf74da15e51f972a9dcbe219ddd459e98f460a5d6da824263 SHA512 f194ac194e6e13a794902af269b49cc135e3770d61f12d00c32b44909c8c2fdce0945be87e7572a5b96ccee93b5ec582d3081902e57c7221e091a068954d7b45 WHIRLPOOL b64c7c60ce2c40528228a57c43afafa782424e3fc1f27eaa8b81dcec9718c9f22aa20f2090eb331e1bcc21709b5fcade37167986a71138a26cb6733d305e6331
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150924.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150924.ebuild
new file mode 100644
index 0000000..513d447
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 e46f8ea..9248f18 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-9999_p20150901.ebuild 4997 SHA256 4bc20abbd79e622dae684777ea3942b19cdb96e94d76cae254b9bae919055997 SHA512 9eac2a9adbcb86bde4662b9edbb874ba820db2e622a0f4e436a570081cb49e664958e3e8fe6900dbfcfd44a0e1b33047fc25a536e93781b8e9b303ae9738bc83 WHIRLPOOL b83b659bbbd93f830039465b737c190e5031e88a634523f3e2647715e4a5b953d3469ac1c760db9613f3d6987157d89b14f0e740da228c0436950fd339d53ab9
 EBUILD netbeans-nb-9999_p20150903.ebuild 4997 SHA256 f2cbf0e344be20488551d7ad04e8c1f2452c03bc7f6f1e3db68527924c3a9b4f SHA512 f7eb44514e61a0e30d546d43caf3e2239da9faa0e59d6c224df6a102fd194589079833b980fcc719982faa9a35c2fb60dec1cf77f327926955e984e633fafba1 WHIRLPOOL 4995f7d9e24ca16d1d7d5a863692fa221b252f2185beac1c6ca908b3ea731a94f7f150affd8cfd03d16f2f7eb620be60833286d37a8d4b71a1e6b8eadbb32f50
@@ -31,4 +32,5 @@ EBUILD netbeans-nb-9999_p20150918.ebuild 4997 SHA256 6f3b5a2724eb3bd424280fddbe2
 EBUILD netbeans-nb-9999_p20150921.ebuild 4997 SHA256 1f043dc5a992481af16aa037ad8222887f062c60e3cbdc46e123061a561d7966 SHA512 a85c9caceb54aa23c74ccf5a973a27070dcda1b1d2af39deedb6f08e31e76d8300f01401794e5c8b2ad32795017b44684fde778466fe4baf7a8b2be29c87db69 WHIRLPOOL 75ffeb20fd1b6e60846bbb651f010814ce237c0c91c8367824a6a515339177e6d96f835ba9f60b4c0ad82ce11623860e37680f79769a7aba09b1a928cc95e569
 EBUILD netbeans-nb-9999_p20150922.ebuild 4997 SHA256 1918053dc784853fff25277eb31ff0f2817b1eb9500936c4d84a4913a7055f0d SHA512 5ac6e50c44451e2d8e4d4a4c82dc7848ba5f6d49464fc59ba02bfd4cbbaef97937171a403431d92a9c7b128116bd54dee2f8aa6511bd54a472fcacf773000d97 WHIRLPOOL e208a1ef88d1b2a5a22c9c5401224e3278929105d8f6e4c3337fdca78ef3699f500bd389f67fc2e9523cd69ee6491e17f5302b00c84e97b812c3a5219d2d3f8a
 EBUILD netbeans-nb-9999_p20150923.ebuild 4997 SHA256 89297e7ab1c0d435234914e970ded51bb657467fc2121dcdff30752f4d0929fb SHA512 1876453edbd79bb756265a63fd2db043e9ee6f031cd888e9bce7679e8440209b8c64433a635a1f59eb390b9c545678b662659657f81e8eb8b38532aa83ae800f WHIRLPOOL 799a8692f600f2918fa980e3bb6969641644c6177062a37c9ba9ce7222d2f7ef35ec07128480158f6ea9e224b2bb3741de7f7b3e98ca0941bcbad1d60afaef08
+EBUILD netbeans-nb-9999_p20150924.ebuild 4997 SHA256 7f9f40d6d726ec69db027e2c4fa47919974f4ad302f977025628ed45841a41ec SHA512 bbb4a9ad3b0d066a4f520739742ce4f078a37dcfe98141235c317d5bc983a6cf3c56e1c53ffc4b74f992f5bdd681f395b0df30069c6fba627a1931a55d2694ac WHIRLPOOL 5c7558ac4ef69047f51ac3a51d6433ab2b6f3412475391cdf0c6af9103758aa16b802b4d8d91e6a5ea47641850f3257662ec9971818eacdff093067a3f4afd8c
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150924.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150924.ebuild
new file mode 100644
index 0000000..1e27734
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150924.ebuild
@@ -0,0 +1,148 @@
+# 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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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="keychain"
+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}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+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
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.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
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index ef19675..ab14cd1 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-9999_p20150901.ebuild 4417 SHA256 b6f52a63053c7f6d74829800396e15d463a7316c2de194bb0e243385eb8cc95b SHA512 b783d245589b2f43d616f3e3af5ab8bb0d9c5097974c640f8d22996b8185eb921edb851c174bd02a17ef0d29c50f0db03c595b5f23bc717dd3b2c4944c7fbf73 WHIRLPOOL 00d18b2b7f6bff0fcf8852a6137df8eebaa99885091a6363628b7ae18dd9c4ec18e3dfb75f214092be4cde7fe7c1150889ee8c173751089af52e8710f67446b7
 EBUILD netbeans-php-9999_p20150903.ebuild 4417 SHA256 e7c715d04d186e6e62d408485f33ee6c94ec5a76969d95de552d10e590b94940 SHA512 44abb97abf1ae49840e20575bd05374f301870892bde53213df37d5a0b21bd6d9691bfc9f36120225d357572ba6df840cd4ef5f5f5492c24e5ef25f57f64624a WHIRLPOOL 35a1dcede6c295345409ac71f20c53c41b772a523d91d91bcd9b20369bc203e5f7f79e1ce7e2a72bb3cbb50ad693dfd8ad77a4ba22eea72000d70dfa593dfc00
@@ -33,4 +34,5 @@ EBUILD netbeans-php-9999_p20150918.ebuild 4417 SHA256 b146f1e1ee53dd9cd90f9459e5
 EBUILD netbeans-php-9999_p20150921.ebuild 4417 SHA256 f88e76a85965db1c96ce34494c2ef01fef6790f15f908cc93d2d171a511a90c9 SHA512 ff5bc3bf2d75101bff116bc63202ecc68b57f0b6cf1f88134b4e76fb320b17aa7ee8443c9e7dd3e568d5e335a7d9c354bdf2b4c41e8266b437d3083228a23af9 WHIRLPOOL 2c00e0de86cb5823f540fcfa04ea929c9a77625f4f32e8a8c94995d4ce6bdc3faaed3062ae0d88af1628cc2fa55d0d8ed75f8ab0d3f05ac7cc02339b3a29f2b7
 EBUILD netbeans-php-9999_p20150922.ebuild 4417 SHA256 f3c255b26a888be90282ac903aa30060fe14ba83b213be7d427ed51e218eabc9 SHA512 cfd06165d52cdb7fe5b0e6519bb68d647efb90d1aca408c90c2faf7c40bae72d4115c2f2b39eaf9880447dfe71a2821b2da9431c59671c6868bd226f3c3d6c8c WHIRLPOOL cca88c7c554bceff8cacd9a041524c88c1c1ec3a6948d519b968cdc758e7d6e59bdb11f62f8a04fbdeb366bc29c740f6b4ff22c9f6ea20d3fe87a3afcfaea9bd
 EBUILD netbeans-php-9999_p20150923.ebuild 4417 SHA256 255aaf9fbc47695e4c905d2582620548030a316b5438bc6a0d012a296fa95369 SHA512 7cd21c4b9e0ea84c040bf4f1f26dab4338de57f4d87b502af8c50212024ebd7e5e4d9e6f43fb25de57a1259fb93c313293e58e68a174c3b818111fa1b1cec2c9 WHIRLPOOL 035d00c33df35db7d04da6ddf7e43fcea167f460252a19c7920b9e74c4cfea48a9cb77b448f443a281f3482b8031dbf74ebe10987cad70d530c15322f28520a1
+EBUILD netbeans-php-9999_p20150924.ebuild 4417 SHA256 bb6880b20a6741929d144699be5630249c49028e45e643c95d40c9b5c3a66931 SHA512 d9b7e10821c977c6f83a73093eefc21b5e83409a51d331a1d28e87205c09072101f45d1aef76d4442e0d6192fffeb2ea1c9d0360419ab974fc7646fb49b51409 WHIRLPOOL b179a2b14b4a1f7d2cb20f6f5ec0e6fa9364c3d45b2bd1ff6a1516a2963467a089126de0cd4f87a99b7b9927da9ae6b769e97abe4a9b7e1df8ae5fd69802c73a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150924.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150924.ebuild
new file mode 100644
index 0000000..1a77382
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 4655be4..c91c60a 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -1,8 +1,10 @@
 DIST 03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar 63071 SHA256 3da9815a7a11675944cbe85efdce0ca9756c5b6be1a16bf9b0e98b5984f4415f SHA512 7693394686124c5eae90bd1ee3b49a1356635f044f3aa8ddcbe838cbe1334a9efd15034d0513db1078afabcd13d667882f2f3b042eee0529a97b2f18c4c45032 WHIRLPOOL d731b30cd7c2b0284a0bc90c36950486bf9da4e94170733419257908df9b3f6c0166b8154b336df321b0986393e32ad0a501401c8ec43d952582933429914310
+DIST 068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar 66508 SHA256 f91fd63a87fe119f2c3adfe021de416a6748c53af3399d6c4a6ef132a7ddd219 SHA512 9abc9d3ad65344007d5869767e519b9cfd3f55498d6e821333a39912e988d17e24a3e4b4858f917d66d81b2ad3cd97b87e49efa7985f0568e4edccfc055b129d WHIRLPOOL 76f5e62918a7c057bf1ec74289ef13354d1f1e823335089f27326fd251346408d3c7d4c6e33109b105b92caa8bccf6f7ecf7d6fb5c2e2b382b183e2ddf373025
 DIST 091957C242A6FF3AC88D00C57B1703ED2D342B04-net.java.html.boot-1.2.1.jar 58919 SHA256 3de213479f0d91bed30a124d05a7ef35dfff1f9ca0fca30ae03699191c4a236c SHA512 f1ac88ea0d7d2775ed1a3df9dac39c7dce55ce291da0e48fa6139961a8ac44413f70a73c40ea0ee5da8082067258068cab9321d05183d97c54fe042644bb8603 WHIRLPOOL 47eb3b8406f49248eec24c9e6cad88d8204beaa8a6b01c62cfd247ac10d5f49207bd51fc362e1e03025837e2be0776e6e5b029e071b5efd1b3f39c7ccca532c2
 DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 SHA256 a61000572baa9e216f035b56dc4f2b4119328e8858af5d523af84b356d7857e0 SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e WHIRLPOOL 4cba5cb7078c4b24ceec00a54aef36898ca288643c6b85c360b271b2a914e516f298bc489f9e78477411c9ecdaa17f3262381d02b360d4309dc5b9308523b7e7
 DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 SHA256 1503657e36d02befc5433a57f1134209f98f3d193ea30c9ac0553814a8590a21 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56 WHIRLPOOL 274c0cf5fa7d44701d7ea82b34758d6fceada1fe88bbea34058a468d350e1661c76f07e7ee0edc6b0c34113f7afc4540f2345e2d1bf6bf577969a305362d4227
 DIST 2274D50B71CE1090A372F67105E28076598C7076-net.java.html.boot-1.2.jar 58919 SHA256 d62972a3a178037a3653def4c4b217f10358f372cac0f47eee765e14e60158a6 SHA512 42542c7bd2e983dd965b17fadc49cc5c86203c57543adaf637c773a06b039f4254730bcffaa4f0422130f11a603210a4954bfb827eb123cf0b015a98183c9be5 WHIRLPOOL 58da915a187621caf4094422b34b059df563081365cbea092051749e5b5f7815077017498e2bbb7c99a810d6e3c6eb8134de5b7aa1eb45493ea783a121b6c01f
+DIST 24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar 26106 SHA256 c174ff56ad6c9c9a43da65ef6af3089d06589e3bdce9fd0a46a0a62dce090b3d SHA512 144ce397daeb28dcab232d80ee652851b545b6a98849594352340d7a5044b28c96142b72ea5c3dfab6e0f63fbbd36c6e0404c5cfa43408048ccd550d415456eb WHIRLPOOL ec025825f612aa44e7f8f9c1e3a8b30c21f3c3b13980043e9187b58aefae1a0024b0db5e25e1d4eaa307585d22f1bd32fcc688d5daa5438ad079464c47593c5f
 DIST 24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar 26117 SHA256 3054cbf1299563af2442bb9b6b59cfc612c52aca474d40231d43a6d44348831c SHA512 949b77bb98200ba7e05efdc76edf6578d4ba58c9b7a17f138b6aaa8495673ab865101faa63da45e4acd966dceb8171326c25ce71e81f52af672ab3aa406adab3 WHIRLPOOL 954090b55ae2c0b57cf43e9d4230a88148ab9c1c0a23d50d58013e8ffa1d1d3bc7ed1f26b2fb6dd6dd6e859b272a1ce0e37f0790a5858954b01dda6742419e4a
 DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 SHA256 94ecde163b4ca3a42425cd830c79197f22d0d1336d471ced6a8a83b07acbf7c8 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730 WHIRLPOOL beb6125f81acbe80b6249d2b857a0759a876bba677466af6d1b71b54dffe33272d3d8e98953a49e2acf502fc27d60c31eef442e19f5f63a17a3d5190c27e6b69
 DIST 31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar 10699 SHA256 555f1fda384ab2466f4ea8a6ceee918c3207fc0765f833835bf0a3ae4d87546f SHA512 80fa6c2efb84c0046eef85613ac4c0b66e22ff611621c74d38f9f480b4fc31c30af607d8a6b99cf557dbea18b61844cdfb3236026f3597a984debbe4ad4a5bd7 WHIRLPOOL c44e695c890ca53328d441a8728a86045d3892aad9f1c934ab8ef76a74f8e11c6adde7531e37fc21bba1028e3f42e54fda44823f23978e9de5aa692ce23d1aa7
@@ -11,9 +13,14 @@ DIST 448219090165A0BFAC6A8350291637618ACC3CE8-net.java.html.geo-1.2.1.jar 26104
 DIST 4F8300CCBF919EFD997FABB7666BCDBC369FB2B6-net.java.html.sound-1.2.1.jar 9111 SHA256 6b466172659812544767c70ea22f05ed548e7c7aa934d38cdcf91bca882ab637 SHA512 7a5780bbd1ab40d6cf3f46664d242f0008caeb4472a76920e260b4c84e36e1733136ce782b7deb330c2162d6cc4d4a9d7cc9df091fa446f7052e9db6e8af45ad WHIRLPOOL 191f0d8171744e45d4f8ff8846989d067b884ebf6cd18a4494bae1aeb1c4985dd0cad686ed4c288e480d9536362913ef39bbc99950b0d42a7a22d96bed320e73
 DIST 580F8767F658464D74ACB06E53DAA6DC5163D494-net.java.html.boot.script-1.2.jar 10709 SHA256 04e92a97b0e007db39ec53edc6b134d0732ae8c4b4a487135b91533fe97aa6ae SHA512 4f4dc45fca964ad9ac1060cec56895a6271f4e25a2e69bab3b3020fcab095bbed153958e07f6e69a4b050c021d7a89955e5702f692fab7d07c2a313b8e5000f6 WHIRLPOOL 455ab1ebac34cd21100aad1ef7f47f6886b3f1852eb6415f07bd7fc6cd64fe07eacca6221ba21eda9a0125b18b0c0d76e840006c71223f17763e10132a470a64
 DIST 596C9CF835BF8780716303293CF1D0A9BE1BF665-net.java.html.geo-1.2.jar 26103 SHA256 d69015a6dfe91198615610e699d5dd702a41ee4ba5feea0c17b7b6454d00f0ec SHA512 00a81677691415ebe931bc197c7a433cdc3259f2bfe0fd97e73637b8738dfdb69ce112f234ca2ab183266129175c3405863d7111fbe3f07d55c76b5c892a244d WHIRLPOOL 410ab39624f926b845c25dc2563982db7082f84d575ae0b5b48fe14998dd6a8396533390a9d5d6904495595ee2bd54b702d451813080f1bc86db13d7a72b0d49
+DIST 78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar 14733 SHA256 125d1cc1df883470c74f396c23630276ace89ab42fb363166a4248c2ddc1487c SHA512 ac034c2b06ab448ce797c9eeea302895fe70bb9661e9a60d5aac7f0e5f1e5a120763b23f369e7fa061231a176177dc9893789ecb60dd987e5c13eedf6af66ad8 WHIRLPOOL a0d65040a60cf1d4c0cfbbd9c261961d8daf10d3fc10fbf131c642110fa0d0c00e1abe2f72263b61346fac8d21b467bacd65599bed466c900fc655ab3433bfb2
+DIST 7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar 58919 SHA256 f30fa9a4f16215bc5d467abef55e1a3814fba7499a42cf46607fad26daf427e3 SHA512 b0169453140a1a8149393581ed3910c6e6423fc80ec8542b7de9de9610c44553ba2bc8ff3a296d172657e2e418d85c9bddc5f1e55cc4c3eae85276d0b5d06233 WHIRLPOOL 55e0f0f943f93bf9eeb5121e65076cfd2e5cd592b752f41db7ecf4a76b494c7d250baa2cc48e4880261821a253065600ee127f1aa648fa31bbd56606fdb45f55
 DIST 8184917299BC0E616ACB170D3B73EAB71A39D98A-net.java.html.boot.fx-1.2.jar 66428 SHA256 b5943efbc8ea518b4610d8bbde860b21733dd0392173037f48088ff578b29d2c SHA512 d80ac68bb6320f65654e383a14b179deb27235d5c8e3cc86dd89ba7c2f8b44a4cbdca76d8ae0cce2770211570a789929f9186e2f3292d3547968bb57e81c515f WHIRLPOOL 3b0e9f7a80093516a66b847de5251742e1b4bdb1958ada93f418b10cc6edaa3726881fd091f22e0ea91c87a2fbf6e4c499c0eafddb1e8e1cb225d7c20bab7e95
+DIST 8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar 10706 SHA256 e48b4a3429196bae0de1966304c6821ea62015bd32f634933b63510875310f97 SHA512 eaee1e783b83cde0d9fc86b895388a2efd07bbc032a7e0781ff698a75c7a7e8c308ed8fdcc0a5730a65d2dcf57698d8c9add6753d09884671888cc69839fbd03 WHIRLPOOL ece6aca595880a49342a4d11f5f5bbd21d9bbcceec5e473da7cbf7583328f9333aefa735133d78858b7cffcfb2f6701953a6a6af5ff4df6c05f2ef6e2b6640df
 DIST 941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar 937942 SHA256 84354aa70f995a7ff3c96b144c49b7fe90a0c6e21f818fd23b17f75b17fd1ca9 SHA512 bea8b53fc64cc3fbab1646a9235e7a9d98ffc7311277ea6a53485364462fce1b4bc9645d9f0bb6f072ee32ca730f963f7cad5c43cad052b1df7fad6245c90177 WHIRLPOOL 457ab0e25ca4ace03b91dc7feeb970a8d83f23495f06c0bb15b6c3eceae74f4ab7862aad57e2e8b0109b8cced52bd826a6ede6b31a5437cb341e9809085ee8bd
 DIST 972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar 234898 SHA256 d80c97da091ccc495479980aca82bb9ade3c3239fbc60b5f3840440ed3fe785d SHA512 889ebf198602afd574774ea3f41898f497d7f9af8e9a6397f6555d6fa7ac690e6e7e2e869e181636528f7a5b32204866e53250f6ce790d05763fcea4c8649d16 WHIRLPOOL 47cd43dd5732fe6a773ed50047af2786dd3d4ba712ae5f70c1f80571e835fbbdef68ee90ef3dde9d8e10a0e983f213656acbe287d7d6262c8a0bd0925799d35b
+DIST 989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar 9110 SHA256 116d1e95f47b9e6416070a10f00183924223f006ecc41f05ff7609605223edca SHA512 0b9cc9e8b77def8d9cc76b41c4225079edaac1e3e83d8b4b67b7d8f12b9132d42547ab89bd907ca46a6187f119afb6e1f2a7b2ab22e5928669e61f2f9b0e6515 WHIRLPOOL 386b6cb43831781be94e9ab2cc2c781302c36e55392012bb28fe17682bd356f96ffe56b9229b28a98e308070dbd6857efa036e3168aaaf4c17150306e366e5fd
+DIST A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar 86050 SHA256 fbbda04975d9d1a58245da34348b3acda92906f941e3bbeec300d455bbfac77f SHA512 871f8c565afc02a301cd696709df5c132a430691a322db3bb64486b3064396c525b4c73f1214639b79ada947671909ff644ba7f8de1b790e32508c8a7b9aa710 WHIRLPOOL ce9118204472f70eec544bc48b257c856492561da9dd7b5c436149e57cb803b5b107308cb494729592dd55b2619fdf0c758d51ca0459e213a322952c87fe53c6
 DIST A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar 9106 SHA256 7a3491a5173e53a6171713ecf7b68789fded694a622aa5aaf7ef5f558db2283a SHA512 c121b27e50a9fddb606d67c1651c8f812a0e74579e435fb56493bab2d112da408cb8521b483324b364ea9e0c8a562c9dac2fced426ac301f68e6d36a26926a33 WHIRLPOOL ab144785a5587070d19596195db1e2e937e625e74766005d1c55681226439e2cc9489a3930a873570bc96f5f05c25c39c88eec99dcf4d5298e3fe4183585eff5
 DIST AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar 903720 SHA256 f3c0ef4a908848eec98c923cd3251a5c99b5946bee3697f9d22c889192812480 SHA512 84cde632392c370c32d14e7d3f81c655956b2d1ca12b8e5638f6580e34922a9d521b3bc40faec31f96021b03f217988ec685f46757e2e9c28769654306ecc212 WHIRLPOOL 9176b6c49685432617bc35068a2f924059514f710429b2985aede2e9b3c02b8c6cf7f34d8ed04f86a6d4651fe6fca108a3eb8aa3e850dc7f78247d6027083dc7
 DIST AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip 388369 SHA256 8dc5a546c2dea5169aa31234a940035f628d561252ff82c835ec8fe28d5f14c4 SHA512 2a7938d152d101416ce2d06bce39e07d670189450a723cb298d23a1c6613c49569c6774fb160081b08f22e644e71b27787a4eb9173856cfb3d56b05bca9b95e4 WHIRLPOOL c12861342b306704f55709b2452e9fb664065f355d4e8407d8e7564c8c89725a60aa2b9d254f00cefd40af62742193b516547e7b1989651a12daf21c77ca3339
@@ -28,6 +35,7 @@ DIST E27E4D0AE8C8DC507A06C4432F85FEC4918FCA60-net.java.html.json-1.2.1.jar 99627
 DIST E3A5F2A5ABD41D2551DB29361BAE41ED8A985FB5-ko4j-1.2.jar 86200 SHA256 3383e79042783403e1c799010009dda79a3a778ace1e4baf50b143e7fd862cb3 SHA512 4f601e9d1b7d98b55c43a59d58c5e73248ef6c19f8b027e9d2a25e4e32419798c6d36b212d0725baa68f8f6ef862277f1c549df07fd4fc1c9d04d3b29e0a7e86 WHIRLPOOL 53b0c05abe4f9d5babb85d57b09d76f0421eb1c887fa3ab3e4f186139f150c1b5b63190068dcc211101671dfa4d3119fed13f5dbc5d00ec6bef5527cdcb2fdc9
 DIST E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar 14567 SHA256 32c33cc1e93823e6ef0e04fe4386a39f1d1319f4672c782558c598a5927e0370 SHA512 189d73acb3df53fcd79ee74fe6e2a91cab80af9a2793e956fb1d250fac84a9ef91236f06696a769d01e2af811b072ea53ed447a08f349944b3a6c7739fdb3d67 WHIRLPOOL 21ecf7e92be7ccfbf5b7a416875ce1247128ab37f1590543809f57e7af3d2a660ac8c97a754314c5fac946bda391e99da5d915253c46b8187f8f341c17d074d6
 DIST E96EBE549375A4FCB3FACFEBB42F553C8F108606-net.java.html.boot.fx-1.2.1.jar 66432 SHA256 ddd1d56390374535cd0357b178a1ca3ef963960115956025209cb0e2e8ad6b32 SHA512 48ae88ebd5ad847f81518fcb4826a43037f888e764ed55436a6c534759eb7e08bf37acef7bc114fb1aac86d6ba6b8ae5da87c254d5cedea89bda56c93bdaa269 WHIRLPOOL 98b0c330cafacaa8d77ff4873bc15a079ec3efe2b166cdd9df032db7e118519860a68c48b90e7bf2a1d8fa72f822b4556c895510b058d923e8b8dbbe4fea674a
+DIST F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar 99610 SHA256 2ca5e00b2a44c9c9a2c1f7f9354ce7680d3908894bccc8468956866c1f8e8ba3 SHA512 ea0a2aa2a93c96321c67cdb871ccde933e03258ad99abaa2d00ce3128a9a88f111766222b0d76fa1a2a585c9bd155371aa1385d9c3b48f429d98c7723ff3bf15 WHIRLPOOL 1a9cfa2f5bdac6717e721f9f16494901c24ac5695924e91fb1895fdd3bd601056c855c49c9362c5cd45f697d55fa246766377ca5e968587936a13052aeb203fe
 DIST F8DEDF1222AAF1F460B4DEE4F4FB6C689D7FD51E-net.java.html-1.2.1.jar 14728 SHA256 f9522cddc8d3017684c33611a334a54d4820d4d474575c3230c6d028227520c1 SHA512 eaaf86c0bfb36147cb86a2d753d73411487fb8d813bd586e5b835a9fa6ca6640646c313e27fb28161048a42b4e6f9c06d3207c01d6b0780a617163d93c1f6c2f WHIRLPOOL c4ae678b00346d3fc212cec9d2f28afa3a397a71649b42f80fcc210a557fd368c8371c89e93f8564c6eb4e6ac597b4df0422b728f4fca4b416eb80a61b0e21b0
 DIST FA012CF6D4BF8BB584EF5642B85A65544764C1AB-net.java.html.json-1.2.jar 99602 SHA256 44159ae78a5a5784f7a7e5f4534b91d0ae0a056671f33488cf02b0191ed0057c SHA512 54de7ed57e7d33019fb7c6159fc6b9720e21d4f3ceba3ceb3b9f90490dfb10a8dd4fff7dbf35800a59f0169e0d4d3476d21df00adb703cd53982f98abe610325 WHIRLPOOL 09f1b08667acbb4675e0303905b83b580b1c13c4c4c0000c045eecf05883c721612526c8e67ee1cf5507a2504948f1dbfe145c9fb85421cf721aa7cc37473278
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
@@ -46,6 +54,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-9999_p20150901.ebuild 9238 SHA256 85c58de49e8cf1c2202b5f892c9d9283587f255c58c4835f2169dce8b767967a SHA512 5d90e804870b94de49cf76db7e99bd2564f2fcd9984e9dc0b1f0ba02c5a66a2b97e0e59ad0b986d8ef055fb1184ab35998248379b76a456f576df5f87b90f81e WHIRLPOOL 4a74b24b3e8a975f1eff66d95406c629bf860b1956937a44f33eb2d92291d2dd95fb91dd8c34f730a35d6daafa9d16a67f2ed2a300c691d5dcacfd8f435b5185
 EBUILD netbeans-platform-9999_p20150903.ebuild 9334 SHA256 2e3f4bc8579db348c5b81fb1460caec924efd1c59ee4e980f0606673944d0efe SHA512 21e7cd36c60d7ac8d6ac919203d9d0fe800bf02c5d44d7f450f2005a6da86c1ec3ce50cc8a3577af144618964e0d2b9a9183f2957fdfbe087e2e5eefc4ff4186 WHIRLPOOL 1989aeedda0e97d37a5e99ec99899862d057fae52eafa789ef100c80f5ef30339a01f9155c9fb3be7fd3d91a693136eaad259b8706723a7fda51ee2949378eb2
@@ -60,4 +69,5 @@ EBUILD netbeans-platform-9999_p20150918.ebuild 9382 SHA256 1009f597af3b96aebfb9c
 EBUILD netbeans-platform-9999_p20150921.ebuild 9382 SHA256 5a627ea178bf559e7807ca733940dbfcdfa434b90edbc168c93cbc1c20b39f5f SHA512 46ba9f357d281bdfceb460de5a3bf27e0bbdb9270ac7afb6d6417bb6cde2d7b04d4ef831277242459d15e2d05420f9e6c3d4fa39b8b6465dadbd99ff94aae692 WHIRLPOOL 35e4485314cbaf58ea7bd3d2cdb05d9452f6970fd79bfcd0777960dc6f3dc7fde16ff2ea40f655493bedc12c5407f4fa2efea0c15b248b6a845f5d5df875a1d7
 EBUILD netbeans-platform-9999_p20150922.ebuild 9382 SHA256 f4ddd0f1d57fd2ab26d92115c6cc15673c53a2026bc8445cd6da72c6603bf3f2 SHA512 bb0ac8d0a726225ee56a6c4184ab2dab19c01b16b457457e6d41ddb3b0a8b38a9d1f0fe204ec687c420b072f309ba6bcc87fb53c21f3fff9db0826a5a083d9c1 WHIRLPOOL 952070bff6996a2e187b3dabd82f7dc6eb38f2ea7773a3e87325df9c21a9e0915eca8df6991133500854ed34dedd31b67d683f1dede901345d29bc1bfae7d36c
 EBUILD netbeans-platform-9999_p20150923.ebuild 9382 SHA256 cd2aab694308e65759b20a44ef6f44ef36dc0960b6bedbabfe90a0e38c4f52b7 SHA512 0f4feb08c4c722ba9780bdec1a9fc691e11544c3319884e72a75fb46545e8d62bb3c7a71a7fbc383f87364fe4293c29f1a4170804da76bf0dadd3b0b5bc926dd WHIRLPOOL 6adb9b96ab938acd93809dc56f66aef0f06e897bf6a80c7fb279a040662b02dbec6645e8138db64da2c108f6dfc73641cdb4829364de5b7f312e6ca3116bacf6
+EBUILD netbeans-platform-9999_p20150924.ebuild 9382 SHA256 0e1f7b2689bcd2efeecd722d69be9bae5fbe38d1742774273009bea6220dcba4 SHA512 af40867251bde673a40fb40090920ce6022238b99a73dcd22184ec0e7409ad09de950ce07aa9b457a11a9dd4722231a071b561331028c73d7fecf9446e27d5b9 WHIRLPOOL fed2a31403ffb222b3efa39704a62f9be72867d57c9991619d585196dbbc03f99cef68814057f9d294bd4d557f3ddaaf35dcc35535ccf95ab7262ed8aed3cef0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150924.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150924.ebuild
new file mode 100644
index 0000000..8e8f1f8
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150924.ebuild
@@ -0,0 +1,166 @@
+# 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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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}"
+
+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"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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 2637ffe..d5dafd1 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -14,6 +14,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-9999_p20150901.ebuild 3472 SHA256 2463f091c9f090fd538ea9a18cb2fc00819c7e8d8b3780e0bbdff4a426fb361d SHA512 40e7d264ee795e18ea90278e8e1d792abbe6ad4c4339d76ffbf63dd1126b0c5bedcd259741dff47c624a415aa7e8c57c3d8ef192d74b69373b6bf3ec574d6691 WHIRLPOOL 1d33cc1f24c6b8e3dca00668fa152b5956490d4eabc60bcae55adcee1c45950c02c0ab19daadb7b3691fc0bc908be618f56af9119243770298307a398b181442
 EBUILD netbeans-profiler-9999_p20150903.ebuild 3472 SHA256 9c439061ab5f353d42cd066cc5793626222b9e9e9b40b4217427498e7036ac4b SHA512 0c0cf3b94565f9dbad4cca20fb9abc672655e8a032c4d53794d9db03cde7b400d41126d3eeca82304952f488d232f041675fea7ad417b4f2faa9c5e24bead22a WHIRLPOOL 97d96c8613ed98c787251b8a0d4a556ffb47cd477449044c9dd8b535c9b632650870b70ee6816604701884a83c19f869db0256cb7c1ff83c6af986a22d21a5fa
@@ -28,4 +29,5 @@ EBUILD netbeans-profiler-9999_p20150918.ebuild 3472 SHA256 4b067d0cf88e07520b898
 EBUILD netbeans-profiler-9999_p20150921.ebuild 3472 SHA256 a3b83a65bad45a4981dc07d66052a7d1de1a1a37ce6b8f89eb58ea95cbef43b8 SHA512 ecfcdb22255d29e370263c3cce8f10380bb2a1e0e085a4845f99a5df8ad8042003e8c094c93351ec68baf77ab92a5b2c8dc7e6d565154a86ce58257f27b5e7de WHIRLPOOL 45b435b2a604a9250f0df1e26bef7127a468ca7ae39db7c39a81515173edf3472acb3aa129c428708c4c3ef88a6dc0eaf466218e3971c1af99e284b6b3866d4a
 EBUILD netbeans-profiler-9999_p20150922.ebuild 3472 SHA256 54668d243147bd6336a0fa4d6e3ff8cae77f52badc3016fea8abab711ba22652 SHA512 1c3272053939b1efefb957764ccdd6deef74ab66ced39e7333e2c786ec744a00768eced0589a9616e22627c71a07be28d72d1e591199e3203aad7c9f323c285f WHIRLPOOL f0d70717ffdef782282e6daf1b884b08f2e1dd2098c907165eb159befc97935883067daa915070969601e3cf2592c0e2c14092f53d4e241ae4c6cf1c2720c42e
 EBUILD netbeans-profiler-9999_p20150923.ebuild 3472 SHA256 8abeb38b9a8940ef502b8cbffae3bc2d59a5ec36659a120a987dca62e2a29936 SHA512 15dd5d679b6e50f571e1ab69751603a2e8810a084625c64a4324e44b1d03fc60d3fc4d7fd7c036a1de54fff7bc078e509285ee20c87645b7ae4e496ac74678cb WHIRLPOOL d98d88e28a19f5b7e0271e9d477fbbd8f3d7d5c3ea83c8bae4827db00f5b896f1fabcb14b4793e40f8707845bbe12d26e3146e316c307d3d5f82b5b0e9fbb895
+EBUILD netbeans-profiler-9999_p20150924.ebuild 3472 SHA256 8cd244916c5b32f8f8ae7ae4e3e5669b2993726139810ad5ade728455d0ad2f7 SHA512 c80454f86e45c6b7829dedd0bde7999696ac35461829a3dbc88efcc8078d54ae0f481d2e94f8adc006116d47f99bd15ab13b3c1b38086241b633b4ee603fdc9b WHIRLPOOL 5f920428cb0665204ad5acfe46349ea740b9e7e52eb0c314432eb901d54cb73c40f47b8d88f47a0dc5df249c1570c533711ce5fea95e05597b885c0cb143e56a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150924.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150924.ebuild
new file mode 100644
index 0000000..9e4b128
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 0049a9e..bdbb6ef 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-9999_p20150901.ebuild 4991 SHA256 6a58d046976202f9630b42e133fac192593354c8620dfca0bc5f6d5eefb41b63 SHA512 c7d0da7bf9bacf40c8afc1ee6543749b0f30969abd398bddc9109f18e29f93416496d0e31c837358412f1de192953972b3a4ed7f709789dd6abcff9f63b871c6 WHIRLPOOL eb9eefc3b2fa66241f1035309856f3b68c3373cd355d3d275b5dae7bef26d53a93628863b081e4cbde480371dd72a037ce275af31947069fce424c563866e267
 EBUILD netbeans-webcommon-9999_p20150903.ebuild 4991 SHA256 b12f68d20eb276d5787e83ba650885835308517e4de0553dc4bf16487ef5d974 SHA512 5f4fb009a589c9bc36a2908d16009b6d72f476e5fcbea52fd21385448a58335a033ad3e58a410173c0ac029e892db0d2ca2081ae8bd16bed98b62d121690d237 WHIRLPOOL 1deef8a500b05468cf6f3c2623cc38eec880bcaab1dae9ab51ff4424018465db71ed37c7146b289451558d54d858f4246ec3cfb80feecea0e1f42306c105b4a4
@@ -37,4 +38,5 @@ EBUILD netbeans-webcommon-9999_p20150918.ebuild 4991 SHA256 6c72305b0f1d5211d0e8
 EBUILD netbeans-webcommon-9999_p20150921.ebuild 4991 SHA256 d766edf317efa0370027d5c7672920197af090e02d52b1ddd456becaef170b21 SHA512 0c68024b98f12c9313fa27d36dde26d68b1ea0132e3c77fcc9ac61d69251520fa23874421ec475798d1755d43beb74569ccb1ff9bc7c1bed625a93cc82c5f24e WHIRLPOOL 464ba0674c02c5dd067907847fab866eac43b72da321ad5803c97feb882b426683f0d64689fe60da500391cbac3542b1cfed5be4fb623bcfdf2166bb39242f16
 EBUILD netbeans-webcommon-9999_p20150922.ebuild 4991 SHA256 4a070041fa92d6b2799622243bed699ba9caccc0d48d50a4d3126885e9fba47d SHA512 0c0398b4cc14bba3820b49ba0bc9ebe9e3ef7cca4e5797019a24bbb0548793ab6565630a4c51e54fef296ebafae0e8ecc1afa6fe342f16af1293292f7f8183e6 WHIRLPOOL bf1d8ed3faa587b1dfccd2d50dd83e63be32af546d96d837e5ab6ca1ed6c3afa513527a4a1dccd9ec19c8f351c6e6cfefac9758832806e54b7a591707298cba2
 EBUILD netbeans-webcommon-9999_p20150923.ebuild 4991 SHA256 14ee598db88d74bf19ef1ea8f289fb22013c7cfb2c1e6821acd7bb3d27c820b0 SHA512 abb3c419ab471779d55fcb5903ba9140e1d140ea95324c8f16b27cac76d58e85050f743d072ab50d626039f18b626e965788af76ca6f1f13e17d7660738f1248 WHIRLPOOL f2c55428d77b2e88b3555625a8cf2f98b31f0818fc73a41b5b05d252bd88640cf2215f35012204b472104927ddcf56ab2886c43c89436f3d87cba328cca4a840
+EBUILD netbeans-webcommon-9999_p20150924.ebuild 4991 SHA256 38c67c9551280d6d8790566e51f76d134225d8599ac9759ed0858d655af738d1 SHA512 cff4c7e612c2056b3904492773ad6d0bebd565608fa62f4ae5befbc1612de7bb1f58176122055a00f771d9473a4c6fc78a8d87ad16891369fdd1855d34fb1f84 WHIRLPOOL f9c71301285e959a92905069412fc452cfe4f6c1cd8f599f34fe8bf99c6972b842d74eb98779ff2c35f6b9f612900d09c3f61b856e621062e30ae05d2b74addf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150924.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150924.ebuild
new file mode 100644
index 0000000..fd6711e
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150924.ebuild
@@ -0,0 +1,123 @@
+# 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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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}
+	dev-java/commons-compress: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.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 --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	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
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || 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
+	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 4ee39dc..b494b63 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -14,6 +14,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-9999_p20150901.ebuild 2721 SHA256 1b1853b108ea504ea98052027c51e2ab8e55853bc016e1b288f7d5fdfa937ba9 SHA512 f914e9d3d8060c6740ab305233379a6c5cda835a09d1ad9c2d5e4a37fe7154f560899b4dc4e375b4a1d8b724102b522eb02529d65ce562afb914cdabbeebceff WHIRLPOOL 2eb7a4627b93b6bb8bbc033a6e941a64452a5c6377e28b86abcaca6b6be76ddec7df0950e7ef5234f5e3d6addb3dd191cfa00f6fc18b4442a2d7c1e6b27fa19b
 EBUILD netbeans-websvccommon-9999_p20150903.ebuild 2721 SHA256 5b548eaf95bd714f2b32bdbf189f8a5967ebb9ff9f4472b7dec07165540a4bf2 SHA512 d4e19899b1df32711eb649b10bb66ee7daeb463ce87bf330f3405e02788e7acea6a8573aacd2f17c5e09c93762e627dfc88b1f331c40280761cd0bd1d2b0339c WHIRLPOOL e6914d11ecf33f57de66f4bba5f8689f0ffc0ff40df29ec98cc6a0b731cf7c73096124e67433205a3fafaf744cc8b9c0a0361c905be1823b0dbde7e85bd52a66
@@ -28,4 +29,5 @@ EBUILD netbeans-websvccommon-9999_p20150918.ebuild 2721 SHA256 eff32ee9fdeb23e20
 EBUILD netbeans-websvccommon-9999_p20150921.ebuild 2721 SHA256 5f7793224e714e9ad4419bb3036abaee4b34986dc98818b5aaf768d601f61ca6 SHA512 de16fc77d5346e7be4968c59dea5eaa277448d0647c74deb44fc8525efb2a0f3007856b9e669efaca6f5696f0ea19b71c61dbc4777e2e923e8e5e5a71abe3072 WHIRLPOOL a88754591a6ccf7e7856b08cfd668c6d70854ca54d15493f60bde125c8e5a68a867c38af2d38455a76103a84961a17abbfe4aaafa62236fca6640ab224780ef0
 EBUILD netbeans-websvccommon-9999_p20150922.ebuild 2721 SHA256 fafd322e6c62164d0f526e55d2cb627d8fd7fe58ad23727a917a20c3183aed99 SHA512 8df2f3a7ba7d0b3c00a31bd8befc118396e3a73275a601561971e6b0c150eabff384ee2eeac6952d91c63afcc2e5dc01f2b85a63801216c41fbc41a188c4bfae WHIRLPOOL ebf842b2e6b08c67aec013c353d6fbc008d69457116669f8127657498ff573c7d20d4412544292e7e082f2a8b9dca3cbce555bb5b38ecf0a0db63b5e88b8f77f
 EBUILD netbeans-websvccommon-9999_p20150923.ebuild 2721 SHA256 c981186dff431a882db2c04281d3e3d4214af096bd17806d72312dc702715d53 SHA512 33762418c6d77658a0f9d05bcd42b4dc881aebad00bdd82bd3c1e18bb716453a2a7495b3f32a249d4ec81291a60ffbb0d9b9b8fcc482d99f29a68facfdae131a WHIRLPOOL ea4156cf4a268c00f80802b7e594e365dd529193b580c040fa3370a8f5c4aa95a1621c5b19313f25d1ec55277d3907dd11200824e854a81331a0d44d4d41a9d6
+EBUILD netbeans-websvccommon-9999_p20150924.ebuild 2721 SHA256 a4643b09c82200531133182469c7f8e181990abfe0f2763a377c67d879ce3cf5 SHA512 eb233c702a2dcda36d17c53413c4e1ba35035f8d012843371e02cd3bbd3ade6c08323034b4cf903fc67693b1d42e78f3b658efa9ccc346f49b6fec767aa922b1 WHIRLPOOL 08da3b2be3fbb7bed75adbed5f349aa4a420d0d0ab4bb7d420e2c8c6f67dd6212e66acfe189ea5540eabbed195a91236c06d5c1cd66bf85361ff88e15aa37028
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150924.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150924.ebuild
new file mode 100644
index 0000000..0826954
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150924.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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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 b258174..ee0f7e6 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509180002-src.zip 209190887 SHA256 9c28f2f80aa16c
 DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d968bdb1686540706a5bb322b5702a1d562cb6bd60eb649748eee SHA512 794eabc729902f1d44dc44bb6a64a2a2733f8ed42074e1c36988f444dae84f3e340e24e6eb284e161c54878b292a1f14253ac0ede39e98664d6e663bdb13817f WHIRLPOOL dcd36452a01028378fa0d6e5f1ef524c13b573cfe0fa5d744f880d1cda4ab69d9b0671c41b77dcf269cf2a4b2eb8867918aa5b0e06b6e3bc40f70fa2a264253b
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
+DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-9999_p20150901.ebuild 7210 SHA256 aa601ee01f6fb1485234688933becffe18ee2d30af5045951a2bffc2f24f849a SHA512 98f00da7d90c3425cd718c34d65aa46980a9c10f50dd34a01a1776d1a1488e92b9e657210f61e45724b6c9358a36a44a2fbf8ac5b7012012d163c6c91f7ec421 WHIRLPOOL 008820f5bbb9077bc739629262c1e24bbece9c55b50c270c76c3900424ea77e0dca4a33bdf32535b506d61dacd951f65d669485321837dd83234404ad9143594
 EBUILD netbeans-9999_p20150903.ebuild 7210 SHA256 73a22280e3cd8d717bb224ba8c243faa59493011739522863e3e93b83def156d SHA512 87214a421b60dbe51dd45b0124ba463585096fe7f7820fa48e0cbf7d55b3d3080645ecd9dbd4679d7968a9b90d1ed60b88bbc3e50109a00e3c2a7ea8192ef0b2 WHIRLPOOL b820124da7676168df3529566db7b2ca095972189a1ba848da238caae7a93947c0c664af310edc722146d2daaa9fdab9bbcc5b3477207664a5193c003f289c09
@@ -30,4 +31,5 @@ EBUILD netbeans-9999_p20150918.ebuild 7210 SHA256 f3e860cadeeea4ae4b1f602daeebf8
 EBUILD netbeans-9999_p20150921.ebuild 7210 SHA256 6082e3fda2dc38e27ef162aeb321619770435a68fad1a9bed068e0cd2458fc0b SHA512 3f95d0f9a321f0cd370011f0950281362d061bcdda8e6e51b00054646984b18193166a2fb4afc6e558220570deab5cd9864497a41ffd4a3232760b3e98234d1e WHIRLPOOL c706c2220710a49cf94c5f54f5517939192b6b310b5fbc31355fad319945a706a0c4c296ae2fa698f61a724c450bfad90505b567363d54ea7a89a8c3c033170a
 EBUILD netbeans-9999_p20150922.ebuild 7210 SHA256 63dbe335824f0935897662c98b3b659c84ac03666238860d1f230b0b4aeced86 SHA512 26c6cd7cee9e61d3143be21510e14aaf858a8d9f2a9d63fe348a5a5e393f45c43ea8d7c90dd17c065ec671ebfd1afb37836c9ef445e1c1fa7b2b5b66dc75b72d WHIRLPOOL 0aa977abfae83cb975fb6ae31573ad5d86406f306040b0eaad587cbc3f4b22cb3bf0d90295a79dc98134b0870dd560ca04fe0b332980ab2855d5216045e55a11
 EBUILD netbeans-9999_p20150923.ebuild 7210 SHA256 bfce43c31ee2c757dd2e60427f24562f43f8ffc4aca2a26cf3d208a712f436fb SHA512 b492ad6dde414079f76c4780ed2b26e5fda004f6527c69ed85da42cc72d92754bfc6734c831f06ad9a2a512d2e355745e1f035eaee5067599d3db6af619b8849 WHIRLPOOL 1cc85824b97d53d7e69e4f11e67e8c6393003ab349739e9c4125163a77cd259e4b267d8d46f7da6d2aeba530e23c5de9776584959ae4606a12d1f9b45a207f3e
+EBUILD netbeans-9999_p20150924.ebuild 7210 SHA256 6cd02bda976b99813c50c9cab0a6924a4645693887232c5a36fd30fc84fa0671 SHA512 fbb72dc71eaf222879c7a85e82452acba22faf4a1c44bf741f8d9a2a705c5459389d30eef51d660d61826368df7cdd335bbb1df7661fbc99491091a5bbecc168 WHIRLPOOL 9c83e6d1a896410d30b7425de17649910c4a3ffa3855113503351fdf48eae79ef6359a77247bc14b08f30d7306395572817e10b3c4f7d22ef605a7d3f4a7878f
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150924.ebuild b/dev-util/netbeans/netbeans-9999_p20150924.ebuild
new file mode 100644
index 0000000..d4c5a09
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150924.ebuild
@@ -0,0 +1,264 @@
+# 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-09-24_00-02-28/zip/netbeans-trunk-nightly-201509240002-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_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_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_tl? ( ${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_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_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_tl
+	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}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		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_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-webcommon/, ...
@ 2016-05-26  7:32 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-05-26  7:32 UTC (permalink / raw
  To: gentoo-commits

commit:     e94117488cdee2c75160a30225399dc03d090f4c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 07:32:28 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May 26 07:32:28 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=e9411748

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0_rc1

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20160526.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   2 +
 .../netbeans-cnd-9999_p20160526.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20160526.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20160526.ebuild      | 266 ++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20160526.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20160526.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20160526.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20160526.ebuild         | 114 ++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20160526.ebuild             | 382 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   3 +
 .../netbeans-java-9999_p20160526.ebuild            | 280 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20160526.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20160526.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20160526.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20160526.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20160526.ebuild  | 128 +++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20160526.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |   2 +
 .../netbeans-platform-9999_p20160526.ebuild        | 167 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20160526.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20160526.ebuild       | 124 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20160526.ebuild    |  94 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20160526.ebuild   | 254 ++++++++++++++
 42 files changed, 3311 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index d114c3d..0b89265 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 3384 SHA256 e866d9fd43d85c959d598d6111e061a3138aea2a9133f516f547a15370086e3a SHA512 cdf600716d69e7b50162f7556e2f70c6cfe9c998c94529be32305cb6bcf732ff568cdb7a3529478c12c72693a8aaa3edd10b2e752f875f6a40ef9599daff9bc1 WHIRLPOOL 5571ecd51924a63326a4759bdd584da6e7c2e5f9b33b7eeea01e4afbd58d6bdf6360e964896112aab5dde57c7b52d136e37e35f35883f3762543afb28a84cd42
@@ -49,4 +50,5 @@ EBUILD netbeans-apisupport-9999_p20160520.ebuild 3384 SHA256 34005593cbfb3b9d88b
 EBUILD netbeans-apisupport-9999_p20160523.ebuild 3384 SHA256 f76c765f5b6be907e69359208b301b763b9cead85ce3242de7355994bd9ba315 SHA512 af4cbc420ab2e2d4a637be3214b1b24cfea752a548072cae392171f06445e80ef797740ad8dbdff177f499a2b3ea21a25050c83e2949c9e9bef39514133b7acc WHIRLPOOL 8754d4b8749e7f16af2ffccf046e893a9839f0d9a02226c9ed76a8f0608668bd5527dc58fd4e8338c582aec463d46693eb9e11bbbc5ee106ff29c7ee6fd608e3
 EBUILD netbeans-apisupport-9999_p20160524.ebuild 3384 SHA256 858055c7b5e948650088777214b2c0bf4f4e3c42f5d3714442ec88dfd0a5ca4e SHA512 3164b84135269d0c6bf5ae620acb233faf3705a9436573f0d19ba0a54000f9b624720a85fad2c46c9cd7258879312e98a27c00aac895939fd2905677c60b3ed1 WHIRLPOOL ff21af1ed0860a4d13c7b5a179adbc8089219a8347fb0d82178f7e7fc34f1b4a90d2f8025b00e69d3fc5ee57aa1c01ed5a80383070db8f813b07044ff84d1b49
 EBUILD netbeans-apisupport-9999_p20160525.ebuild 3384 SHA256 5c92c7fa7bc62ba8307fc6d7dd2e78d79244dfef612d5202a76728797ff9b10f SHA512 17c9035b035265e36e1473767d44f0a4bb04b624525a48284f247e095ab3d2faa89d9e34071e89f29186669fdf8d4c15ac7fa72fb5be419130624cb5a98392b2 WHIRLPOOL a172f5a7425da13aae19036311d46af5fcd11688994dd3ce6b60e2510475f98a0abd7482df18b558b4ac5b76105d72ef9770e184ecde06cf8f5dffb36fdf9905
+EBUILD netbeans-apisupport-9999_p20160526.ebuild 3384 SHA256 78b42989812c06a312a216ba4d7478ba3ac8ff3553724cf8301d5bf50e00160a SHA512 d9b856dac4c202eb279fefcf3354496f48847c2e62d054bc2cd6f983d3b6ef108dfad5f5a962fe5d938619bb1168864227b529c0dfe9465f3bc93199c379e859 WHIRLPOOL ce2799381ebcbb851d972b5c93a96d40cb65eb773ec7ba787ef1c36b15fd20a89ffa561ccc344c2dcb9bf273c1d4e8c5e6e7baa72a174711f47a8cc8db87c645
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160526.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160526.ebuild
new file mode 100644
index 0000000..2a592f4
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160526.ebuild
@@ -0,0 +1,111 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 8a269ba..fce34f9 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 4790 SHA256 af153a0e0435678331a5a5a43c3f393786a0f804dedbc7fbccc3b539cea583bf SHA512 cae08e9b98753c358da559fdf3387c860fd8ba8a4dd5d787f843b4cfe8f1aacf9bb1d57be5b7e52849abcfcc219262b8bcc338a6ff05451aefd2e434a4d86eee WHIRLPOOL bfaf9faa4bbed952d542ec45d51daa200bb307a922889ad6b586fec4f3386ca995ca1dac974e789a072abb4d69b58ae7c0056086966329af07244a23c0924370
@@ -62,4 +63,5 @@ EBUILD netbeans-cnd-9999_p20160520.ebuild 4790 SHA256 aea56249c25d03dee37790e184
 EBUILD netbeans-cnd-9999_p20160523.ebuild 4790 SHA256 ab62622126d237d801b7908c31c46da75943647053dc767da722c15c36c033c9 SHA512 600b0ca47dda255328befa12d2f615fb1bb4b4c598c2a36ce776bf38ac04a7fa1b037166aaf5bb9a8456c86ff278a20df09f7289a0b186423a78a07b170654cb WHIRLPOOL 47c173f4be068aaab6e855f0e19b58ecca2dacc73d4589f64928bec18aff7c6f9c921f3daa1c4790edbf94d63dd67af68847c93ea6716cf77cdca4d83baa3031
 EBUILD netbeans-cnd-9999_p20160524.ebuild 4790 SHA256 94313c08616c78ef379dcadff297cbb48e66866c46accb09dd2a6b830360126b SHA512 672399ea6c91b5fa679dbcd67d3cdbca75ace237d89e2688401df24753b4f6e2a42c707c1255138aa8a8717ab51b4703c7c98db28cdd4ea8751dcb0d60c01c05 WHIRLPOOL 6cbfe5624a4b1c42ee164f23e2f3565060039ea547377fbed30c5b6baa0c609c79cc12c712fe5dd13d0f6f8adfd53818263bfeb0778e65ac8681295556b72b23
 EBUILD netbeans-cnd-9999_p20160525.ebuild 4790 SHA256 0f486830393ad04b308b301b296c3c9ae58b69dda5b981a7d361163d71dca2e1 SHA512 ec29b39e18855fa435fdc493e654cc61eb8ec2874ddbff7438683891abd736a04008cd5452014f2c14c5e950b7fcedead08568f1f3f9e6543aaef90de3c46816 WHIRLPOOL ce3cd3bd01068741a83e6fe3ce9c2b902e9c5daad9e73b7f6e310c10f0299250768a4d31baf065ce6897eab6f6b83777c30d2380a66ff4fbf06a99ef2babf3f3
+EBUILD netbeans-cnd-9999_p20160526.ebuild 4790 SHA256 15c1efdf697e4eec5d827e580c4d2ee6e3ac3308a0184fedf3b882ff16abc55b SHA512 055977fc46ed6ea306c43a939cb9a24deec2764a881ada5a32d15f5f8e06024a628785d71827dcd331d0ae8d0aea8e89a780ae3a09e6a24a5a1aaf1acaed3ba6 WHIRLPOOL 1d04809ee29093158af062fc7e8e3f9843bc11d51c439c7b47c45f646f4a21b9f5231e5bdccb6e168fcf30b0dfb613c7ba4265c014b298cec68edf6276d33c02
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160526.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160526.ebuild
new file mode 100644
index 0000000..20b6755
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160526.ebuild
@@ -0,0 +1,127 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/2B406087CE1AF289539768BDF36F52E63F69F1CB-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}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/2B406087CE1AF289539768BDF36F52E63F69F1CB-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 9062059..f607778 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 2968 SHA256 a78d9fe846d94ed422c84a3dd06ff9b4eba872d64ffd217817f93f3bface22ba SHA512 c8ba6923704e00c0da015c99217c078e2eb3b548fa80f0a17d6189e94e7781ae57cb5c9a67e3921fb1c4dbba717b73cb0b56542ad247c0ec740578cf981ed78d WHIRLPOOL 6828cb5cd0d0669bf1114d12f86dbc386cb3f49df002501b61bfc518c507882f961ebc63cce7e9d3382961189be71e51ca4acedcbc93c9d7547bcd93b9f36750
@@ -52,4 +53,5 @@ EBUILD netbeans-dlight-9999_p20160520.ebuild 2968 SHA256 fcf7b66cfc097ba54c648b5
 EBUILD netbeans-dlight-9999_p20160523.ebuild 2968 SHA256 7658035cfd5d24282c4ee1e79439d51563016cbbcf13f64a87fe67079a2126c6 SHA512 87281290a2b1ba86bb668f709248008b7f3ef1451bc8c2379d60020373290803ef3a43257819d196e45c9321e6e38a10edde69ac160c9bb1a9311f661a54eca8 WHIRLPOOL a0db1e947063e13cec47a9bf0f06960adaa4ddec9411ee1c49053f1b6daf62b8fcffe67e801f64d3d59b5598e16a4a3e354445f689fe9b67caddb97d5e4a2dfd
 EBUILD netbeans-dlight-9999_p20160524.ebuild 2968 SHA256 35c6280080aa9126fd327c5e6c797698fd759b05a0aed735f8b1bda9044bf7ee SHA512 30132947be0bc933297179624d3bbd3a070817f4bdde1d8b5ff7451b70a3baf7a4653b3c7ce81785dad0985e333578a44b118a82cfa1112030a1acd97e89ccc4 WHIRLPOOL 9c742a377ccf95bae5a691dc1f27f94d87494eee0f1247cdc1915d85b14ac7bf4df50501bc46b7a37f6f15c03ba3b63522db581ab47827410538d6b4c68eec00
 EBUILD netbeans-dlight-9999_p20160525.ebuild 2968 SHA256 b225c348d11bfc697fdd2dba0a17c03278307a1d9f5b628b0e23d20b5ac037bf SHA512 cd3b639b78d11f459e4fe418bf8753c503aa4fc35c47fb30a01da3a293f0fa7eea1fe0cdd008f1c723c21ac89b9a75ec359c8074485d04078ccba23af83cce6f WHIRLPOOL 9daee93c1a50b6718896f1374efad835869abfdb5f750efd40526bd616b3a70a4a486edce04f5bfe8297e96bdab5bb2e9e05da5f14335a23e7c963da80e34382
+EBUILD netbeans-dlight-9999_p20160526.ebuild 2968 SHA256 627ff0954db98e43e9961942b65ed75c2faf99904e31275ed290f72438142738 SHA512 a39dfcf667517f62ec637af1ea16aa7481e598016e83201aec40a0414bbcb60e8e00a4aa7f407358a1c07e93dc915444c1913966140a45d7b23ee0bc59fdadc7 WHIRLPOOL 6667817edc1d8e81d2ddc9d9304c4cd12f2af1ddba13c534427f11183fb8e241bac9bc4d4755f19d53163beeb0bfb0d33535292b6c56fb77fab79064269cccc1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160526.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160526.ebuild
new file mode 100644
index 0000000..4892baf
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160526.ebuild
@@ -0,0 +1,101 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 1787f0c..a4e6624 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 15825 SHA256 d36265c231f1f56c998acc0e6268f1c61be91492a9243785066dbbfc6ff3053f SHA512 c7c3a2ab27a93d457f5f95341b6e740e66ee57dca0998cadb6f97842084a2450669fefb0bf3611c52df23b266bef5004b916e769e2fd6886915705729d79e91f WHIRLPOOL 8e461fad4f405bda6a70b1024fd9ef18b8070deda66b328838cd1eb6b0665727553075222d489c2f657eb286da8c33b48f1de347efd514f28860c8aa397c076c
@@ -81,4 +82,5 @@ EBUILD netbeans-enterprise-9999_p20160520.ebuild 15825 SHA256 0f8e199c137bef252f
 EBUILD netbeans-enterprise-9999_p20160523.ebuild 15825 SHA256 986d8870dcb7b14615f3ae22b93c7910f73850579e92383362111fd25194aad6 SHA512 2d0d2f8bb1bb835a27a1b98dd27744ca65a53718df5bb63904da00497af3396fe600fedaa2a5aeb567c39e772dd8da67d8cc8052e937804e29a9f66af7e0548a WHIRLPOOL 65bf7a26ae9992fd9295784b611acd0844b50a6eff201c81ebe563759171a1c09968698b5a23b7dc4307acc55a1d09079c22b52ca5e7a316319cc7d13651e0f6
 EBUILD netbeans-enterprise-9999_p20160524.ebuild 15825 SHA256 bf474e5c436d222226dd9a4ebb123e1ede4eb74d0b5fe50cab59faf134700ef0 SHA512 b7b496a93326efb4e6918aa2f1e62cc82fa7aad14a2285e480e8f7fdcba7e55a951a407b1aceccb4618adcb09f26cc54236d7748b161251c2e4832560184e3da WHIRLPOOL 7d6c7386f76cdce1192b8aaa02499dd0e8b63eb9baa734f6b865a3f221cb93b8a1e71fa42c18e67bb52180a5c4e31c1a0a355eb76dd550ac61dbd7d2caf235bb
 EBUILD netbeans-enterprise-9999_p20160525.ebuild 15825 SHA256 4ff12331787132ba2fcf2a4b7c78453c63bb4027f56e3a66e77cb12bcb596ac2 SHA512 08d33fc45156f35d33a977fc9f66f62943cf5f7726527603863f764a47403ef3312d1cccfb3289a2c605180180bd558896e186eb5c239e51b15e9058cef4cdc7 WHIRLPOOL 6b0bd69269a851291f6c9fa4decebdb2981917d7254a92f1cabdd77f48ecf7ea8509877592a9a49c352c39b482c0ab73b82125edd29f5b97d4cda107c52c97a8
+EBUILD netbeans-enterprise-9999_p20160526.ebuild 15825 SHA256 95734908288d5bc9cc17af2c0906bda2fa17e50f24dc295334a339083d95e756 SHA512 d85ff9ba3e3420832b65f6863ffa352b3cb9b28dbd33e2ba110c0b7d15a0a68f5546341d83e6e18419c3c33feb8f95dda6bb0839f3f852733f0e0d0ce5657cc1 WHIRLPOOL 77c0a24f3a1e2da993a1c01cc67a216f011bb877f4afb9cea648251b73ce34b80ae5fc692a2b3236a965bfba95b0d7700764eb7429c45cc1abca7b4e5305dc3c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160526.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160526.ebuild
new file mode 100644
index 0000000..be7bb38
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160526.ebuild
@@ -0,0 +1,266 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 54e2746..f33a166 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 2913 SHA256 03be7f911ef9e0cc84ae0c302552ce8755cfb31022c087e620b214d4becdef0a SHA512 4961338b8b363a36000ab2ee47d567bf8bf7fdd7e10d63c046f9b1d00ea415390e1cfeae5d02d6090afaa5ab45f7c05b1aa3fc071f1c073eaacb288eddad4832 WHIRLPOOL 110c80e66dfd1e0f880f50fbbc8795445dfb62f6c6b7424b0791067b9b28c58979bd7e56f4df31d3da8f86aa33df43529c3d3f1c795ff14424e8530176c7db46
@@ -49,4 +50,5 @@ EBUILD netbeans-ergonomics-9999_p20160520.ebuild 2913 SHA256 59572d01bee019afee3
 EBUILD netbeans-ergonomics-9999_p20160523.ebuild 2913 SHA256 96364969034db64a7702340b43441479c115d6bef57f57a16444e55a2e5f7edb SHA512 1721c2b13533f4f14eb97f39574c9e6e97eb1993fb59b807e0aa042f2b5520607a3b4e7e7e7b66127a45cc66d02f9d217f7ba78c0e88f3851aa6ec302211b5e9 WHIRLPOOL 4818b2d9650dbce3a37720a4798aced5952fcf539820b04c09dc82286413a21aa7c0aea19b3cf28d2d52ebf9c8f569670a52793d61b03de4b04b7b671ff91861
 EBUILD netbeans-ergonomics-9999_p20160524.ebuild 2913 SHA256 e7118a3959a7a9744d7f3eb4bca6f5c6b2d9f7b070465231ed2118b0bd253a34 SHA512 db84ea220a17daf6d42762aa4c1607ec7952bacd08c4ced0e3e17b4e2401fd8fe308c8dd31366e58e6ef468a61dcea4219b6426e0012d4825ea5620cf5385dc8 WHIRLPOOL 51ae1779ee228acab3d29c18ab0c7b6e2b597d5fe78e1876df0e5c13fa73e91d91500ea68abdc32756fec85e4316d20fb70ac059dacc53bc0d9d05e76f32facc
 EBUILD netbeans-ergonomics-9999_p20160525.ebuild 2913 SHA256 562acf2ee31be2895a3a7a4f6a3349831079a1f8a6fae08426dac651c257a7e5 SHA512 ffdebdcb5a18b9458f38f2964745c51cf762608a8626b1cd63addd90a025044ac520013c58b748aa5e543a864d81dfe470d6bcd874d28b2c31fd1ab8406ec39f WHIRLPOOL 9ca3cf78027d875252076335072198b719fee96365ffc73fd613f5fc30932d5f047985771211be7f87210e02cf6a208a004f8978e50e1ea2466cff458dc0b6a4
+EBUILD netbeans-ergonomics-9999_p20160526.ebuild 2913 SHA256 cb90adcc4199e00b2781e94bd34c5ef0c05361dad1bb389b9a583c2ea4d83a36 SHA512 bb235a9b2421fe6369e5700c924c66a19c8a4798f133b886fa87f2d0213ee41eb9902b602d78d766a568b355f8178ea445958d00af7dfe7bdb19b2d37e96723b WHIRLPOOL 50ef76e33091a3c40e8b1791a273a9525210f02a0ba0bd0fdbdf69182d2a709c01ca019c01f12c84721c1427dbefcc9ccef4af2c22670d35df703d5c72d4fe38
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160526.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160526.ebuild
new file mode 100644
index 0000000..2d2cc32
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160526.ebuild
@@ -0,0 +1,101 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 c240fda..f35009a 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 3377 SHA256 b69e4995f884a7524e29274702b2eb3851dca8a7c74a618d98725fe26f951332 SHA512 c8fc3c04d1fc7b2586bcaa5972b1f40ac94b09097f4ad0333d50e9c494f2b2e131dd504c5a274d0b130b1887e2ace51eecca46f20fab32198a123591e6fde228 WHIRLPOOL d921c10e7a80ac065dea04ff546b5635eb8d251a37cc0d8b7533097cc4fc28683d3a60b1b9bb8459b1abc4878fdb306f07db6d80ca65e92dba9543b32866f412
@@ -53,4 +54,5 @@ EBUILD netbeans-extide-9999_p20160520.ebuild 3377 SHA256 bbf2702b637a6f6e1760c12
 EBUILD netbeans-extide-9999_p20160523.ebuild 3377 SHA256 712e59370d3b3926be6b8db5b6b5dd49c56c4f265ae63abc8b68a1ecdcb77f9d SHA512 d9706a5a1dc2b42be4964a3890b057acb13be0e4cb1b3a4e66b8b2ad4efb54f784be20def8dc56baf4ab69b5b5fcff67679bb58d05539ea4f26e735d01cbcb0d WHIRLPOOL 6ca5380f5ae2a053bf5d289c740c8228d2030b1114179bfefdaf63c694874d235240af46e6925022749f585eecb255b050e965379683326ed439baa38c3a8e2e
 EBUILD netbeans-extide-9999_p20160524.ebuild 3377 SHA256 08bd414c75637397cf46bd20bd1456f8ea89f920191beebbb8ff69f9c61f21ff SHA512 391c61e83b3ef036b4ff785dc36f4c410695e913dfb059ca2b11f4054988793d1fb85b734ee3c579cd67a8e94dbf71b9e3400ae52e2f3e82667f55e0f66779ab WHIRLPOOL ec73c7236b5e02199afd4cbd0fdb2919ebd0236a52f185815971abdb8b30ced338bd615941d8d0fff098f70a694a54cc6d19d445b9f04b0357533a98235dbcba
 EBUILD netbeans-extide-9999_p20160525.ebuild 3377 SHA256 c454ecc26a6f7f4312f3179add42fa23702e2f5c81a5dd65a6c98a861ad79496 SHA512 bb4d8236ea72d6a7f76f162d22d6cb37639cd30320a72429bf2138653a3aeaf46bcd75de2c2613e6ff2b7c2a54f3f42c5214bc09b14d7e90eddf67735dd941ab WHIRLPOOL 0e0ce9feef29059c3bf9beb052bb0e137aa8c3304717a223c54e9d36654f451b75761804cf083b95f3ba95c30939aafd003c4b8c1288f9260c1c1428005219bb
+EBUILD netbeans-extide-9999_p20160526.ebuild 3377 SHA256 32ae570338aab8acd5f5dac7154bba217fb1baf507d24e6d2df7c13c0eda06a6 SHA512 0c295a66ace5709c4ad71569f32c645de4bf39f09ea308388becec3b55753d363763b2e22733d234992e0471b0ffeeb1ed94d69e2121140519434781c4ffdaf2 WHIRLPOOL f478663b9c91a5f4400286b714cd49d9efa8a2d193b4c0209926b062ac9f35443d7ac620712112dab3448139bcfde744c5fb37767e2530a9ebecd0ac19c86796
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160526.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160526.ebuild
new file mode 100644
index 0000000..adc2c63
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160526.ebuild
@@ -0,0 +1,108 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 9266a98..0847167 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 3416 SHA256 e79a68a525a8e7b9929f6099fcd1e18066daf75b72d06556c2fa24ad49c5b998 SHA512 3d2b217ce426091f0f3cbc1f3ea8881fa21c5bb482da2830349d1283ab9192354100b994b1a3ce4cb86265356035b417e1855d3a50e88e13cd41154bfc00c83d WHIRLPOOL 72d71a968c86d7f7033c35b624852e32dfce945c6711a74b30ef71f3f017a6fc9ff1dfce9c57e1c4ccb273f60c7263dc221fcd7a26a0ffd2acaa4b5f44c05450
@@ -51,4 +52,5 @@ EBUILD netbeans-groovy-9999_p20160520.ebuild 3416 SHA256 d2865c4666b4da0d60c55c3
 EBUILD netbeans-groovy-9999_p20160523.ebuild 3416 SHA256 53858a9940b83578c2efc16b35fd63ce2520fc1cc58f8bf7b93e28383ace5820 SHA512 3501a897b4c3618b7d98b90870b80f4a03fb6e8bdb5c3b2b78b1c2aaea3321ab8cf42fde5ed5d89cc4180a34f13f5e8b7218e04cd8fd34c57500e61aa1c59631 WHIRLPOOL c5a388e0b7e1901be94bce3079b106b9947d6bc57a1020ae8bd4337dd448f97a7d7198d419936cbeb4250285ce02ef4f4e9cc2f3758aa60ecfa82a59cc253c97
 EBUILD netbeans-groovy-9999_p20160524.ebuild 3416 SHA256 8f9e03cc4b86206003a9904726fdc08fbaddabcb728aa7411f3b7f3d388d3712 SHA512 834cb5eab5c1bd0fcb7549e602f3fa5f9c7b16ff90db6fb977d7406d6e9daccac52b6b5d392391beb5dd0bf0ef437d61cd539c4309fb4580b328d129e9e5be0e WHIRLPOOL cdddeed39736642b9b1afbfe693eefcd94c576b91e9986760ac78e407d00213f7a5561fd695b15986dbfd65051a28ad575a80839c6ae5ee5f172b367a144cd8a
 EBUILD netbeans-groovy-9999_p20160525.ebuild 3416 SHA256 7c55a64823b7b6732b690e2111d36499f19a34dddc8c083024735855c61c808a SHA512 4c825d11ffbcc635786b4afcfd2d534683164b41da4ae76e8cfa72faf8947c70b6a5b0587f7edc9e132e0e70f8290431e03cd34293ca8f0474163fcfef63497e WHIRLPOOL e37e19f820e33309163a5538e1a8a704530f885b396401d7a53b1d32e9f9fdd40abede3ae56b3d2a43563318eff16cef4750033b86e9e22b12664da326d4bc8a
+EBUILD netbeans-groovy-9999_p20160526.ebuild 3416 SHA256 be1ee8f717846b15a238066b76cc786a50cfff7753ee71e63b121dd10d44013a SHA512 ff10317dfb02d9ed8dbcfdc42ee97c5860a6122feaa5393078f4c5605fb386a85df7b18c4e163d9d2d87a53d8f6b55b5171ef05dc81307d804884c4879dd6f04 WHIRLPOOL d09c5c26b83863ec3608941b9fad7dd34f8d7f4b1dff1b34035d151033bf0a201aaab8b934aca4d5f679df78f6e95a879a26b1e164a9f05b6682c007de4aa11d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160526.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160526.ebuild
new file mode 100644
index 0000000..4392a58
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160526.ebuild
@@ -0,0 +1,111 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 dc10b66..5cde72e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 4126 SHA256 6fa78ddd6b86962f5c5ddadd1493edf1f6545863f195b3bf390c970a07cb0b30 SHA512 6a9dc57df3f90fc79d5d372454fbabfa86ae4fbe951896018dfc6682663617721e3cbff4e68c051bf22c5d0764840ab2abf993f3754f7d6c27c44fe20125bc2e WHIRLPOOL 81e8cbac2a7fb4b976bdf5c6764f619f3b9130cf3c1d0f9ea80eebf3c58bba95aa61a8e5c10c2d52122a138c58fc51f5ce63fb36a1462e98577e64bed9e8637a
@@ -54,4 +55,5 @@ EBUILD netbeans-harness-9999_p20160520.ebuild 4126 SHA256 fbdb051711059038d00abd
 EBUILD netbeans-harness-9999_p20160523.ebuild 4126 SHA256 d5ef830ffc8ea2ebda13a6eb51a1942489e7e0106cf7d363eb3b071330444cfc SHA512 a7023bdcf6b1ae87bc33b28b02974d0f1e068354a94f3995ccfdebc396a08efbd752a87a52d76b64c21b8092c665ba0c9b2b9e3a781de2286b9ef2eae3a96842 WHIRLPOOL ccbec50327b9a2a6f910850f5efc53bddab511f59727e1d18cb14696d0852bdbf40c4dd542a3191d95d7072a7bf420939a622d4bafb94a3cf67b2ab301882636
 EBUILD netbeans-harness-9999_p20160524.ebuild 4126 SHA256 1d38a10fe3fc855061b630435d01cce0e5d9254242cae32455ec60a5dafd1a83 SHA512 07bfe6bd1e2759ecc81d6e8d08cf5633c78114b07c3e89cfb0cc61aaa534868119a6e353911aabcaa0919c3e3f40d3e98875082c14a094dc5d48e9dd528aadde WHIRLPOOL 9bb7356c76109a483de735b1ed0721483f32867edd5dd26a5a3d5583154e1b6a10a2bc3181363d121772505efb16a5a89832817f85e9f2c2c06fc08286b5460e
 EBUILD netbeans-harness-9999_p20160525.ebuild 4126 SHA256 251213b08a34921e2c895310959b908823533e1d77129e074e66b2bc90e27e5e SHA512 e3d77f4c58614178b4825f3449b3f86bb0c5c5b6e5e12aaa57b338b858ed43649a07eb8d563766479b6e4a48c5da70fcad957f970156600d301a53d0842fc0f5 WHIRLPOOL fd50071d0380865556e1ddc22fbf633496d8017424e870d1ca130fbf155574dd8aef35cad8f34f6d488a0a115b7eb02911144d66dbf88dd7365b048d54e42ea2
+EBUILD netbeans-harness-9999_p20160526.ebuild 4126 SHA256 426d851e07f7b4aecb4dbf0dd7d6bb5fcede49dd6adc57323f5f9dce73dfc458 SHA512 c5196c5c0ce120cbf0f99f5d7086970f2985dd020e989c0818dfb39311a268970a56631bd6989a7ddce6655194417f60888532775cd3597f2de54ced3fb98c5c WHIRLPOOL f0d745155325d6fc65f9953e097b9bbb9e65c4972621c5761b29c603acc98362a55faebb33d05b6daa0791cafca99460e16a57a9cacbe71acdeb64858d29bbd0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160526.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160526.ebuild
new file mode 100644
index 0000000..8f5ff24
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160526.ebuild
@@ -0,0 +1,114 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 ff7c8bc..663fe8b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -164,6 +164,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 30761 SHA256 d6735e6e8cf412cbfb9dd4a2f0f68f8296b74e03fe87b12150506f7c063f281d SHA512 d3c49f4a00823801049688170c461ebcc5de106f30fa11e232d953a56cf196c946610cbda0216f393c28923efd5017a28d8fc5870d90e98c6a5fd347a400711d WHIRLPOOL ba3d111337fd5e21e3a4e97457c1f00f2b53b0af20991833203c6f68301520853731f63b291d6adc55d6a96b42d52e13e6d65bd6dcf529c39bc40f30d334155a
@@ -188,4 +189,5 @@ EBUILD netbeans-ide-9999_p20160520.ebuild 30761 SHA256 222957905af8bfdec7a39c30e
 EBUILD netbeans-ide-9999_p20160523.ebuild 30761 SHA256 93157f7392922803c69db9d37f246c546acb4c757ea944c8a3c5425bfea0db37 SHA512 017df530f8c63e592530c534a028b11ec82a606bf2311c2abdeb33b0b3851a8d3fff499635fff3ae4ef8775a175996475de40932786f35cdc84cd4ebc109fb8e WHIRLPOOL 271c02baa53e7c6303949260fd460b181430371b1f99de3ba91cabc858eadd8fc875fde7b59c7b2eccac3befea9df16eabc68c92b44b4d112e226c8322ce0358
 EBUILD netbeans-ide-9999_p20160524.ebuild 30761 SHA256 6ba75575f1ec8280ea6acf214e9c382b1f1951551cf3a344b6f057fb144c05b6 SHA512 e0c8151a3bdae73bc74f544018c11cd3ace116ebd44ac78e8708cf9671c31b96d8ba1758fdf1d3bdee3eb05b226eddaa33d0f357a041351d2414efa0d59abc00 WHIRLPOOL 7ab7ccdb8dc4b01515910356af60ab21c0d79097138e228257a6b4171956e7affe840e08f2deccb26c1f026470f875bf0da1b29a62eaa17415f1d0fb431a9a87
 EBUILD netbeans-ide-9999_p20160525.ebuild 30761 SHA256 af3ed95df1e451fb3dc429c86ba3611f639f1502d97f8f9a43179ae8feaf2f48 SHA512 e446094a92675f83991f31b6333e02ea1e27ab194663007b41be955c02e26cfcd00d91a2902a3661cc5d50b125bf9e588e310ae9929d61078cc4305db8e85729 WHIRLPOOL 8e1bb13e5217100789322c3a37f7a4944396be35fde71de4349956e25fdeb9187035eb9e6cb8e60b34095b824a04b0b241dc1d06069430d3f0024c7d8dee0335
+EBUILD netbeans-ide-9999_p20160526.ebuild 30761 SHA256 aa8fd88f3ff99839f86621747c14468edb5b7a17fd2674d7f818e51c22e66ab0 SHA512 a6005dd66cc846cb911435e51b630ce9a2373c61bd5ea086fad16ee0240929707ec2385626c6a970fd2dbac0dd02eb6cff7297ac0b616a93544f21d527324183 WHIRLPOOL b54d768432f1d48822383bd03fa00143ac588c1e660bf3ac2dfa79068bf9c910e53f161302048c2dd966d1dfe2a34e7f59d8aede8930b1345c947b57aac242d8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160526.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160526.ebuild
new file mode 100644
index 0000000..e4335ec
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160526.ebuild
@@ -0,0 +1,382 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.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/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/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.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/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/5C322A10E13FADE0451263035B7AA26B63AAFA47-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/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}"/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}"/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}"/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}"/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}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.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}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-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 --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 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 --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.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="${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 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 4506b54..e3eb1bb 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -18,6 +18,7 @@ DIST 9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar 1539086 SHA2
 DIST A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip 675425 SHA256 088464e2a7e6650b6f57434087ebe8f48947a3d343986741d79ca6bb23624b67 SHA512 bff8f89e96ae7b5cf22bbdbcbf95c1b6c789626a4f3f972a7216c3a545b3f85a67950c022f19c36edefb8e3fa605968b31e267166922dfb46fdd56bc16e4bd7e WHIRLPOOL 13cc312ba143fed133394d054d8a2b4f086d0dc9f5a5da3bebd83a62c30109bd16c6da5619ee6f0c4d66160280f6659685730f98e46063686aca4d4df8ef9fdb
 DIST A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar 89171 SHA256 377b2ddcb7c902daf5dd3d22a1ff5b8da4ad6f7fd6c5e5da4731d17a8d935534 SHA512 b66922bb86a5eb787a76714a6bf2c2adfd8469ea9c3031d9b5970373f71a2349b1e8156213397b9119cc9510e48905b181388744bf2189e04e18922023dacb12 WHIRLPOOL 9a5c93989dd79f803e050189d5cf1e741f0a2a1514b848fcbd51ee868125533a816525738f491da1f0915050343b73f7f8b58e4fe35230610a20b13475143663
 DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19717645 SHA256 618aa42390667bd4cf2343edfe134f5665d9815379ec311c3c776c9dbd21831d SHA512 160fa0353baa9b31090432053a2d602fdffa663fe1f83ad79de4788ed74d3e5938d0bba0ef28ff4a946e6bc99c3a629b3fc8ff7d44ada98348fee816cb39b42e WHIRLPOOL 23408ae921b1712584eef8d51678547cf24ce3db75743524cbb046511cac60f162ab46e4c3b65e639d9c8b3f2463b674791f491d6e377ef69207ef701b7dbc09
+DIST B0AB099BEDA0D2A210519332B0254D65917DDA66-nb-javac-impl.jar 3035508 SHA256 be1e1f43557b8de414afd147eb4b1e85c4f83102867e8a392728cd19e459eda1 SHA512 85de2e706597f82a4f3133779b94a5ffdbbb005cb8cfe84032846735e6693ef1be8b6c5826e68d25df2e9c16b16a50a36e7d4b45e4b43688f1377cca14c25555 WHIRLPOOL 620b87404e829a4c9eb4e6693b8139b214b7f894111f0eb373fb94cbe1f90402b7d85020beda9d847d31bf22ffb2570731014481465243a4f7bf5b267d151980
 DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
 DIST B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar 2259343 SHA256 551a7c1bfacb60eebe7eb5b004b69f546840cc3fca82f44431e4ac6215163f39 SHA512 67b973d2a3d52fba14ec2d285f4c2f0b0490be04d73c38918c2657f7fc257656f793e1e4eaa9221579ed93cd3ec1ce0c120f5b4fbc86582b95308c1f8b64fb79 WHIRLPOOL ae6e765a49e0cf8284a3496005a571f96ba730133c220ea77b8d19520a8579e4ac4879f1218ec38c0210c56add19ead8b3a4d104613c9788387213ce8561c8cf
 DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
@@ -58,6 +59,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 15656 SHA256 197082a052d63c9aea66f8595e7a2cdc28ef3a0c3e662f4dbf215d794e2b8129 SHA512 5658fd47bd0582945b333a666e47eab9d358fe92277725edfdedde5ae5572b51aed6a63808e13c5d27bb788738fcd263baf36c6b1ff8740153fd89605a5aa9f4 WHIRLPOOL ac7ecbd6bea378255961f986f2998bc6bfdd6bff3343df76ad4f3445bf2d8a0815437cf547dd50a9b4ed4c80b57c027e77b9c39b22ed3d9769dce35672ec02fa
@@ -82,4 +84,5 @@ EBUILD netbeans-java-9999_p20160520.ebuild 15656 SHA256 0c8cd36fbedb5fa248707839
 EBUILD netbeans-java-9999_p20160523.ebuild 15656 SHA256 2b3a09ae5c051ba6dfddd8f26957bedf50f55c8a74d8728baf51a476bd2af091 SHA512 c6c6d42f52a27624ff66b3bec4741d9bcebefdbd68b6a4051cdef7a8059f15f298bb22146c36a8156b21b944d830754cd9af1f8619b8cfcb21ddac20c9c84893 WHIRLPOOL 67a7d364ac48ad8e964bdb0e5b1aecd88caba1c17661fca12eb6187f63be86874041ddbe6fe7c132008d6d4436b66dcb4d7a9701adf882fbf967f90282d69de9
 EBUILD netbeans-java-9999_p20160524.ebuild 15656 SHA256 a4d5e70691443d002bf50306df8561d87d88f98e04c19327b40e13bf5d47e82c SHA512 cd5c4c47f6b5092df09e6762d88f13716bd7c5a6bb46debcf75ecacabc3302253d69405aee11254efe10aa97bca872fde5fdd55c59085a4bd348a3d67f57930e WHIRLPOOL 1d788815c072cc1d314ef4d09efa58210dad0b5a53f853945e52815a80f10a8bfe68237a8a6c9f38606cb7607f5ecf204c332437f2b2182a86962598091522d3
 EBUILD netbeans-java-9999_p20160525.ebuild 15656 SHA256 75a7cf5be55b5195890921652a6506ef65a8e36dd1df427238c7c268ed03d8fe SHA512 0dcf7ce21f7f6a93c4d9a49cddea76e4004b59b9de19fb1f98647bac572925782826a195c620c780451d62aa77eb54ec68c1840e26954bbf7d9dba282ec99272 WHIRLPOOL 9dfcae738d45309efc623ea9e317d660a5edb20f2ea714fd76630d3ad6446431cf07e477f3b1a97013849da4d230c3c92c763b684f48585a823c5e6932a819fa
+EBUILD netbeans-java-9999_p20160526.ebuild 15656 SHA256 7ab21a594c4dbfb50403217ae8ae32613bdaad67d92035bf725601a23836b53f SHA512 3a2ea79df5dc4e481324fe22cb93bdd59189f22fcf92b333aaf45e975bee73192a732c2901eab2822d2e5bb4f7f0f02f5101b554734317b1b2bf96021f57f0a4 WHIRLPOOL e4f0aef8a47f2065c9256058588603975c2612bb3a3e20e990dab86b467ce7d4b7102091904478a05bed8e5d9bc5c4f75f332807930f4a6bcfbc9d969ed27daa
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160526.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160526.ebuild
new file mode 100644
index 0000000..eae4db8
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160526.ebuild
@@ -0,0 +1,280 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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/B0AB099BEDA0D2A210519332B0254D65917DDA66-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}"/B0AB099BEDA0D2A210519332B0254D65917DDA66-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 fa8bff3..e4604e2 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 4971 SHA256 953faa9ef469c397ce24d47c608926a014b50202ec5197261f4d7118a5a2be0c SHA512 a14dc4090bef622fd3b13dcf19d2f692996d541b54ee156c2bd7cc87da5a5273c955fa829026f88e3d04be09f4275e41be797eee29a64c0b5af13eb7955b9527 WHIRLPOOL fed09a4d12a7adb2ac2de781f5452df9764cd56ae26e8396d516c06e739af88f34b44135f1a7a136d972ff545fb807d69fd6ed2fb82370eb09020a4f822e8a8e
@@ -52,4 +53,5 @@ EBUILD netbeans-javacard-9999_p20160520.ebuild 4971 SHA256 a084cafb0e2265e687412
 EBUILD netbeans-javacard-9999_p20160523.ebuild 4971 SHA256 7e6466b0a6131ed1c651e55ed200b91818c210938b94c3beb0ba466c86324c61 SHA512 39a9364bc7f94872dde339d22c497386eaf4f109a53a93b68db928ef73545572a3cccbb04c81ac1cadd286c18e25b0209d33fade71de9e7f9569f6acf70837ef WHIRLPOOL 1e49e2c1149bb8f77cc5ab5a1b2402d523de4d9d16f4df9ec236ed09878f0c3580c94e5b66e5b3e4dabacffbfab220a693411c5aa2b0d4fa04bf40a21487026d
 EBUILD netbeans-javacard-9999_p20160524.ebuild 4971 SHA256 58a1be253595edbac67f5b9288abeaf78705f28135059d3837c4a5a265da6939 SHA512 bea41c0c16fa6385fdfd05d10e8e70356a262f22c4e0c2c5bb6d2c6fcca0952fd6eb2b1ab5c8b1fb0099400688845ab45916c47a0a8e0d30d5f0e6e578194b67 WHIRLPOOL cfeb0379368f465ff598feb2da44e27a4376c1b5e73c2328a20b5340222a54cc1743fb3c8af75b57a20258810e933e56dd65c6a6346690645cf3883349121abd
 EBUILD netbeans-javacard-9999_p20160525.ebuild 4971 SHA256 7bf29ca24938c787b33f303c75dcc02888da0eeacbe272a0c868e7faade51c84 SHA512 ca2d909d0d54440703f119191d532c945cbcc9f9609429408795ab84016c59925a66fd9f923851522950ac7079bf9d44c6278aa3d652cedfe31a87059f5cf71d WHIRLPOOL 800a9b5c31bc1bc5cb1dc013243ca075b4e0caf5a257a3623e2dccc82a9f454659f96a2ffbe5125235a9b6ecfc791f57276b582eb0941fadf8ccc5de33d0df24
+EBUILD netbeans-javacard-9999_p20160526.ebuild 4971 SHA256 78ce43ca036f26420537eb05b34c6c0079a8d16899c6f4a2c95461ab9ec86153 SHA512 e1190b0a1fe0e1f91a71fd9bcd9ebaf1e66a87d5866b0c08c883fb37eb98bb267610289068bf14b0625385fda1c568851901e143406b1b47050718a09c45d56f WHIRLPOOL 48a011eb8157d25349659c952d51ae4178851345e0999c2c3cc9ffbd0879008355874c80eecd4923f0c7108a3fd3acf13a19b81486c6e5c3f00d6227d0d82ed8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160526.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160526.ebuild
new file mode 100644
index 0000000..bb5e221
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160526.ebuild
@@ -0,0 +1,134 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 f1318c4..203cfd4 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 6293 SHA256 a45afe043254c2596f50568a88fe8e61738ee230c369fdc09e583b1898af2b35 SHA512 4a06b6abae4513a4fc810f735546777ff7f68f63f49def5a210dad83e09a75c44b59c80afb5bb6a22f6bcaa28ff97021ac2b987cbb2d4f4715abf7e3ac5d090b WHIRLPOOL a8a400e470bcab256c606583faa300745e3fc8f604c0788e3a37d6015c7f1e6781d4444472dfa6359a1b6001d2769ab175da299c783c5e5f6e8261890c41f407
@@ -51,4 +52,5 @@ EBUILD netbeans-javadoc-9999_p20160520.ebuild 6293 SHA256 ab9c9ce6d42e6b34719003
 EBUILD netbeans-javadoc-9999_p20160523.ebuild 6293 SHA256 7e336bded2bba4190c934e3dd27cc4cc2d3216b0b82893bb2ac03343f09cf73c SHA512 9765972bce05fa120ea3c0ca871c67b5244b83d683b5efa00f988336583a402fb15d2f49a420bdae6c68c804f6409e3c61ced1d6954d6b11307c013fe8d03053 WHIRLPOOL 7709fe1fe1cacfe952610db76da279be25ac5ddb40ab141c1426fa0076ccd77c97399b9343f1d48456cc9128924cfc4137c7f1c52e2d9ac7cec5bdc1ab7c97c5
 EBUILD netbeans-javadoc-9999_p20160524.ebuild 6293 SHA256 5ee653b4e7b4bae3c3e9a0ced46f48536f1eeda17617d25e30860363bbc5ee6c SHA512 11d46a52507d9673507596d039cc3d48d4a8654d321e834889ee017e7f54f7bba06296a713c4f91d94b3572ea0114e5860f9dbe30b6cbe87a98c1ba604036a35 WHIRLPOOL e20c623f3960ea1d16f77178e250559e575ff50cee824089aad47601d4e8b00af456656df65e8bb7d4d86a75357ee4dc9dd5680402a5b77b9a4256e41e0d327e
 EBUILD netbeans-javadoc-9999_p20160525.ebuild 6293 SHA256 de3e7a2d178bcb77ec8c79a10d2a074519fc18bbe816b0d1c47208976e8b97bb SHA512 79e33acd238c23097695bc158afc1ef832f26d3da7b8ee5bd26a5fc1b8ca66b5bcead70a5cfdfb9314e515fafedf58dbce1c630f7f10256cdd2a46baacf2976c WHIRLPOOL 045fac6cf2ca9546e20d9d7f74c11bef7859752939f985c44e4a9782e6b07a55d96ee23e7afd5b1061e7c9b3cee2dcb2a3c520ef8fbbe0f6490cadb13723b39e
+EBUILD netbeans-javadoc-9999_p20160526.ebuild 6293 SHA256 8fa5191a0ac5191df7f812f391bdade4829283bb7f6044e64c37324c24d8adc4 SHA512 8dd2d609f1badefb9d55af6a51b7e89ceb774d589b1a4f8ff845826fe2f8c0d43261b959da89404eddf68fef1dbff9d7af097a44cb4f87036bc8cfc6ac252902 WHIRLPOOL 969646b20d660d40ad6a8caaa72836900b5ae85f83b3a10493f73686e761abbccd4e144a7bf1d3c3cc7b7e98bb672d85a3d091ae7d697d6910cc52e19a863653
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160526.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160526.ebuild
new file mode 100644
index 0000000..79ffcfd
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160526.ebuild
@@ -0,0 +1,168 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 a7e1f45..a899b26 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 4717 SHA256 d66d24fd69cf70db58c771a8022cbd16fe687b8fa04fad227460c9c4c16a282f SHA512 a8eadadc1e636c9a3907909fdc8f39af3c3f789dadd440f3717f183e28489b6f6d07e82ef1665b06dba6f2d7d750482c7f22b55ee8a38356d8208ba3e5c27ff5 WHIRLPOOL 2a938d9fde09ab500cb042026520f13f99c6d74452a230f146bf6d69930a6d4e1e3d108fa7e1d459712e6c6893b758d4f42025e0d5e32dc24db26b97b980194b
@@ -57,4 +58,5 @@ EBUILD netbeans-javafx-9999_p20160520.ebuild 4717 SHA256 5d5c790d8d9761749b43faf
 EBUILD netbeans-javafx-9999_p20160523.ebuild 4717 SHA256 0f0ce84ebcb9f28cec7ed57b2c5ef667b5d9d385b509db7144b6397bfa123e27 SHA512 afe887a0835853b4c9583461e05c02c8fe433c78385f3d9aa99eaef5192636380c5255230a04f49a8a54367dddd1eec8be26a5b7eacdc42088c505aac3b6248b WHIRLPOOL 16a696c48032092f3a9b7479020676096631f08d199e3a975609a9441c2f4dee937bdf0c26fc16a843ceb89cd9a0a43293e32509d03330941cee243a95de4845
 EBUILD netbeans-javafx-9999_p20160524.ebuild 4717 SHA256 f31818f1fe06cad126caabb58b7143199c736bab979bf9130db732e9c6587e2b SHA512 04be6dcfc6447b1700577ea471f6bc0b4d011489ef2185d3f583f3f922b4df797dbc1a9e48c6e9346de25dd7583fa8308cf51c05a0825922d6ab2aa2b67c79b2 WHIRLPOOL a03cc74f674d9762a10f20e974c6f4a3f64df25037d9aac3f4e62b021999339fad3e794f4ff6443d5a9a92e07eb45faf4d1624cd68c1b5b2206a249f51189d8f
 EBUILD netbeans-javafx-9999_p20160525.ebuild 4717 SHA256 c15b89ecd88d0e1697d5d23683590d178fa3aa60cea823e812be5f4bc100c1b0 SHA512 331f1329e45a286e48fd54628f1000044471890ce06c517fac6caa66938985d2dc9eff45556ac1a98de78ba6b0916faeccffc2a5ac69e70a48f6a53b26262271 WHIRLPOOL e4f4a131a595c84bf9aea805054bccab6d8efe5fed2a25e4c3ee4c9f3a4ee298590207a09f5b025f2cabab32ff967161d4ca53bc3f8da86df85f041b9c45d833
+EBUILD netbeans-javafx-9999_p20160526.ebuild 4717 SHA256 4225476bd2157f41fce02dea5997d9241c5734a6f523782276cd0e1cc8446797 SHA512 88beac29101918cfb7e51ae9f2facacc94959f6368f15783837e29c43640f166e51fe1b021635c15f3e4a426b3ccc253bdad90fac4b1c93fb23eb30edda8396d WHIRLPOOL d6c35b42954f656e44e65524d049f940a6e357aa40f684cc120a3cc0cff79fded39a42a2dacdef95cdd04879897bc430eac77b5d8e63e67c56ef6323eb9e8b0a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160526.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160526.ebuild
new file mode 100644
index 0000000..cf39910
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160526.ebuild
@@ -0,0 +1,124 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 00591d5..73869ec 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 4412 SHA256 92ec38e61718089a7a0f048629e2390b138113cfd286ba1e8168edd9ac86aae1 SHA512 0b0b3e80376fecf0af36478252595774af197c427a8162cd2394e43d3e1772a730434cf07de1680be0bd7c3777d826c822334ce4f36c42d7a05e8aae306c4a3e WHIRLPOOL 2b317f045489273543ccd76df12009bf2b9230912a5ba4814ad5e1dab25dbe92cd0b317d4458835ed64d6386bb5216b328e1afc53d60fb9b07848397581c6bdf
@@ -49,4 +50,5 @@ EBUILD netbeans-mobility-9999_p20160520.ebuild 4412 SHA256 f3482cc9274215c919498
 EBUILD netbeans-mobility-9999_p20160523.ebuild 4412 SHA256 66cef64387a3a46d02ce0498ec523a7f7ff6853758ca8e4f84a9365183e49fdd SHA512 fd724754c9f3e622198535fed41cb512334b2820e0e388a2046fd234bead4b95ba62529fb496d16cd4da44b353f2a1662fc7f1ee1aeb81a2341c8413dea17033 WHIRLPOOL b1818e12e5e1ab9375bdf263205f58a34fb1ac286c75f76294573661669893cfe5ccd46736c9d4b1bfbd3093bd0d59ac44112435540e3d6b0bf41c4f7b6070a0
 EBUILD netbeans-mobility-9999_p20160524.ebuild 4412 SHA256 d978744e79277ce762967a59bebacfc65d4c1ee57b1a075114f5ceb40ff36db2 SHA512 a832efefe9ec36d60f4dd29dab9a603d35b6902448ac2eaf5bc8099bdcdbd609b52ca68924f737102bdd90b82fd17c770adf8b3ceac09bdb20ea968cb939967e WHIRLPOOL 2e082c8e073f36085aa106843f19c5414fa7d63c039ef6b28d3cf43def8212871b2870ff566d06e1fc0d74119708abdffd70b1874d605b63e7088ffb837d3652
 EBUILD netbeans-mobility-9999_p20160525.ebuild 4412 SHA256 62229014579941a3187c1990b21f48d84838137ec35b2d17fbf0585550d6c8da SHA512 274b9b7a55ad0c5e7d930fd9496100bbac5a03d8a7ca840afdaad07dd42f5065eca5874743f593ad7d684c2e3b6974bbb8f924052740ce3fb2ee55796ac520bd WHIRLPOOL cc2f085dcf91416a7df04e490224d46355d55945b673c4e14cbd9cfb1b5f0935acfd8ecd5e19aef098bd920378e9d93186ffd8683b16079a1d918d0607865e96
+EBUILD netbeans-mobility-9999_p20160526.ebuild 4412 SHA256 08e99f6a150a8646821e68f3cfae74afc8da8c2165056c31965ad97671d3fce7 SHA512 078206786fb0ebce9f7f439e9038b3ece094113d6a842842263210e2ecb9527c32dc0164eca238aaafe9d41c6fb4d2105c55f02ad61a37b9ac73d92df303359b WHIRLPOOL 80cd1e1db614f23fed21b3225e9b0546ecc7574e569ed411e39f6bf47007f50fe3b0586d6bf4e580c3be7ffdf80bc78c56ef0a99c4a91706ffa7047008f5b640
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160526.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160526.ebuild
new file mode 100644
index 0000000..3f79d86
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160526.ebuild
@@ -0,0 +1,126 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 d1d7a94..95ffca0 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 4111 SHA256 8e968459df586e6fc8b27eb683e2b0936dba423cccdb334af64c3918d2749843 SHA512 9ca5684d63d1efe7b5158014375752449fbce3a3fb86acfcd12a14f7c9195fefca83d11379906cbd707a48a60ae24a5312c9823acf337811e1d00e9711dbe126 WHIRLPOOL 8ddbc652a3ef6a2fa079498f3d59900f7a507d4494a2aa514cfaae3a1b67fba2880d80a9d285a9513fb9e00e6c3c842b3e8faf6060d1b545706cb2c871443f2d
@@ -52,4 +53,5 @@ EBUILD netbeans-nb-9999_p20160520.ebuild 4111 SHA256 0fa2c7176c6a4f109493ced2223
 EBUILD netbeans-nb-9999_p20160523.ebuild 4111 SHA256 14fad1b53c7b898d270fe8da33bb5c8976ce0fccd41c1daefb8a3427b5d1a417 SHA512 e09498992c0c5c8380db80e0b8ec6325f7eabc37803c5df33a373488a67ead0fa1fe2295fe1e0f0d5d3d179e87e6d0edae81c9dbc79cc6095a00fbfc70ff0f37 WHIRLPOOL 6a0107571264e484b13d94e345babbd1f5dd8bfd3198b0caf9f2169bb6f27bcbb874f71200b49f2487831addf42c0e61b611e8d46086d82d82af91f8b1f0dcdb
 EBUILD netbeans-nb-9999_p20160524.ebuild 4111 SHA256 e31b77b9a5602c305af3572a603dfb60cf5191c11436938bdb380eb52ed6cf2d SHA512 b6ec6207a8e3a1c36845197765eaa1c6eccb0fd4d6056df516ba7a25be8ae152b674b12d21d4041b1c7397e8f68265d4b267d5dad9b3b666b7f0cf1f1432de2e WHIRLPOOL 3a2bdcc1675a81cd140f0fd9d2acb65c040ca3379d916325dd8cb46a510991679ac41734729decf80b7648311c6ed16f3e7c21031d819e7fb0bb6f5f0b0488a5
 EBUILD netbeans-nb-9999_p20160525.ebuild 4111 SHA256 c0191a55bcfd6db0de1ddb5e66cd0d25abd8365b7cb098f4219f57c0df1aed7c SHA512 8d0f071883021493eb8a479a9c35901f602b5d92ca14410bc080d4f6658a1040891b66e45a560d0d4d7d60fb41d457a0e135ff2885832daf4792a23e72462e36 WHIRLPOOL 2600fb1d1a958e109d0b5f1c361616f61805564aa8371215db6380a6e6ee28610a5fd2e37c5a3697d9ee150534627e9ead1babdc3de4ce98fcae89a5bfc1649c
+EBUILD netbeans-nb-9999_p20160526.ebuild 4111 SHA256 e931fffc71d94a04205eadbfb0de0860b452ae5736f2306bb2bc152f2f38b349 SHA512 f62400f7255598b7d484095298b8332ffda0591019603e1c4d46c33eb053c1cf24f3102ff1450cf778f7d00fa1c39b4074d36196bb967308ab51c516192bc84e WHIRLPOOL 5a0abeb8b9df6132e2671179710b2323e3e13b116f38d767c279e03be1a08bbbc27ab4e71037bb1bfcf7c670a95aeaaef7e0fa2317dd4ac84c6a4cf247f1e1c9
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160526.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160526.ebuild
new file mode 100644
index 0000000..1ff763a
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160526.ebuild
@@ -0,0 +1,128 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 38dbba5..28af4a5 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 4418 SHA256 ff39622b2f582fb73f069ddea76fcb846f2fdbdce6559af061a13ead577d4a47 SHA512 3f71b975e8316433510e89914be7a1ffe7837a39d42a4c8f25a033b82d54bee62cafe0a28d45cada322594dfc328f43c2a1a05abbec1e43e207f73fcb225e128 WHIRLPOOL 696cf1a13fe113a7156da0fa4db41802052c5885a1cde7eb5eac17431ca31792576d22d4cecc6b2bd5ead506abb0e3a3d0dee62183b346aed1aa146234c7df8a
@@ -54,4 +55,5 @@ EBUILD netbeans-php-9999_p20160520.ebuild 4418 SHA256 b87db194188ec9b03d19a3b0a8
 EBUILD netbeans-php-9999_p20160523.ebuild 4418 SHA256 065110929f1b98668efb050cd946ea03fb722c77cf68cdd0153a949e1fdad040 SHA512 ad45b8b46fe9da9ed7a3dd6ecb95fee91893fc4f019902090899ed3f91995d788e5fbcbeedd78bd9064d0417ac2dadba7eb83026f82fb470d284d5e5255915f7 WHIRLPOOL 3101dcf33233602cd30230931865a1b4bb3bc056e141bc4d32239b525b7ec6e745457ed2fe535dc05a878ecd6bd107cc053ddda330fead0493434df257e82dc0
 EBUILD netbeans-php-9999_p20160524.ebuild 4418 SHA256 9d0fa44ff7246e282d2b480365bb0b8f8e5820cdbd52fd2619e51a4cd11aae35 SHA512 b67cef5be868ff4bd907e4ddf7fc501b65724cfb421a41b3ff2dc9bfd165cf11de449538231cd5ee8f92c8f1be1c00f7e8798877de2cf885f83440fb28837ba6 WHIRLPOOL 23a7c2a75c8db9d4f7df289ec36198386907ae9dd83d3223e8318f1f8ebd9bf649e5312376abe1805968204c14bbb91b6e555e01e89e336f03738c2e45959b3a
 EBUILD netbeans-php-9999_p20160525.ebuild 4418 SHA256 ee73ed1101b0c91c105a8f3aafb20cabf467d8623b317c4365ade30da4255a45 SHA512 faf2dafa869c722462165e4c0e6fd8b2791a8814cba44f45b51fdc42abedf6331d6248b44e907b22f6ce0b4c846cbbfc9e0a937e4c59f748806e1652eadfabf9 WHIRLPOOL 2f669aa1c1bd04f64751d8aa8d8f19893f89a2dbb3742bfd729e56a765cdec2bdb70ba5722c0605ff51ad0f6470832e211e6304a3d667e76f4dbb1ba5b6c6fc6
+EBUILD netbeans-php-9999_p20160526.ebuild 4418 SHA256 539f53cd6a9e911a052485e7bf5f523293dfa9991b34d23ef8b12a2e0867ade2 SHA512 563bd8382822108144477619c6ee105e6a2961569f3bc699d5914ee46d4815130ada2c214a770ce4cbf94363f63b09531cb540e83b20c91b6ef481e20bfad081 WHIRLPOOL 98cec862c50ed659e6f8295db4b6ec40712f257c75d351eb418873147fdabf16adee232233b5f1fa12d8f79925b5508b5e7db24c014d64c1ee9285761b7aaf58
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160526.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160526.ebuild
new file mode 100644
index 0000000..553b785
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160526.ebuild
@@ -0,0 +1,127 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 725270c..906a1a0 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 9520 SHA256 43ab2d84807ce29e75b611c4aee4269e1cd2ab9bcd41220e572d68f2095280a1 SHA512 698447f4e5a9dbe05337a59966f05fe7f4bc8517dd463571b65d6ab777239191ee341fb56b1c9c1b479b3fad247c5284c3712f3b142839d930214f36d75e194b WHIRLPOOL b38abccc36b868f0f07607a2d487335d134554c44e085418dd4e15b6dbdbca18337fd1dc50729bc92e2e076210fb6be7caf1502c76e3100d4e0fdd8d56e3fe1f
@@ -75,4 +76,5 @@ EBUILD netbeans-platform-9999_p20160520.ebuild 9520 SHA256 4ed27572bc5049e678aca
 EBUILD netbeans-platform-9999_p20160523.ebuild 9520 SHA256 548daae60d4bb9ca1ce8ab78ff211dea563354611d72ac084fd4331bc9226376 SHA512 644a0e2a32802d79d1af225b68e2c987c7e1a0a5c2817eb43d571fcaecfc0f944d6d8355994b03be94bd3ac031f4528f8fbb0a6ce1b19c0204b8548acc65f17e WHIRLPOOL 770e419ea5972f69a735e5ef0f58572204c4c91a4f016309d9a03ce90bac042872ed71f1133eb36944e4b3c0f49fb14b5fc29d0a584e5e1caed19f84ca077bbe
 EBUILD netbeans-platform-9999_p20160524.ebuild 9520 SHA256 f58c6ab025451fb5f77367b8e8bffc97a445f0d86cb578c7cb0b8e9a52b78dbd SHA512 bc2408b9a8cff5e5089e2c3b1bd2042ad7a167179cfedf777570762acf73ac700d041915b205d23454d3be4f233be0163787c9cda481ea1160d2a5ed54a7e1cf WHIRLPOOL 5e6bb0db71d5821bb8a339b310d7c3fa5ce0369dae5b970c2f5afea935001f4d1d9cc833b480872cb62360d05a74d087e7413e8c86f09703c2218874f33c1ae7
 EBUILD netbeans-platform-9999_p20160525.ebuild 9520 SHA256 2f2d5cdb8e76728e2de3120cbb73fa96a3046dbfed22b3644b2fffe84ecffda1 SHA512 79434826851e8ef08eb45bd1908ba67409bb7bda6680bef63e10f316c74dc4aaf8d88cc121c04482f55b3fcb81259bdb50aa6866ab19ce83c76b9e2fa5f8f7d1 WHIRLPOOL f0e8f8480874acb8f7194dd746db6cd59e32171eeca976ae21d5adccfb38e8d0ad96f7849f1d68c0bc152957bfa9cbbe64fc759e1f58dd1ceae62437fdc3462f
+EBUILD netbeans-platform-9999_p20160526.ebuild 9520 SHA256 258a40482a2e3a2f2c95c9d01ea629812a818387eeb2ef8086ca5324935a91a6 SHA512 f78c19a870b32734cb60154a0ab0a7645d9171cfaf280aea736bfc008cded701043703745d8cd273dc7fcd0622f9bf40bb63ee4bda8f8d45c106c8ffa041a86b WHIRLPOOL 0a31f9dc97fd2fe961dfb9619005e95e1f7c26e66b32f9ad50285ebb2b1048a1db6db43598bc2f9f8c26ce4dbbdb2e6aaa3b610c33f4ac221eff187c1ea891c0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160526.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160526.ebuild
new file mode 100644
index 0000000..07baa95
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160526.ebuild
@@ -0,0 +1,167 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 b8cb02b..c0f1b42 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 3472 SHA256 c01c6eaecbc72dff72adbdd14940ae8935b207096293026b94bc2e3f620e934d SHA512 9a0cfbe6a0e5b27611f4817889d3b102ecbf07c05987b558e17013711c3f40a2239a07c340effe846d54b14bd4f4987adef4c290563bfa461e56762d99f8c2bf WHIRLPOOL 4c47981cf634b924f82b4c9b8cd2fac84006454beb9d7923757b0eb5d82512b58090245fa068f66b6760ac83681106ab659ca036907d40faf9709274a99dccaf
@@ -49,4 +50,5 @@ EBUILD netbeans-profiler-9999_p20160520.ebuild 3472 SHA256 891aa2d77eebbc4f40898
 EBUILD netbeans-profiler-9999_p20160523.ebuild 3472 SHA256 ba49671f4804d13ba9a60ddb0acb135211adf79eed11c74b3050bb1fa23b0e65 SHA512 008c86783d471332012053dbc3ffc0d884b6d3f85e139200e099e4a6d9d9e5f969d9e24c0443d73de78e3819b3042895637b3a12980ecc5ecc498ebad34ce6c6 WHIRLPOOL b56023e720ea5f8cc1d6ea9d3fc4afdcd40b417066a60d3c01ce24e1130073fd4601712c9867d4d513a993a8e4ea12d99552c3a351f1942f60e024e3da3928a1
 EBUILD netbeans-profiler-9999_p20160524.ebuild 3472 SHA256 56d2fdf3a6db4dcc620b5bbb7ae361ba6731cdf44427bc473e6b6b9f22c70e09 SHA512 11527b14f75abcb47a375abdd41697ba58cd5b52905c2efee482f7b3cf86ffe2b7f874652f664b3d63bbb7d1d46fa2d1aeb721d77bd576755a5f4ad125348065 WHIRLPOOL e16528927b42cc6ae08734842ca0820eb2bb6a2e130bfe1be735cc4851b81b8f6a93825549376e6c8fcc355b717080edb98691706ab562ec022e8fb57f7e6f06
 EBUILD netbeans-profiler-9999_p20160525.ebuild 3472 SHA256 43b44998a9d7d396856daf7554b38edbddf86fa2a18acd04d880172913263915 SHA512 0c0cb64de39321b3d0ec10df3c058096369c60c4c24bacc89f894e4a2b1a52f4545c71ec2e32f53e85623e3d81c1b25c2f10f6bd16b48c652a5d4833254f6864 WHIRLPOOL 430f866dcb6e75282c25cf908c789e20fb0015ba729b5d74b36bcad8c6edcf9158c7151e1d98e15a6e2ead5cbbbc0db2da00a47e689116541630b042cd5daeca
+EBUILD netbeans-profiler-9999_p20160526.ebuild 3472 SHA256 9c5c819930b714dd0dfa69331167ffe84f3e1f64091a2bf98bdbb193ea5d02eb SHA512 6920123dd625b37f41b0fd7fe6a56264737003ae056db050e954a41a7c9e0344247214c7be51ed4bd91e923edd1ba453540690bcd9491a07c5f0aa6bbfc04a8b WHIRLPOOL 9e12ef4ee182fd6d4b9808adaf2f5f0264a93d7a1dbb1e1a0fcda61ca0bcdf4b967820485c462eaa569663c9c4a04184dd6e3f79cdb61296634cb24505a08098
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160526.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160526.ebuild
new file mode 100644
index 0000000..a8f6da6
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160526.ebuild
@@ -0,0 +1,121 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 dcb2ff3..2f80867 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 5343 SHA256 3b6415155ed76a64dbed48af896dcb00fde8f49f53248bd544305bd6bbe01577 SHA512 d3a549390972da7e210c839116f2a9f0607b6bef416d3169493b00b525fb7280b5fbd9d633ca23d21168303ddb16e51af92272e9296d1dd9d6ca7437dfe7e4fe WHIRLPOOL b4d34bf8241733789c989859edb61d235868465a3362488b4a28dc66c7a4b866f97cf8a1178bf92c90078514d8b102a41bfcb2d6addd44b389277e7fb1436b2d
@@ -64,4 +65,5 @@ EBUILD netbeans-webcommon-9999_p20160520.ebuild 5343 SHA256 59e505c0ca41844a08ba
 EBUILD netbeans-webcommon-9999_p20160523.ebuild 5343 SHA256 3a6128a2eadec995b2309f20585928d25c20da6a8ac3e2d0bca609f0440def57 SHA512 3f7afc253b15372d2f3bb0e03a0a046e73a33dcff1790cc7cdeb5ee14712e80992bba65f29977bb183baa9c70117e2d57d3fdccb25abbc0ce50f2dd9b133b8c5 WHIRLPOOL d64563313b65313cab7b282042c11efa238b5ec4881ac081c13f74483a5c29fb67112f0be004b272131ccdb84570873b1b44a177f252d698bb1187a00c4b60b2
 EBUILD netbeans-webcommon-9999_p20160524.ebuild 5343 SHA256 fb82252b09c04483b4341d60757dc17e2fe1314bec0c55f66f1b49dab792daca SHA512 3e2f7dd76107e6a2de4e2029884db1e4830d97d094684537a9977881da66df13d04479c100ab7e61fd1f65d02f011ad77a33243b618961812eb498fd999fe6e5 WHIRLPOOL e0f42207f9f70c2503a27fa3147225707011159d4607aa620e5159f95e758f64e9dd1d58d50634b4714253bea08d2e88585a2c029ccb2ffb8a13f89d6ed8e2e5
 EBUILD netbeans-webcommon-9999_p20160525.ebuild 5343 SHA256 7b3276a21b03a8fccfc074f2c4f6d3d6901d3bf15a19e35c4c83d3e44dee36fd SHA512 df2e30ba7cf2d54651ab5203a32b15f5bd86c35ea5fa0e57f597bd9e8b93dfcc433360862a9e341a1ecbaa55bfda5b307f5e30faad6bf1a79d7c2e8d41b2b7e9 WHIRLPOOL 30018545fa4ecc42a14bedcfb0b0548ca31aed107b1e410fa5fe188dde587159c3f7d6bc41206c220642a67757b3a54375c951ee41c99203387527c33ba1ee01
+EBUILD netbeans-webcommon-9999_p20160526.ebuild 5343 SHA256 641c9053ad1d10625552c0b8564dc0f0f2e47c92bfc3ec076a2d255a5fcebbf5 SHA512 5d473720ff5e7d35e6cf03d29575e5d517fe92a67f652a82babc25c9a255c09eccdc89d68c1e48c7b2e19c0e265827cca3572ed45df445c27de07bc41601ea00 WHIRLPOOL b1ba9950f0cdc9aa10e98e2821c5ae0c9ade328fcac7e86554092a9dcfd276ef3497ffa84f66f85b2b630e6a9ab708ee7730c9a01ab94cbb1f6a4a06cacb6fc5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160526.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160526.ebuild
new file mode 100644
index 0000000..9ef10b4
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160526.ebuild
@@ -0,0 +1,124 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/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}"/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}"/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 4dbf6c0..73defdd 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 2721 SHA256 e06e7fe1eeda962aff7fbc12e4c46d0d1b20c20c2c312ae0ce8958a832ad6055 SHA512 00b42a7ffa32ea8488086b9ab2ca09610d920ff325e640077159ad4c08418e43855aacc741d094304a891e665c46be785997cd857c0607de49955e8475369404 WHIRLPOOL 5b30492d9257888e1ca4b45e092e2c7fe7548b4160939ac8f1f32dbe625b9534a669d62727abcd80be9809071973d27ea403fb1a765665a09c21dcd112485443
@@ -49,4 +50,5 @@ EBUILD netbeans-websvccommon-9999_p20160520.ebuild 2721 SHA256 84726beff5c97185d
 EBUILD netbeans-websvccommon-9999_p20160523.ebuild 2721 SHA256 3894da4198193139caddba90fc1cd337a26f0bd4753bf5fe937322c5605a7760 SHA512 6b616dc392093a25e2f09be5796bd11873a84bbef8f52360ed1a3a3fded05a4fef0e505c2ee852ec8f6c1118b6f540e862647b3a2d1964e997f6dedc529ca860 WHIRLPOOL d7538ce8e0305952466829d1020b8cc6ddfcc4ebc9c6de573c0f3261714e16f1c342860835b5c23a6c6ab6fe3abbd1b55d282d59afdeeddf60c9d11027cd7738
 EBUILD netbeans-websvccommon-9999_p20160524.ebuild 2721 SHA256 57ca8f12a64e4c24667f946447d8cc12f089c1724693dbe5a876e4bd72f0598f SHA512 83a816f0f3f57f704099e2c2b17794f07a424614805b69631c011e67457dc0bd811a5e8fc406d63ccdee6130270793a8293edde714403ac86f03abb1bb411cf6 WHIRLPOOL 5406de525ea51e2fd23d1fbe07b310f21eeb92f49ac33ef774c508ae6057351d18f101d3db36035abb126cdd43aa156d93931650aa5ae12f4edc7ce156962bf6
 EBUILD netbeans-websvccommon-9999_p20160525.ebuild 2721 SHA256 454a5fc60a23bc6288047a465a65ff1f1180b474a0189c84e869d65d678fc5ab SHA512 3a0ef98bf0f379e49d5340eb61810301a27f53e4e04256674349df6f08c9008bb706027550b392226b89ea6821920b0241b63533d7315c03f205187912896b55 WHIRLPOOL 9f73da6fd7ff3ace9fa4d2a0f40d51ed2026026bb91bf03f48998fda47241ca2ed146bf4ee5f8352873f16c5b538840c9539915b252b3c81a2295dcb47be9375
+EBUILD netbeans-websvccommon-9999_p20160526.ebuild 2721 SHA256 970655934ee3b7eec8935449ccd63a35112d33a858d4e9cc6404c46045f24ff3 SHA512 57de5ff271959da3a04a733df902e37d14e51fa0ee60c94ec6567eee65b182da68cfe98c90ac5a218ede59ea17f624b252bcce2f2f1072194301aa1639e0af5e WHIRLPOOL 3d3c5df73a4ee8cb03ad232792780e989bd4626a16b061c84b6e675c75448f398de0a0fab6a778ab39e511cf3e222248a954247ee833ce9bb113f281f406eb7f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160526.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160526.ebuild
new file mode 100644
index 0000000..d12621f
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160526.ebuild
@@ -0,0 +1,94 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 45b1380..23b465c 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46
 DIST netbeans-trunk-nightly-201605230002-src.zip 213686008 SHA256 f6ab4f0732fc24ec0248f2f3f6ea60a9cd8d72b2dce0bc6944e967bfbad1f823 SHA512 9cc5eeec81c34abd6a6636cbfad03832ad402295c323612f51909bef01fc429521fdbb4701678d4354d133c195fb45bae12218754439061589f0ad1fc00ea36e WHIRLPOOL beefa606f6beb2e2f4a20bb8a126222458f4e92e2f11dbed83643db836e423ec8616664b2e816cbf682e2eebe8270f9f1a4a785cfda389a266325ae3a9836708
 DIST netbeans-trunk-nightly-201605240002-src.zip 213718538 SHA256 485a3a86c0c288cf0c4cbd0cc1eede92a41f1fd1dceaf17b2a594db057f4f50e SHA512 9f98b017303360d6ee13fb4d834fe26a0df8e4d2da20a5ef65226d0b4142ecb09e90b7b8d0d50a27c265edaf6e8b7cf6a1615be1ea5388fb39d84ab47872c5a1 WHIRLPOOL 357e4daf0a9a9edf7ea82ee6bb63221313acaa773fdd4dda6771a0f3510a5da395f2a8b7a30c0345657d03e1fd4e4c1087487308e7f7018106dbbe43d1024ff7
 DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee274f4fe9ececf427d7e7e1e9e2b4b6c485dcc469cda7aade2b SHA512 0ebb5e3cf920937ec79953618fae6a8c299625f762c8d4684aa8e55b2c90d04b7694bb6d62919609124482313feb8a74782bcc20932361131d3540c628717441 WHIRLPOOL d60023772410f24346bd9a7002d0f99f905f138e0286d5fcfe4138694419af4ecf94d36a53ed2b2b33ad7e5b8e2b58f3db66ecd4e950cf5887cdcad540ff1d29
+DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 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_p20160428.ebuild 6939 SHA256 1b8ffc29323b7fe1c2308f75240c295e475626a7232fe70c6a6d096adce971fa SHA512 232be1939cb9767558f9befc29f085962d978b508940a093850602dd10a4ad49e801cb526d1ced56da3654bdf31f447619ac1bab2ae4c712fe858a475baffcc7 WHIRLPOOL 2e4d5265c0870bda91523777b9ddc9383e83a81befa8a86beb9c3f99990fa3ff6a22770d621a4120f8e891e607b61300308f5f3c433446e6bd59944fad8617c7
@@ -52,4 +53,5 @@ EBUILD netbeans-9999_p20160520.ebuild 6939 SHA256 a1feaf231b6d6be2c7efd34ff2d011
 EBUILD netbeans-9999_p20160523.ebuild 6939 SHA256 0d0b635cf7e170090dcd191409e58e06ed8b4d61dd0038b790b38bae2c960aa3 SHA512 833856b2801b06d168bab5303974f440f895590ff86ffa483cd68eb83bc566c098d7c124ba2fac72dde62e1372bd06f15beb79d4dae6013d5d7723f3caf9d793 WHIRLPOOL 59256e6640d1e4c063fb1d7808ac515abfb2e112cedb15522be19ee3bea6010693f38943aa0eb8e0ae3ec5e82bcfebdf4464a6bb50cd414c8f1e166777099196
 EBUILD netbeans-9999_p20160524.ebuild 6939 SHA256 a9dd3a044d678295c8b56d8da274b608217f52a4ae0a689b0bd02d1ea1ac6440 SHA512 ff614e8b1697e2d73a6bdc398642ead3b071cb10feb4e5e8244dfb23bca4e40b7aa0275321b3c04f7ae37998509ed9c1300d7e76f101daf7dbb99e8b3e20ad82 WHIRLPOOL f73b735b3d84940ba85998f9135b8c0ace0291c0355dc50d09ff26c9a2c8b02c5f160277f5317a41c58a55502d7be38c2e2c66e076b7889480b6a35f62a0f277
 EBUILD netbeans-9999_p20160525.ebuild 6939 SHA256 0547c4c4c43aac77de818f28a39cd6b436e99bc15b51e4ccdd9bb6d59a8107e1 SHA512 99f5ed7ca68640352b0cbc22813d4cd3926e56e507791c3232e212781a60403f701a1a9cf7e32212a3f236b23fa6fac56e48be6d264408b6a5a8d3c9efe6b58f WHIRLPOOL 857bfeae2aaee8e26b65bdb3186d7e20c139da37384ae80950c6d1b4bf01ba20a074cafb0aef76bf87341cdba84566440e56e9e1ac8538a974ddfba78f765c2e
+EBUILD netbeans-9999_p20160526.ebuild 6939 SHA256 2565f9c875e0303e0c161ba372716b4c6b0972abd4013b3da988e0cd5c223dfd SHA512 13583780bacb761445bc2c9331b374d889c9629c69cf70bf800951b8e57e80b86bf59bb5872bb0d3bd18c48cf21bd0420eca9ce59cc89e46ac845a9bdc6e9c1a WHIRLPOOL 910a1c3a7518eff6be5fc69a0f33fc3f09ff0b88452b1cf43eebc1df1bd4d86fa63710a4da739755a9d4d0bcf3ca8bb1023728d035f9021479fc6d4845a0ea9b
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160526.ebuild b/dev-util/netbeans/netbeans-9999_p20160526.ebuild
new file mode 100644
index 0000000..4c4a1c3
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160526.ebuild
@@ -0,0 +1,254 @@
+# 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-05-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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] 3+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-webcommon/, ...
@ 2016-08-24  7:48 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-08-24  7:48 UTC (permalink / raw
  To: gentoo-commits

commit:     e033e9a3549fc06208b4a158f5f1b1b93183e595
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 06:31:08 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 06:31:08 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=e033e9a3

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 868ea44..92c0fd1 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 3384 SHA256 3ae82894d8af5f8cfd05141d8487e2c26104eaaa7f3de1c58fa0a748364ca799 SHA512 5838e3373ffb2f2219ef917b2114b5411e645cdb6670024ca030ba917b6e98b7d13058e23ed56c68b519b238a55473cf1f8ac63e98a381760a8a7867ebee21db WHIRLPOOL 80b7127af19ea83c9acec46a94ceeceea56ad273c9e5fe570e539574543ec93e1159d964254f20cb18c98cf205aa6d573d754dd50ba114b233baea9cbc9a40e6
 EBUILD netbeans-apisupport-9999_p20160716.ebuild 3384 SHA256 318b50a25638716101a6d1bf70ff4ddb0fe3182cbd65b701eb02264a622c6ef0 SHA512 33dbdef4f2200bf509dbbd041543b3b96c76ccb2378a63e221d41b6e14fbf0e01b3b577b9e3e8635b424c20cb62ea8feef69e801afb2015655a4fa67f45b9009 WHIRLPOOL e7b8e69bd3d7c493ff7dba63652c925056d4987eb9e1fdb16cf35ac8a494f650cb78111b590a37d215edbe89c4f44af0802249b66995bd70bf45fa5163a3cb9a
 EBUILD netbeans-apisupport-9999_p20160717.ebuild 3384 SHA256 4174464d10048e8856aafad202683a13224a5bbbf752f2b7bb1344c5c11489a5 SHA512 77a0804b986f3197dcbdfc454cae5e325d94660a15fc99803085c7c28e0dea516dae60a4552ff2aaa5f4fd265f56ef3b9474e4c45dbc2b0521f883511687cfae WHIRLPOOL 1a1ed092cca82d649d030f798acfa23fcfec54518403fb6586d6b77c35f280aa2ad1ba3f11c51b4797c747cd8967b07444a6c993e752580fc1ff9d69c6947356
 EBUILD netbeans-apisupport-9999_p20160718.ebuild 3384 SHA256 c214fafe112cb666e1cd676999dc8d8f58d3032d75e8a7150128511f31a6bbec SHA512 87472e62bae4b650cffe3f692a4883362261bc94efc763a5ec3ca01285b501f400879d3825a10b99b79a1cb3328ac9eafcce72ea91628451569145680f6aee0a WHIRLPOOL f4a9fe9c524a7739fb84c9c969d4680059d392f90ee35238795c305d5ce84ad1f17773f2f08327859aec82cdc8958e676878ec581d03666930b36bc9caa578a8

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160715.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160715.ebuild
deleted file mode 100644
index 195a8fa..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 c156d19..77c7abc 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -15,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 4790 SHA256 681eac8ab30074f02b4fb6cf096a01187f75673aade1368ba3e4ba0fa421506a SHA512 98df3dca11e1aa7da5276666c92420a4af221d6fd42afc9b22e1a4e2081c3fc4a07f842247b2c7390530fcc46e7e197c503d641bd9dd309b135c2ed867981ebe WHIRLPOOL c4e3deb7b999451f3ae141b1b34504580063ecf7e5d068032e8bf4d2f6e08e0af87ad43fbdd8541777d3a035f14bea764019a866b6bc18be0d50ea078b715f8b
 EBUILD netbeans-cnd-9999_p20160716.ebuild 4790 SHA256 d0d07c3122deed6ce365cfcae7576e185e98a7f526ecd396730e7487b0559407 SHA512 cf2d829be74a34899313addccf3ff61658b201853facbe84d38dd648e2d5c10b21221e9c427e5e3fca34a16f0d54430537e04588705afab3749d018d131532f8 WHIRLPOOL 56833f243e4d6e210ced682b8fc8b7c9e53b802a57520aee6c91934794d2c42da4a115691963e485c18f0c499d5b8cc02014892660a6a854d8400c7c69e6ff22
 EBUILD netbeans-cnd-9999_p20160717.ebuild 4790 SHA256 0d81342f64c5b124fecfe586c95eb8a5cbc4c78d502cfe02b47115a4bd07173a SHA512 8b0461f10a7b547f07c2a4e7d9325f3612e2e4462128c20dc141fb42a4930d1c7c769646e1927cf40952eb1bfb763bbd6d9de8d1340247dd235c61301893ef39 WHIRLPOOL 717a3a8f269ece85b7a94769ff56fb585db747d5ee644aec5b13ccde360f172aaaad80cfa745c1bb51854e09324791af465f38b1fc3016daa758eefb71ce51af
 EBUILD netbeans-cnd-9999_p20160718.ebuild 4790 SHA256 e81149c3c4d0cbb98867b65ce3606b974b9729774dd546253605775018a52d9d SHA512 49120fb2b215cb057a4c4b859192d1af140b2b9958b4247d60845c07a8d75cf354e9dc7a6f9af2c2861f7ad84f5b50a6bcada11cb4e615385ae7b4bb670a20ae WHIRLPOOL 3578671e0a3aaf2a9fc6edf552d54fa1f5dbb83390163d99e418f9c41f612de5fe73d74dc43ee4784c14477f999d1a5742efc3de982d3fc48ee618deed38b52d

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160715.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160715.ebuild
deleted file mode 100644
index 23114de..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 6d33f37..899effc 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 2968 SHA256 146b73a492e29a60bf968b2fb13654fb1487dee1ac8a5ae7c713005cefcc5456 SHA512 666c18b364aeb632bf6e506a44f9af732ffc13f3d4479c3df07aa92b0249f00e788a018dd670fcc474eeaefb73dcbe29676636cc551a8ba9480d6ec1039042dc WHIRLPOOL d494213db3a03d0a0e45321308fd3b7478eeb0f32dd20441b20068b0e11a612b0cdb15394abf355c2657c7d4e386e384a88b550d15c114d002acc0f76fa29d8d
 EBUILD netbeans-dlight-9999_p20160716.ebuild 2968 SHA256 50e296b783a01fa2b5f45ebcbc6b97e5034b266db27e67b6e2ad9c2f839eaa5d SHA512 4c34a32ea63fa83b8c6455d8a286745cf5e93fb1b88c772efdb3819e6c50800ee180eff92fd145c4078199a0917f1f0c04bec9a4419b5f216ddfb77ffc16e431 WHIRLPOOL fbc935f8d3b539ceea0741d96fc7d2f545c064e1626dee1222601c6e51bcf77e3695be538fcdb7765b0782baf831bfbfc607aa869bc39df85f7c7e909809bbca
 EBUILD netbeans-dlight-9999_p20160717.ebuild 2968 SHA256 a9585c80567052a2dcd624548c5205f9c821967a92aa4faa8ef4b0b94cabfe22 SHA512 87bb7356eae2c64e5ca35381da57d2c37ad84df2a3cf05df59559cce0a4af58a99e65b1635c91f10661b9ced5df25d7d039d6daa5350bd302cf7a1fdd0c33190 WHIRLPOOL 8b53e3008878d567464d904b35221405cd878d71000e60c87510fde522056ad59fc10bf75e48113cba71f0da8858d973e97c6066f9c4e4aaa962212007b31558
 EBUILD netbeans-dlight-9999_p20160718.ebuild 2968 SHA256 29ea8d0f4d7734f8eea1baee1f05614b67095abcc4fe57f08fadefe103e303f7 SHA512 a1f33faa521f7cabc7c496bab931e60d89c5e31193b3444f3421803443f44df4235d7f99c98eabdc4a38d479c99e74fcdd605e8ae9b4f4f6a356775d2ca8da1d WHIRLPOOL 54ae990fc10897fd3570759747b2d4f11c053ae22c55285871b933905390004355a6256ba1d2513c77c976ffed93e9f44d63b1debc0919f1c3b3a81d0eb835dd

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160715.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160715.ebuild
deleted file mode 100644
index 8d4be17..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 18767a2..8d9387e 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 15825 SHA256 b739e863158005b3e9b8c199d649a1a201feef8a5ac3c2d28730bc0f7fe41fbb SHA512 20b1af88ab9e44130e08b79c2c7a914432edbbf96aac914f12b3baa13592841ded88c439a7a5210db387b1c8912d3495d9fab12258cc681bb22af7b66781f303 WHIRLPOOL 5283ef5dbb15402da9bc05cda178ab1e51efa457904e95073213b64869dd9adb94bf44619dfa4b1a263bced83de3dc83f725951062c6ed5b9e1c1a10a4cbb564
 EBUILD netbeans-enterprise-9999_p20160716.ebuild 15825 SHA256 55d879123b6a613e7a0f5a8cf790bc8e617011d1eaf233022376f1df34267b2d SHA512 47d9fb2d63ab282fd5641fa928f799c04d072ff99dbeeca03d421cd7fb7b19acc27730277822f5ad46b4767f13ae578021ad2c34d375243736452507ddedc34c WHIRLPOOL ac42768cd7c7a1e6c15dbd740bc9cf1394baa082ee2da832d2bbb64e4c833574133b7bf4cdeb351b0d1940de26333b605a99c738c425bc35e250bcce5fdfdf4b
 EBUILD netbeans-enterprise-9999_p20160717.ebuild 15825 SHA256 6f265fe58c8252107ce4c86f337fd1903c5de552c4ca3a9c54de665a84ebafc6 SHA512 8aaaca1a4be98b54537088d6f7d8fd9dc985e1a85b6ce974af5557aa35a02576219d89cd923b92660b1dee84f956a261da0f4d3e85d11362952d83a0e6b10ce8 WHIRLPOOL 9c0d0742d2d54ba348dea2ef47b902d11831ed6ec387f3c6b2992c790bea3de4f303493b92297bc63299ca3ffebbe0096fe548d92e4ba2ccc97911c6cbd20680
 EBUILD netbeans-enterprise-9999_p20160718.ebuild 15825 SHA256 1a10b9ba8c620bbce7f5a95006c34e152add7c03f7cbc7dd9c116e64d0e10545 SHA512 1864b9431d785257d613d04ce76296abe59c4dc3329d5d28e79e8c1ff53e4a9fddfe07b4baa63b557d2936ed11978583a6dbea566a46f997409d36044ed45c82 WHIRLPOOL 888c37f5da6042b533e95f3aaab1a1fe7d77c0770c7041ab6928e7ed0a904bc0799088ba09c54d4800e76c1a7e2d1726b21c6823b3a6e3b1e03430caa023c103

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160715.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160715.ebuild
deleted file mode 100644
index 851c882..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 b08f784..0e7b460 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 2913 SHA256 9f4440176eb7116e8fafe44e0e0aa1bf332d2965d578d406fd8909240d1dbff9 SHA512 d035a940cc58b0b7cc7ba3bea371249e40fcce54c89409871d683da7aeadd76396f7f0ea36dd177917b42eb924a98e568f1cabcd1cac94c33acaa880c3d9730a WHIRLPOOL c6b2aa71666994dae05aa081bfcbc86904577fd7668fe27ff37f8ac5ebc8897ba653b26a72201342fdf434f8e841718424f8921fb5ec8f92bb14482cd1cc5317
 EBUILD netbeans-ergonomics-9999_p20160716.ebuild 2913 SHA256 f85c5186e583a6ed686d83f396a092a3898a1e51b706d8b71041b7509d56fc46 SHA512 9f1f6362e3357d0d2defcf75965cc1af7fc27bbfc67082dbd0908077987d5d720fc62e00df081f3a3a50c868c253e39b4f9b8416db7edb8deaed81c9a665e086 WHIRLPOOL bc244925aec449083fcece4a62d7da42474a21b4e3db4a6fc0e9e5f3916eb31bb804125eae87027305b6745523ef014b190edfe86930dc85da23de4e99c361a2
 EBUILD netbeans-ergonomics-9999_p20160717.ebuild 2913 SHA256 ae66c3fbb8da6a7dcaeeb397b54aae6a4b8abb8f5fde2ae34812b8551e2a28cd SHA512 4ba19510bcbe55baa0464d79b0ed3f52b6561c1d186eaab51f4ebf3291d3f5485684e14ad580a9e2fe931bf38c3cd9a5fd23d88d5b7cb03387a71cf146be2ca8 WHIRLPOOL 2c6c24750c6b8661c876b683809af4075739738c3104be7287ec6d1f738da0aba23d74b0d49641f42308d702a23ce6535d6e5183ee3f58e2bfe5804fb7808b4f
 EBUILD netbeans-ergonomics-9999_p20160718.ebuild 2913 SHA256 32f0ca7b8419bee9bfab9717309fcf88a656a66d62c3059d3c167aa99fabcd1e SHA512 91af39c0e9418ad4e2eaceb88529e7b3e1dce7bccf825a6e7f2c32b158698ed95bccc38d4c100f8c647798dd1e9d94ae18ff6a82a233dfa707a905d5e40d255c WHIRLPOOL dfacad331cbf414d39be119594d3e9f31d8578d8df2e3b83b2d4fd7964f3bf0ed6df1f358cefe5ec988d0a16b64a3654acb14fa5ce8b8ef06bddad27a7117fc1

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160715.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160715.ebuild
deleted file mode 100644
index 32ecd65..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 ee6fa82..1618e28 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 3377 SHA256 002505862a979c1801612c829bf8f57fb63b2c95ad6ba8c67074bbb5d6288018 SHA512 473bc212d4602ad51a49078c46d83809cecad10a8a11290127d2c22a992e9956b30fccc228d1d1d716b824a97019aa7a4e77eef636cd22611f9e28d760fb3fc5 WHIRLPOOL c254628bad589e6f1b86f711cd5ccba1a959c49790dd3502c897a7da01b38228edfeadd3e58619e9d76039d7577ca417b51e9b9237cb587806a55c5b33d605ab
 EBUILD netbeans-extide-9999_p20160716.ebuild 3377 SHA256 6b03c3caa06d985643574bdbe2d3fa0c95cef0ca1f34d35b6385455c2e83590d SHA512 51022e73eb4724c4642b035c7db97e3a87d08ecd179e6c681e0e4a865639508c916252eef2976b91a766ae4396ab254e3ebc6cc7c8d452a40b6cf88131ce1277 WHIRLPOOL 530c30e039e6717e367e982616becd6024bdb325a9a9cb26206c0024f6b9a231b8e4cd01cea0d7d7f0b6abb52fdc0c34e534642fa51b87036ceccae0d8f77da1
 EBUILD netbeans-extide-9999_p20160717.ebuild 3377 SHA256 ab26b07b05a58b23549b5087c7894145d409a3d7e77776fb402d3edf1a7c2210 SHA512 610627b5f47b2da7fbf073c0073156d038db0c62697e2cb385cacce0563f9f872b91fa56bbc1ec7bf9a439e3fc0ffa7db3a524e335ad8732aa97554174e13071 WHIRLPOOL 05b1cc8602f17e3becdff52d2afcacd2b3156b9fe1294012b671b51d566467c2970a93c33bca0f793a52d04e12526ca4be56832e318321f47a3f8c5277622017
 EBUILD netbeans-extide-9999_p20160718.ebuild 3377 SHA256 ffc49c7dd3ac8fdeacdc662e39255435e6ae8c565d9f6ad2f5ef23f823eafc8e SHA512 a1a58d086327277daf40593dbbaf78753d3eb20148c729647bc1262047e007790e2908a66399f0dd696519b19b3528178628bb5a628e7519d49e644309a18e17 WHIRLPOOL aba437852a1bbd5330502807173be09c30ae011e49075b3b56caf8dc30a449272c699baa8c0d35fe057b519d3f642b471bc20ace76db66ef14d6987b4ce5bd1e

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160715.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160715.ebuild
deleted file mode 100644
index 8e1c9ca..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 50f3006..1cb1113 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 3416 SHA256 b6c360cfd4a698b5c22babff3279bb5eab2a361ad0ba1cc68713f4f3b3f8e6e7 SHA512 a4b7f892221cc7cd95d4193b180b375f2abb513fbbd681b7781368f8320551aa565ce265e94059052192d94fd44d644fedc0a09be12e8d0751b4fb63f261ecd5 WHIRLPOOL e0e877ee2be3e5b8aabcc9b5ae325367b81c26ba41b322b79a879be826693add2898acbdd54d43d730c11c89ca3f766fa8bca47e603426f07e424f1c8d1fd770
 EBUILD netbeans-groovy-9999_p20160716.ebuild 3416 SHA256 6e5767c909aeba1ce22a27829a6319723bf8cd3eaf455dc0f00fea2388c729b4 SHA512 c89bb62141b8c72f66e7132a48111d4f43eeb1d928e86aa9a751f842e5682f6f74d13b4a65a2067dd5cc47ae5171c160383866304bf1db4bc33ac3ddddb6e145 WHIRLPOOL fc52c9492ab29e863731f70f43276e5788ca725506d208a33d9364dfac7560597ea71d1a608aecd9f66ea7be2a2b7b88ff2f562ab36c48318d47eca66884038e
 EBUILD netbeans-groovy-9999_p20160717.ebuild 3416 SHA256 7b05aa2637a21e64889dabeac2149951db5779a4efe21df2b06d21ba84c514d2 SHA512 dba6e3b94b813c476cfd2976a840207d8472c78a70d8c9f6cf677e8d3c9d9f30b687a04d84239bbe61b05ce76b4cb2cdf12d0fdf6c6ae0f7d3e83e37786b15de WHIRLPOOL c81b0b1ddf9bf155003d0151d1a8ec63b7423694238e0a848c3d0016e1ee5dd44a2dc9f82a3eb74d39ac59ce5b8631254464b98e4b9e4b3e8f180297534e1446
 EBUILD netbeans-groovy-9999_p20160718.ebuild 3416 SHA256 9daed92e913019b7499bd9efdd6b2a4ae49baaa4b17ff41a6a7102832aadd438 SHA512 7487949ae8209a0471418ab2bbeeb25d7385ef03ebe86842483ba7dd387a5811d96c1085a8e5f598d70ada57277b37b7b76d9e2a2b5f13fe1b551c04be780220 WHIRLPOOL 5bd6715eeaa05ef4db0bee0f46c9ab8f0b02e70721af572fa234bacc23182d33d586246b25abae1b002ced01fdc9079847b5cc296b1c594283754ba691e74dc9

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160715.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160715.ebuild
deleted file mode 100644
index 8eb4f93..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 fe4edb7..be14286 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 4126 SHA256 4975d85f01f7d3affb5c5c2dea2368d291936fe4d02f69b68fb2da1541ae39fb SHA512 c02fff0e78f689416e6541d32af0158c8c9bb475320e042404395af421134f63fa823691e8cfc971642e5ce4d9360f3e5c5ebb2a69fcad7aabc54be37a896f39 WHIRLPOOL 05d2f529643fcf7c7c8e7afae9483d5de0b2f22bdb0069d932016785f0fca4a6d0e1bf8f5d1ff999fefa4b526ba2dca522ce443210927c3f9bb2e522011dc345
 EBUILD netbeans-harness-9999_p20160716.ebuild 4126 SHA256 f28c3517705795aed249b12b176cbfd7d711ded55189b9ab0f1c9a4597e87102 SHA512 3f48e9d279c6dd86d2b793d86111a2dfa688eeff9db3ae9b112246e4c0a37c2fc4272de056f58143826626933ce2f94c5212f247e02a785f19cca7c58c51d5f8 WHIRLPOOL 8734c83e8737c202ac276f2160f87aa0513b701f885004283a0328ddac2445032078d38c096b4bd03a3d3deda1cd1904dd220a0ec0539827b4ee2e46fdbab777
 EBUILD netbeans-harness-9999_p20160717.ebuild 4126 SHA256 bf0875a3b8dc58b69add80c569c93d9a68864f258cf54ff2b0680b5871fb1e38 SHA512 1546e99ed7f9e5d4a1af1d921b6f63664ea35c7c61baffc598ba0c851429f5d61776b055acc89c018de262ad0f703ad5d12d2a052e65e8c2b3b64d55907bb681 WHIRLPOOL 0188144a6491042dcc31a57ad31e5547f4adab74ef032c1922405384b32b536b5fd0c54ca6b3171824e7c5f8b312c4cde63e120fc519a7aaca76925a63fd7639
 EBUILD netbeans-harness-9999_p20160718.ebuild 4126 SHA256 8400b79625bf5c8e64d1823c2ae120929e6062bff1071a14b7eeffb5463f0932 SHA512 be2d7ebb929506c00c6e100bf927dfdbbc51418fde77b34cb17a06fa73daba788ee8ee1cde72727241e5aa1f44856230bc16ec161e1169cd351b7187ac6e8015 WHIRLPOOL 3a9a4f947e1712f0bb6fd3a125bc2c05eda7628073902ad3c17499eec0a3b659e38ac94bf47ffee0e3db71dca003ae167d7352444050cb855d98b7856dde4cc0

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160715.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160715.ebuild
deleted file mode 100644
index 0d45ed5..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 5c8b9e9..daa8162 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -171,7 +170,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 29867 SHA256 65fc09d4924b4f14cf9f0625745a2b859fc7effbbb21851403ee9c1b13fd82eb SHA512 b4c7d97d08b46730acb48354d11d076ac924d454bd8be40ed4871457bd45286b7815fb61531e8e51e00aa1554316cc4392c2178c675fd0bc5cef164154dd9f30 WHIRLPOOL 1ebf005aac3b07456bac82e952ff8a11dc80b4e29b865d4ba3be747ab86670bccef667a93be976fb675d9715468da106793bce56f5bf0fa45867f8d43fe4a79a
 EBUILD netbeans-ide-9999_p20160716.ebuild 29867 SHA256 17cf83fecba626caf6dd003923756181f56a67cacfcc97c47dea41f4986fcb1d SHA512 5c57610aecdca7c50002dd19e227cd162d2ece0810e629ddde2126e094662aef3ab94b88c4511fa0b9dc21a3b69371e4615e218c5aff4ba7fb8f13341fc2ee08 WHIRLPOOL a051705bc573ecc858b971caa96ddef86930d77a5f1c01c5c01dac1685f323e9182e5b0d146639623c7eadad51717fe031e45e2bcf53a1e37911b76104535f7b
 EBUILD netbeans-ide-9999_p20160717.ebuild 29867 SHA256 b8427180790446c73c44eeed52e0dd98ffceb675af44dd22585af7dc5b3a5aef SHA512 5ad67cf2c97070e7180cee5fbf80066de0afafd41b495ce89660dffddd22db6af1e28f8835f16fffe194ede13305689ebe2d53ebc588be8352316484ed99f0e4 WHIRLPOOL 4fa7d59bd7bbace808896dd21db6e7ebdc0284d6df7e9ded76cde17bc01c4b98fd07ad24628e4cc51dcfc46b889e1b04e1ce7a20532310ea83f26f5e46d9e1ca
 EBUILD netbeans-ide-9999_p20160718.ebuild 29867 SHA256 13efa12ef84fd94cc662d80182f32bf510ba572421416137090ee1443d1cca33 SHA512 eef604c63f2ad53d36ecd1f123714cca30f6790ee386c43c6e4ffda8bd184ee6288e75eca4aa3644ec2b31b9706ae3035c421d384a35c9e65083242d6265fc99 WHIRLPOOL c828d4a89504789328b3bffc93a5c4237d709db7a09cc5bd78ace311fd20eedcd26853bac3d01a4405d8e3bfcdc6ade4aeeed7ab70a5e3f440d58a5bd86ea6b4

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160715.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160715.ebuild
deleted file mode 100644
index 506c446..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 e4782ed..ce6992d 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -37,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -66,7 +65,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 15656 SHA256 c945bcf64cc7320255cb48effb27e45466e19704d63735dac2900c8496740d45 SHA512 b355b605f733200edeeb92d53394a48076afa0225c7d69fdc7386634d14428e4c3a2ced53dcbad65e61514ccf26c3b93e16af14e9ac95caea3e4196a1afde253 WHIRLPOOL dd0edf7c8f2b10d4e1f06e211d04b8495c99d6f0047638922060b6d9c18f141852c097b4b9ff98deebaa7b5f8a9ea359801e391f5594638b163042e8e50c6a03
 EBUILD netbeans-java-9999_p20160716.ebuild 15656 SHA256 a3c0873f6f871b8e84215e61943ca1943ea41fdd2e80567203850038f7def2d8 SHA512 61ed2b820e8a0bdae95687951c659439e532b995e4d76d094ce0fe6a1de8e1ff28aa17285e5e3be215a79abf2098f5cbf07856c51fc523acbb1e3f6982f9d767 WHIRLPOOL 481fa875998965c15cfc62cd1d7ce0107f2e94a6979d9cfb0bb067057075884a16b1acadb96b11894a228e9e7e4b14237d64a310672b5880d1cf8580d37876e2
 EBUILD netbeans-java-9999_p20160717.ebuild 15656 SHA256 ecf2234a5d3f6dad96eb51de1785af556dc2f7111104564dc175344afac0d4f0 SHA512 279741717d2c2f265315be722cdbf0ff773f0d576e444854ee7149ebd922145beb89181bc12782f8a46f9674b8ace5de7b33ba0dc5b16a47e181425a123e4d8e WHIRLPOOL 9f37b0156619c16b5e0d467a22dc3ada6a162fc4e5831f51ee3b998578829a31a8db5637169d85d79af29fd74edfd33c6fdf1182153acf86ca511a638d276a53
 EBUILD netbeans-java-9999_p20160718.ebuild 15656 SHA256 2a657854974f3af8949dffe4ce8625047483d8d7638e3aa21dfeb3f45a63a176 SHA512 8397e1561a591368974d1a9475a0cc641b3429c7bed700c151f0ce844ce0f796fa68231e486932ebc82076e9d4f9f96770f5faed251d32b69cc5a62e1f693c18 WHIRLPOOL 757fdd91854e97ea1b8c3a23066324685d2109401288b504a95afa78590bd0780c41530f770dfd722a74d022ffe8baf4f77747f0bf00416767e36c8da30631f8

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160715.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160715.ebuild
deleted file mode 100644
index 08bd20b..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 f25c4de..42eeb9c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 4971 SHA256 baa7a568f77a14b239bf154c1e2c664ccfeb16936ed9b0508e4801833fe0fd65 SHA512 71dbada1a7ce6700a5bef7e21838f5acefa7e8551c64768e5695cf6c2618fa5497700e0e5bfadb69d4a857790ef4fab5bfd580ba513bc11f662c9c7bc8997142 WHIRLPOOL dbf11ad0d3d482081b6c58e274efdf9f66489d31e3c0d2001faded776a03e7e406ab55e270f78aeef815c46e00fed0bf491788c304afd31d67907ace04190d79
 EBUILD netbeans-javacard-9999_p20160716.ebuild 4971 SHA256 d51d9eb7d5e69dd46fb8fe70340d6209ccdb488c6ce0bf552b7d1f8e461eb44f SHA512 8390ac99a224c821876a49ed7477035fc18ae83b21693e4ae3fc349b9880a3a45f4f24d4fb4e8411ae8cd927de8a5c7160317f92640669a1761e2c265f360bfd WHIRLPOOL 51823804c721644cbc1bb59deba065f97a986a654edbbf25651f42f9d2bb5dc0f3f5c5c2d56eab56d5f2b08f251c76c6b7abb853819f55072b454a56d48128fb
 EBUILD netbeans-javacard-9999_p20160717.ebuild 4971 SHA256 191d88d9b85ca0901a0122d608195620b4deb3f2505fce77b0e0e78944fbbc66 SHA512 4a1477363cb176cd2d9e9d2122a8c852ab1d8dad7ddad4d3a891a08c2c769cb2872d1b00721661e0a4fc92cb1907e579c8baea9fa59b111f2c0b9d4d72f3796a WHIRLPOOL 9f35a26ddfae9cf9a717c90108140039f470c17d94c88f6a1cb1a4d751535a0972c20843f264f408949be40b56d6a207b8b4535b2aaa55712135460cae40ba98
 EBUILD netbeans-javacard-9999_p20160718.ebuild 4971 SHA256 98f13fba044070d0dcca1f8156a4a005c6c72f0fd5f93ad07bcd32d038823a05 SHA512 d5478fb13198dfca9706d3d61aeb623a3b5e7098e6b60b3dc5cb8b382ddc11ef300513cb234d8344313bb571ab883261651ca7a3c842b9576c4cff68c793f325 WHIRLPOOL 5ae970b3df09cda9782db6a9544e736a859811e2bc5814a8534ca2250a0ee00964c35b56f283a9daec6d551dd4ccf8879665ef0a5013bab1247222626880b169

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160715.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160715.ebuild
deleted file mode 100644
index b294aae..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 4b4b8a6..85e13df 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 6293 SHA256 679768220db001a6e5bdea0d232e0f247ae4ffcd1fd630f0e4780c952c83ac07 SHA512 17af308168a204c733327f561ee732b7ad99d93a1ad56a230553f139dd2cbca5c914318f485cd3ad18f63c12c83d179ca9cb711058f06db09fd69853f293f267 WHIRLPOOL e2d5acfcd32e114caed6f1b8ea3bfb026a6e8f7f44ebdd25feef64845adaf82b11b723d46d926b16bb7fe476150a49e93c3f3c33c73f7979cf2df71e474b1759
 EBUILD netbeans-javadoc-9999_p20160716.ebuild 6293 SHA256 8d294b83ff623343d453c4142b0c8d8b6b615fdfbc2cf4bde0b1ab9baeda5dfc SHA512 998b57833278f42aaa36f0f7394328b1a0b56677520cf407b885c452f143489c06a364cf7b6891e099511c9bcf7187d66aef009a2d1f940b6ce5e8643dd7ba38 WHIRLPOOL c7e1f86364ba973d0aac1102218a542333c064b397ac2d702be5217ce35eb9323e933994cf5e708978188dcab598099124de4514fc8a81c5c8935c797836bdb2
 EBUILD netbeans-javadoc-9999_p20160717.ebuild 6293 SHA256 3135b0769bc56bb6754e5911e8d94bee8eb5b827f6356433638dcb1f07ddadf9 SHA512 e7d5cc0b7c96a060b8f9728694331cca4699023ffd0db7bdf206e45f58b1f405ac340c0815ae5e51e1a7d86008893428526222c21721415e0ca7579eb9e2e06c WHIRLPOOL dd81408e028eec410e4b1f1e155d06be29ff7639cbe5821c9b97c482468fa9c0c4ae742fc4b87200434c82970bb2e7edc991abb6c87c4acf0d52500b34d49645
 EBUILD netbeans-javadoc-9999_p20160718.ebuild 6293 SHA256 62b444faa8f5eb04280cacf1e0e753b03e6bda938787a3203ceb01f390836d0d SHA512 39cc041b1126262738bb1c1c1e74ae3d877d747035123c138cbf445268d6a70e906f9e4aa5af951e75d26b234ac4edca2ebcaf2df9df1e95b23d6b374de6d665 WHIRLPOOL 5f7a82bf0f94c1938789a553f446586825bc575dd284a6b4bf23739c1eb721eec423cda5f5b2e9798cb34aa227d6738c27693f832a14e03548c6d83476fc868f

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160715.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160715.ebuild
deleted file mode 100644
index 9a304c5..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 c142843..00c84a1 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 4717 SHA256 39c6744a8e6b61dda6be4546fb4235d870c0ec330bdd171359274bc3f74fb86a SHA512 18a67072723595d506d56e4c652777485deaf1a320a32a74df0be27dfc0ef8e7ba21868968f7a075fb6051b2340f0c0e8756938cafea60c100f3ba858941dd26 WHIRLPOOL 135a12fb0acd5cd27553e109ef21c7392993befad892c0f3e3a5ef05f9738ef13d1e66dedb521796697015c98156aa7f869bb9a9998c2f9334c68b312d99ef37
 EBUILD netbeans-javafx-9999_p20160716.ebuild 4717 SHA256 54d965847895fae2142187cea50525c42e5acd2007d29e93b5277b37e71e3fb2 SHA512 bfc61c6fa114b561bfbff290b6e52823247a14aa6c63175579cd3f4003d0bddcb614d82d8311c2c130e2c418ab76e32a88d56922d0a053d61a8e55a07e3960be WHIRLPOOL 4aa618764f388d40985122898b93b71a279d7dce47023edcb2e24d324e9addad4973fe149e24d0827654706ff0b7b3d0f04f3a9284c7362d9d8a62cf873d241b
 EBUILD netbeans-javafx-9999_p20160717.ebuild 4717 SHA256 0f65fdce06426559412a854623ed39a08eade81bbe1676142ee5a9cbc46f4e10 SHA512 77765eaf48ca28cc181be0ab4fbc6f617e94f1be57e2c862d35a0ab996adeaf71775156e1744567e1831765fb3febaf91bc4461bf183f40d4cb4357889159f15 WHIRLPOOL 6db931aed455dac3954d7aebe46bcbe0cbd824fd87966ec41306160be43b0817643b27ed12d5faa8faece507da6a00092830bbf74cc0fb059be404ae6b611140
 EBUILD netbeans-javafx-9999_p20160718.ebuild 4717 SHA256 54454f6035322095ba1b566c894eed7a6d354b88021eddcff15a7bb981cf534a SHA512 a3a40de8ca145664db25fc2a589a382cb2ce3fc610f5199d766d786b86fcc3436b0c91d9c281fe809288645df99df8ca2029873f8d5ee305f8d555228622df6b WHIRLPOOL f14bab15b00c5ed84c80e6a63c651030323598eb995b88b1cbb17847ad89d69af272681cd7645c3b275f58ea33428baad1d1eb356d57ba6247bd2b14105bbefa

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160715.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160715.ebuild
deleted file mode 100644
index 6d0276d..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 3f8a4be..406bc01 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 4412 SHA256 4565630b7f89f2ea344275e800dfe331aaafa79fa87f169a8618398f14ae5f93 SHA512 64fda2531573cdb9d829c0d96d4b95c30e707893925dd9818942de979fea396178c386c2053a1492aada9aa231d1715ebf813ef6de6e678135984732368dd90c WHIRLPOOL b94d195b64832db30c528916850fd73bc2e9ea6393b7b960a4b1541ad347213ad967ffa4c842a793fe496e0888179bdbc4abc79c2dd6965dbb564dd81294e327
 EBUILD netbeans-mobility-9999_p20160716.ebuild 4412 SHA256 f2f3bf9adc3d923a7103dc5da9a640ce630cfef7ea6abc2a50db4453eeaa6d2a SHA512 18603992f1ea260e763d2f346dab6424b0704c055ae5db8adca9417ce758e03aa2a71b296b07a86697df720325207a3768e993c20e9df1e7b97d42aa11168ccd WHIRLPOOL 84829442c5ada70de596bc010359a9779ff514bcf1fae9a4591d3a94aa438b8d100d294ca26d415fb85b9f0384717c98164560fe0150e19967f78d6afe3e4032
 EBUILD netbeans-mobility-9999_p20160717.ebuild 4412 SHA256 9875dd3e26d88b3c7bc43c09dc28e2b9b86a29fb19501f57cdbb33e659e6045b SHA512 654bf97176ccc3e20c14dd3948227fce0f8b9c0ce4840ebe9ae8d64670848c6255ac467591cdb591bb91ac0c47f597ff11c88c93b73c9bc34a58260b2fcebe74 WHIRLPOOL 6c9d22fb45601071e5dca0636f26dcaae0464b689c32869c934e270a58f9a057cf247ba9bbe8ff0b6fdcc66df9298c8c79b395772fccb21f3b763d49023feb87
 EBUILD netbeans-mobility-9999_p20160718.ebuild 4412 SHA256 64a35f93019b49179ac7cda280bd9d86ddc2302bd37ed5b43078edf21b950f0e SHA512 6883c112f3840ee518756be54e3713e48f0500f07ac1d3a0be426a993c4fa57234838c7cbcc9f19802e9b79604066ac5303bb897071ab13df0016f3abc7b5905 WHIRLPOOL 45c329a470d8e446a3f64dc241d30f7d2b43775bc8b1357bbed527fa667827ef5adaeb92202457183e500f0fe720ba181dd1aeeafa44085316744b9127f8061e

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160715.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160715.ebuild
deleted file mode 100644
index 6301644..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 66d41ec..4015c74 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 4111 SHA256 3b32c1f634e83025c1f9f274648e87ecb8ab12c30c143e26821e350743e311f4 SHA512 9cc0f04c0e510f14efc8598081cd38ea05c5ee0b5fea3b64a55e626d9a8b039f691f5352fbedb69864b8849f5f6ea9991d5144ae8d33b65fda6759b607635955 WHIRLPOOL 1c415614d6cef3b8f34d66a66205cea74011d13f3946d8963011c727738e312962f471bab1e72d84ad90721b4c0c9cd42fcc583d34b442636582d79259b11dc7
 EBUILD netbeans-nb-9999_p20160716.ebuild 4111 SHA256 46bbb3e1fca18aad791b7cfc20c2c2a8671004d5866541d5a7229b6341b7c04e SHA512 de474d1d8aa47f86f2a6f2c7e67b4bbd7f0b8569b92fbea1b67b53f48d17615a4b6eaf211f6ebd8beecda311f994335316397a30b4f5c4675e2216de304d803c WHIRLPOOL 0fe3635244ed4e0f9bcb48f32d4ccda1f4a3282aa8f4f14a6429e770b8b7d1ac028cb1668cd6657c5dd834cd00a8c875dc797fbaed8f51793d3f6d87ad47efe1
 EBUILD netbeans-nb-9999_p20160717.ebuild 4111 SHA256 44a0d82084a38bbbe204144c277963858eb54bd3e3e6dc9fba7eb127053dde99 SHA512 ab2d69dcb56a54c8332d960adb89cd78c6432c698f8265438e3536e4d14257fc274e37ee371213872281edd8980484d9c5de3480fad2b318bda1de5b56ebc2cf WHIRLPOOL 1b6b8e942d071a90c22c5359521e1ee7a5f5accaeeb7ea514f75df66b3a9aa95c42ac6da65aa6a7f8e67b8eff91997a12c000ad9900c7c7190619e0ae6d83499
 EBUILD netbeans-nb-9999_p20160718.ebuild 4111 SHA256 27361fbce4072d55f9911f533707a504c51e41bf3896302fe629e85aac550f55 SHA512 ec25644ca7bbdae22ad5603aad0b344c03fece8593e7096c3b5731006e8894593237bb9481b9046e308c6c5f9d5ae35514424399d0b24201b84881c8d06556e3 WHIRLPOOL 1eaacd853ce131ae88ef2dfe92c6525fea9a9d9c02a473dfd8b1edfae8846ceb1955d9ebe3586ca66ac2798cedf09344f731281ea7934dec48ad5cea7ca3cdc2

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160715.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160715.ebuild
deleted file mode 100644
index 9212424..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 f726c54..e6062b2 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 4418 SHA256 030451623ea9bb0f748b15514f923473d6936b9a3db22af98b580f712a9ef845 SHA512 e31b987c71b71084cc309febab5c6f642d501b289277c356c57822cd3b49365a79a0db0d40e741bf2678e2f4ae253be2a2644b7d5c08ccc3fce0dfed71e32f53 WHIRLPOOL 1d8df726130832bc665c9b0a7f921265cb75f69a12425a0d8a1b86b8e7701c3732ab8517f15d414e4e9b5aea54010cf63d4eb42c27fc5e0be39f064578ddc6ca
 EBUILD netbeans-php-9999_p20160716.ebuild 4418 SHA256 25ddbf01cc46026f080b095088da20c8dc803f33eaf23d2ae182b41ca0539b46 SHA512 0420a75fded52cbc35837525fa1747f1f5d214b22b16fc21a33f317053b77921dc6d790b03d347ea8f33fc3dce45706be19fe7fa1979c777cef78cc9e0355cb0 WHIRLPOOL 0d24569f14251395403572157e1c53c685149fd39c46af5f256fbc18d3b542337e9f17ea7010ee60b76842f4e275938bfac60a44426312c685b1952c21e07a4f
 EBUILD netbeans-php-9999_p20160717.ebuild 4418 SHA256 8d2a0c51ebefe4b3f582e31021b799613dfde87cff55553ea1807b8332da03bc SHA512 4d37b7f8ac213b9a0a23b39a2551f22e82afe7b0ee76e19f0a5154e749b56ff282b0c2f80af68dbf9c5fa79dd4de1f3877a7f52b2628ad4a736d696185049b0b WHIRLPOOL 7207355781d8769e1ef6e333e34fe814974556aae771e0a8cc1a0eff8dbc600e4a580ab31b844a40b6cbccb7e01127d3c0713bbdf4da72c6512f8beccea6a5e5
 EBUILD netbeans-php-9999_p20160718.ebuild 4418 SHA256 32e3421519f34969dfdd91bc8d2d337d7ddb3c1335da16615f7a4433a2bdaa80 SHA512 128662633c52dfff7193102504890e47e195d6caab1101a94420baedaf821e7d72898216a93856a6b46e2aa758caa704753483e173960eea25dd3f21f24158bb WHIRLPOOL 921d7fcffa0e9f3f806c4b02631fc390fe7a497667327415796d60df88efb1931016bec0fbb8d7243cb14e413240354aa10d18de07d0f0d0324b38b2708c0bdb

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160715.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160715.ebuild
deleted file mode 100644
index 2b6bba2..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 77f49de..00cca81 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -58,7 +57,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 9520 SHA256 9c6be49e7be03745de2b951be958697755fed986823aee3b7ddd932ba3c138b2 SHA512 5d992a259238d3585a57cb40e1958693f52aba72dbaa98da52452d3d1849f1fc5f52eb903d13748f379ccf4101c6d93d33eb0c1e193d5032d49d2a93280def62 WHIRLPOOL 32d029610e5ecb3d76197ba2304840845fe0c4fd81174dae7d9f06c5e33ffe00902ece070beec522be3185884db1336fbb5b8e278b3432ccf5e4e7c8ffce9a5a
 EBUILD netbeans-platform-9999_p20160716.ebuild 9520 SHA256 beead83e2a67d041641e0fa04430018a20a7577b466291431754d16752e52494 SHA512 19526b5e2c42651ab28aa91fa81b4d550d62d682bc1e54af6d69dd59463422dc9e396576cc7abe66e18e09ff1de1fbf654e1a387a335028e76352ef9d0487432 WHIRLPOOL be30be5fe3f38873b8c0d36820c32e111f008c07e62495569fb015546d5b209ad686015ab4c180e6dd8ef364f295f59f3c376bc0a8e51ae2e85e510ae10985fe
 EBUILD netbeans-platform-9999_p20160717.ebuild 9520 SHA256 27288bd56f3cebc554e4b8790e3bd5607e8bb32771365bdba788df7dcdc65330 SHA512 e7ab57eac6b422f986c9f32d7f7d68ebb3eecf642c6e30b4110269972791bcbd0ecb27c30b72a960b13da39e0ede6a5a7255e51c731464d6bbddfb61b7ec8b3d WHIRLPOOL a1d1c7cfb60d2e114b227bab18a35f01e0b555b5c879444136935c34de829e512045e9ea813f34084515615fc11df536940a630190e26c8a8b9cc73f6676efd9
 EBUILD netbeans-platform-9999_p20160718.ebuild 9520 SHA256 88c120ae45fd0a1cfe2ebda9ddeafc6908f5cc7d876993fcd19b7a55b1ab5cc5 SHA512 635d836c864c6fd13626c2304562cd0ac2276bf8d4ccb88b8b3719cacf5f9ca8504ac090b48696616b0f3e3f4f5ad76af4844d996192aada6532c83003652b64 WHIRLPOOL 16f68d3443b7fcc76421bf359728902f638139a02197debd8cb59332ce9cc84021fb19160b0e19aa966c991f6d1d547b238215e56fcd7dd0a29f06b6383f339d

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160715.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160715.ebuild
deleted file mode 100644
index 7e71711..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 0b26190..75d7749 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 3472 SHA256 2822a260dcc2b29514bbfe8a1387c45257f23ed8aca503c619369b56ff491be6 SHA512 74064cb38322cb0f8ff5a2151b7341c2d9d926816455e949a3b4d82e6b52b1959d9605bb16731c9dde9b81c67f75001d5d715719bc8a6f24ac76851ad5a0cc1d WHIRLPOOL 2bd5a03eb1bb56bfc4c5cc0de9f38b7d10a43fae2113b924938ec02a13e15804ec944d24debc27a0d0dfd1cee9dbcc90a48167c1b2a396de04ed14c545aa85f0
 EBUILD netbeans-profiler-9999_p20160716.ebuild 3472 SHA256 86e23ce300ec6573cb11426495ab2c49c1a9cb773db852e2ac5d2b60f817b4d2 SHA512 66910597ca2e010d60041642cd79d34fee945e65c74987f52cfead4b276dd25945c6ecffcaff8a22c74afd8dfcf74cc926161ba2764b3ad636ff905fac8f820c WHIRLPOOL b49a557ca4794ebb203fa63de90479acbf013e3a99d54398842fb370826dd954559947d8073548eb52d4ce4982f8e50df8a6bf8165065fc22502920469535568
 EBUILD netbeans-profiler-9999_p20160717.ebuild 3472 SHA256 ca94edf54cb5dcc24aa4736c13c9d31eeb64b27014cc84e5369b45fe329113be SHA512 88f7013c3e3181a998be8bc5bf1a77af2f392d6efa4b5b65c47a167b241255eec57b159fbf355e6570c01c2aceb56bb1e6e92f3689a6031e4915194b4a7c3a91 WHIRLPOOL 35095660c2403e167bf207bb8d277c2a1ca31ca36b18ac442dac9565576962ae5b89c687661d409132d336737810fb08f420166fed4008be0bf62d35f991a626
 EBUILD netbeans-profiler-9999_p20160718.ebuild 3472 SHA256 72318a0ec7774e39ca877fd154c64dbd09eb7db5967d21a0a7d124169541eae3 SHA512 acb5ea7e404f23030f5a09e52beee7f397b9182b04071e78020f91d034ef8c4c8a30b64cd168a3732401c6f4d4879991e8e26a8a89304ce3af30097e4d51653c WHIRLPOOL 2da7ee55f5b50d11363cd0294e74e2adf00e084190b784d080d95d0adf14c139cddc58d7e7bc3c974f105c4af3a3effa9a8e3451c31c52252218a3942dc7155f

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160715.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160715.ebuild
deleted file mode 100644
index 5aae7c2..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 e56a520..5191c20 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -23,7 +23,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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -52,7 +51,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 6242 SHA256 9bb795db0d5d42b159aa1ea570612f519fa4a80b31fa9ad0d8c1827dcf2b8ce8 SHA512 91ceadcc633d325a2d90b4f79d683fd21de13d76a2114d380ec40022dfd506e3621eb379ff64e14491548ec31e51a8143088cea2d76f054461cb04cd2d76d5e4 WHIRLPOOL eb7f3f28d22c771e8a4847256582da07fd36a5744d05efd5456d940dfad79f504b6f4e3ba969b1b824989b693d82f52ee16847735c3bf1dccd839340df0c264d
 EBUILD netbeans-webcommon-9999_p20160716.ebuild 6242 SHA256 71af932f532f66cb2098bc0570ecb5aed4188e8b4d6e12e366b9a51812180820 SHA512 08c2b7c76137657aec699b5e28625d8bae24a1bbeb0066ec742b692fb3b3596816907b0ed95f0e63c37db0f7591c6b82a46aee8c5b55dafaadc73a1f173da28a WHIRLPOOL 1f2dd8cf917ebf599bc9616325182c88dc918f4506fbc0ae2c64393c85209afd7141727cf48b89f1dce229ae553bd98bc9b56d0b8e37ae506ebade08e5b219b1
 EBUILD netbeans-webcommon-9999_p20160717.ebuild 6242 SHA256 ee7200046af66189d8efd1eaa7b3aaa858dc481fc84d14821f33719b6c2a5c24 SHA512 06db68d025dd8a5fcf3a4779154893a3d174d282d157f7b5edd6802a28c405c2890814b39b7b18061093b40675ded4ddf6cad35610ed116b3719228cfe879aea WHIRLPOOL 251b4db4fcbd939a0f5a017333e33a5635cfc7baf46a0eccbfd8f3071a53aaac4497d04286f213375b8daa0a8daed375c21d86dda477c84f2065453cefefd530
 EBUILD netbeans-webcommon-9999_p20160718.ebuild 6242 SHA256 29ef334501203f367873de14ff1f88326f5cae0311f6f44d61a7569f670a4650 SHA512 9cac5c9ff7e8e1afc69e4ff73891e5dd9a9c8858a50a35f45226f03e024c3ec73818977dc54a672c21b41b1c7b097700c5e7046504276b40740f0543399a3127 WHIRLPOOL 6645c07da4d3c9496f44f5843374d81b3747f5491faa424b01c23e344ab30ae888958bcfae41222dfe4ee555a9e434c6535c0fa0009a8faf40b6d38fd6814269

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160715.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160715.ebuild
deleted file mode 100644
index 54fa2ce..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/49154F217F990DBE818AFC30642D1AC1A2E6CE89-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}"/49154F217F990DBE818AFC30642D1AC1A2E6CE89-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 2f4b61f..18f643c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 2721 SHA256 4d7c7c0b55b2aac43fc078b408791958ea5b8157ae295b4d3da20a4f4939030e SHA512 8155022da527ec33a0ac10d1a4251e83f992a908970c12dc30fa8c0191fca4d64c60ff8be1a74c4b65dab7beb5d10b0788f2df6bb71e14340d66a9741bc87a6e WHIRLPOOL 1bb18bfe762d28ae5e629090e14dde541eaab61146c3651d14432ce238f4609e531f6a46a2ca81c770dfbe1b0d7c208b6231f7988426fb00dfcfbd80bbd86834
 EBUILD netbeans-websvccommon-9999_p20160716.ebuild 2721 SHA256 25201748f1c41c55cd808a9bfcfcf614f2e28d0520a84ff81cd7069c71467c9f SHA512 088df54a45bde5648e3af725382b6a293693c0e2dca5995c7eb8c961316d42efb9b413d23b467e273ba6ef5627d26cf2ad2b4569760bd26474fea359f1085f05 WHIRLPOOL 9b644817dddd6a9dc255b729e6c909f5361cc7ab969cda75cc404604b66a74200ea31b91ecb402cfce4c9960c551ea632b213744c050f6747835a3822e9295d3
 EBUILD netbeans-websvccommon-9999_p20160717.ebuild 2721 SHA256 1a6d30ed67c610f79628c86c79bb73657dd57949bbb12201a01442a2deff867f SHA512 8aa2594ac7ff48e41c21cc884e4b2eb751cf915e5f7aa08a1cfaa5859649efccd2418e85a3e1f428b94b72a3d218144094bf8226aec4d54fd91fd002d246ec81 WHIRLPOOL b5372ebbb32502083aacd1c5fbe7512c2722ca7ed12f39ec9cad62f95a4aa86ba6f0478d6a151377596716a7b15f03558fd36d72b89573af3e93b975a562decf
 EBUILD netbeans-websvccommon-9999_p20160718.ebuild 2721 SHA256 8bf6f2b49e2dcd05969d9f616ff18f8c926ad705e8b9e72de65d229122e847fe SHA512 944033374ebd5203c7bb96495bd16e869e53089db6380e25f9a358c25315cf6bf7e4e7c4060ca4c45c42bd1a99f4d91f1be041405025d5b8689ec22fe77f840b WHIRLPOOL ec6f3d388d07930a81500da52dc135059eb6cdd698cb24ee63bc4d7d52801302dc13426f22662737d387883f6d06e95b831cdb1c723096db9968d2ae65d1264b

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160715.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160715.ebuild
deleted file mode 100644
index f321070..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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 0727693..41d3717 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +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-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608220002-src.zip 217192718 SHA256 c1c463c39d59f4
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 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_p20160715.ebuild 6939 SHA256 8190f340cbb3d9a257ccdf78226871fcddfe0b17b5e557a4da97a711cb96c342 SHA512 4f90c9e9420d84df5cd036319168ea777aa295966e79036d576f6f129be41c0d7d130ed4c1fba2c6d38e695b921d5a595c54271e38ecdd04ad4d856f8f65a524 WHIRLPOOL 4c8b5b4f44cfd55cfe114508c345ee7da90b9571f1a5d525609a843daa0485449c8e061e45099f005ce1bf7a7bb0636b5060893b602dbbbae21a3a647ff5c4dd
 EBUILD netbeans-9999_p20160716.ebuild 6939 SHA256 140c1597f86de88607f46d0182bf60651c56ef2b16792c6cff6e05c83e3ad303 SHA512 46e5931e07124ca50111668009d7ecea0b7b180ebea5b86105f0c5dbb42bd0baef793a6e937a64a2aef5cf2f22f619fbf1486d5a38447176ecc129f7d15311de WHIRLPOOL cfb199fb1b101ca3c2426988f7d18d7fdea9011269084906c37c8398de23aa91c8de6fe351d57d62e5a9fb2103595e8cf6148340826b2198972e114080f9720b
 EBUILD netbeans-9999_p20160717.ebuild 6939 SHA256 d5fd90c55429197f77bedf0badf303301cf5f03d9add4aab004b400a0c7cfb4d SHA512 d227f40bbc923f37d593ba7845027b4c3d1f1faf4dfc57b788d7ec9a0cf9535b49ed4dbecfcc05faf415828f7ad26165ee4fdb2b3b67829187e8532815666993 WHIRLPOOL 03ed806129b4f038798a2afd4242a3e0d1a6cd28f79b18ac0de8500f523a02598746b1b703829a3c1509451edd5cacd21d1ab4e4c2a20e5d50ef489e4e12a5eb
 EBUILD netbeans-9999_p20160718.ebuild 6939 SHA256 a10ebfc28899d769c6d6a3837f9c48b193a553e1dafe530eb1019bb3d25e48f7 SHA512 56ce24913ba114c730acbad124fc37ca729c812affde20500397276edbee0ebc0124f57115ded653dc51e81cd5a706dfd470d9c2c5406f5cc4f5f1b341bd6a54 WHIRLPOOL 63f15c10b004a59eb538d086be71d53610905e41ee9b6620cff814d361e3eb22335ca7f6e95740c7ca6742676e33a6d3de294e82c0a573c3e2a810026334c028

diff --git a/dev-util/netbeans/netbeans-9999_p20160715.ebuild b/dev-util/netbeans/netbeans-9999_p20160715.ebuild
deleted file mode 100644
index 0ebdc23..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160715.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-07-15_00-02-33/zip/netbeans-trunk-nightly-201607150002-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] 3+ messages in thread

end of thread, other threads:[~2016-08-24  7:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24  9:59 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-webcommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-05-26  7:32 Miroslav Šulc
2016-08-24  7:48 Miroslav Šulc

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