[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-enterprise/, ...

[Miroslav Šulc]

commit:     dc1186df9907b14f42d6cfced75488dcf465c50a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 14:09:39 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 14:09:39 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=dc1186df

netbeans: bumped to the latest sources

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 88ad0f8..b572c74 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -84,5 +85,6 @@ EBUILD netbeans-apisupport-9999_p20150825.ebuild 3390 SHA256 612b39dcd6b4dcb96d6
 EBUILD netbeans-apisupport-9999_p20150827.ebuild 3390 SHA256 e94fa767c482792638a9a2c0bc49f0866cdb80f9f9ca8cb7ab55b3ebd3fbccf0 SHA512 b6d5d0f83efcf940fdf211847cd14016dcc33070e7ac66c0e625786f3eb3107b4a4bdd92e8745af32996483b3e6377423299a8129bc6adacc129467939acce28 WHIRLPOOL 4d7e93405e7f8fd2812cf7b501bf04727518a76ae674c3c94028888eb3d36b43b5d14608b587db24ff39d236662c18ce4a246331fd3adb239a300c29034282f5
 EBUILD netbeans-apisupport-9999_p20150828.ebuild 3390 SHA256 9faf06c7fcc85ef0dc5c8384f7c870caa11cee68b126e597ad17ee22f87b1f6d SHA512 e1657f4152e71b123b06763d481e81f8468543bdfa3f0619a81d6aeb0a62752dd40df5a417d186cd9cdaed577ac9f7df69e8fad338da4903a18fa86bbe33adb4 WHIRLPOOL a741f920a8d63f29707aae4a3a4403d41812e096ffe792286156ad13a63f63ac51621293b65b968ce2197f13a562781859482763eefd4578746c101b7a536bf5
 EBUILD netbeans-apisupport-9999_p20150829.ebuild 3390 SHA256 f54103daeec9efb0364c363dc2d87e8c8fe8fa0479de1f52f7233680cfc045cf SHA512 9783e090426fe0984de4aff305b9226e8fbdfbe69e941c560a1dbbbbe37e206d396302ce537b644b4d241e570789a6b6855cd4ba8477c90161a619c091f228de WHIRLPOOL c34d9eafc4aedc3adbacca0a74d8432a8a903d3d43a25820d1c7f44d7c295fbbb7fdf6c9f19f624fb5e1648e8aea6515e82e781e9f9441709fd6bfcdf1f347a2
+EBUILD netbeans-apisupport-9999_p20150830.ebuild 3390 SHA256 b8a027e4d4258d43de636b8b69cc89cdaedf479841897b8c0341009e429f4f68 SHA512 ac1152713205589cdba68fe33c49d0f4bcac3aba98948049b5e442b37b7d61a55c043ff2ae812ffae9c8490ab0c0c9e370312351c406bedc28bec1c21bcdd82d WHIRLPOOL b225ba9ef17727aa98e40807ab6bccb58fdabe9050fa6673e143e6489bc98825d9b7d29a147f0d4a1ccb5fc73c4a0021d533cb90d24ce7450b33430f882f277f
 MISC ChangeLog 185505 SHA256 adce7acc74a7155bd7f6bfd7ff9595445f41507c4758bc3a18441c5187a6f0d2 SHA512 31d394d716ca63786d8afc24c8ad2995f7adcef11a7bb8e32aa72aa8e3e5b31963d2d6373868844975317b182f31648db8bc2068569f26314023f5391ac9db87 WHIRLPOOL a3e5c3c29a89df351b9b6020be484e6a15b006d704fefbaed82c6ada86378cec533d54dff2cfebbc9d5a0f602eb4ab79fd2c2282d3227b4f6dfdefc2d7238dbd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150830.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150830.ebuild
new file mode 100644
index 0000000..3f83eb0
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150830.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 93a90ab..a5d4904 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -15,6 +15,7 @@ DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e8
 DIST 5EC424368381D87858BD3547A877FF4D91556CC4-clank_0.3.6.zip 7470640 SHA256 41f828a13627f713651240920db9f9ae9141dc60997c0f3f0149487d594c2525 SHA512 af047e1953058626d4b0f437d17f7fb7bd900b1c3a8a2c2ee876a62a5bfc5643305a8ba814e4bbb7311add8196f493dccf3b5e2e40cbda7877aee6192434fd09 WHIRLPOOL ebbb665693adf770627cda9f4c59b28368c4e6a4695ce2eb6bada14e8cf244ccf5a02208b1ebc5dec599fd2f8d7d691c2929e58a55f48c78757838eaf7154e61
 DIST 61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip 94483 SHA256 11fa943df02788767f4c3439f142a4d1d9937818e9c0b2812dc824230d890a7c SHA512 c15a6092859c6dffe07a51a78596c09f40b0c4ae7073dc119c19462d955d4b3e4fd0057907a50db50c4936fbc802c8a034659383df0b66842ac9382abb5896e8 WHIRLPOOL 8ae8e818f912709ea38b7702cda934c41c828041244f6f1a6249fa392a98e1b58c6c1dc60921c7625dda0ec7aed30665a58420e35ba94d3c33d1098ccde87d58
 DIST 74081AE960673AF2D544E5A9B65910683D2BBF5E-clank_0.3.6.zip 7610772 SHA256 4214bc2d06246fbcfc389a34a2f95f1d0e1b6f69e406bf1246ca6ee23c0533b2 SHA512 a53a63f5f62dea51ceba9ff6b8218505d5a268aa1b347132cc08cb2a94f5cfee4379ae56e9fe44c08f87f9191ed54b0ec1b483fbc53ce70c6325fb2f2a0f2588 WHIRLPOOL 697ab8d14a5c1c0b6029e51df5dff84ca69375cbd635b672b76347d018e7bbb9c0909190f04f85aa67e327844d5b1fb11a168ec56bd119e0ff57837f026ffbc5
+DIST 82285D0DD14A495D0A6E4E47A7C0D93E6C22D243-clank_0.3.6.zip 7569866 SHA256 393432a3f534227d819d156de75e20c2b5cfbc41244cbf338a0d09ea2995c973 SHA512 a291b95a04da788489776f396e0c6f056848b3e96b74b4d68dc737ece140817259d46309fbab3151734637812e9025b34a37fb47c8192e45b1e4e7b65eeaa05b WHIRLPOOL 47ef8cfe6f6362f2107856b797863dd6419c26dbbd1374ebc9162073c25a818d8a62c01c9fde86624b97a79d78cf45183ea9a15d48d929832edee2fcf654e5e3
 DIST 84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip 146651 SHA256 4921fdeeb7dcf6b7c8677000a75e36894757cf78ba87cc744fb7239480d3ad17 SHA512 8400fce70d4083f83cf619378838d8880deca491cf4e79a26885df02fd0d80709b2acb7a6fafda3aa081a5a45a9ccfc00db6c26bcbb36c0d86be149dc0271372 WHIRLPOOL a2aae1eb36d6c70db6db8f670ea8183a99600a4fc5f9c93f846733978576c279035da455236dfb36c9d83b153beb4afbc18a5a1135d95d686cc7c6332d379f83
 DIST 8ED9A4B4C82B57DF7E48A1D26017D921B453DA64-clank_0.3.6.zip 7533880 SHA256 0e3a1d64f20aae36f9615ea21dbc27c05a707be5e70a90838635a323c792fa66 SHA512 ca0679ad8d574369a8b7372c729ffecd20e385f9b24a84811e493383cf5d19f6580e7df8c2a4916bc6c125f5a5ee7ab924d9035761a012fdd542f8a50e24ec8a WHIRLPOOL b23d226b9168170037719f14ea94dcddd353fd07da648109d7d89a522c6efc7873309e8070dbc9744760ee2ebc33f4c7d68f951cf81676e5c68e72df068bbf8c
 DIST 93C7FB153337A7638E255CC9EBCADFABC8C29855-clank_0.3.6.zip 7404354 SHA256 30373dee776b066aaaad58efdbc80eddccb6e76a18ade1744d01f10feeed48e3 SHA512 7b4720c99ba5b9a8b6cdb928e4e8e050f7c1f6357e10bb420ad2a39c4d7b2c0517e345c3ac3225d1bc835998b3e248fde99e0cca86a517d9c1343600f691f84c WHIRLPOOL 092a6c438e8ca1cc89f44082d2c778a490a71d6a0d13986b40a4afc2ded2829d85cc9f6f8926cfc7daa54d0d73b50e36378ae489e4932d42fd66b1c876d0670b
@@ -74,6 +75,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-cnd-7.0.1.ebuild 4602 SHA256 1336b76de715719ef59a3601dd5ad3b24992f58096f874f0e37935ec0d088d8e SHA512 38745c3ad6364198516ebb64002185fd05c34dee75acdb3933221d772177d5d6fcda853bb63991f0d071b21079fdab0c090db93e59cddd8daeb8f8d571a18a41 WHIRLPOOL cc196275289a01c1168b8c2710e0be0c2483cc86dc47b8fb3383ce1141f7bc11565e2b2feb95436cf448c09aaac7ee8c8804316ce6782d8853c0742367c0963a
 EBUILD netbeans-cnd-7.1.2.ebuild 4218 SHA256 6c80020e4204226274f4a24413dad8bf134f5beb7aee4ecc53d6b4d709093bb2 SHA512 299c07f5e5d930045e8c8ef3d04009beee7035daa2022a803e6dcb16b380096bbf5014c2d684094705d06b4608afcf6925266ef609a483a86452b03505dcb67c WHIRLPOOL 6d6c8bddf3490282b9134315f9bc94ff55675160056fa4c98c302a59d943a9cb38f23ffb9ca313c82061d84d0ae86898ce72d16756d41c468737e319e68f06ce
 EBUILD netbeans-cnd-7.2.ebuild 4201 SHA256 0f77a1a343d437e2eb1236722b27b2f2f03901ecc1afde29e1d38e54aef7c81d SHA512 b5fc985d1280ab900cb5125691a0ff99bab075ff5e93ded9af256310a7dcbea87a28a52ba383875caa24fd0ff28bc8dff4fc0fa0242987a673fdc729f7234b58 WHIRLPOOL 19e79dc426fb05ffb48ff9b13de3bab40f483b6dd9d79514e8f819029c278ee47a09c9531b5b4dba2014f805d502e66745f3355e2932e24e0dd9b5e3e273d2c2
@@ -113,5 +115,6 @@ EBUILD netbeans-cnd-9999_p20150825.ebuild 4796 SHA256 da3837ebb6d33c46723612ce3c
 EBUILD netbeans-cnd-9999_p20150827.ebuild 4796 SHA256 44a9873ada86af04c7a4e556ed83a118f43e0fd2a14c4615eda47f5d756c57fd SHA512 6d9ab21d24ead3cbc219352c7d1e3704130ffc2b8bcd94dcc2c4e9f1fc9fbfbe305fd3ca9e43cdd527785e1038ce7a917fc3b9379dc90d7cc748a70d1627dde6 WHIRLPOOL 65c17f9ac6eb0626ecccd1cb860e063c7fda48fc9758f15cef5c6df47e52ee9a64f980065f250b721ed00aa213d92b0870dfccff1aed5c2db5d59d4e07a3e0bc
 EBUILD netbeans-cnd-9999_p20150828.ebuild 4796 SHA256 74f8892a3299e13d38bcc9a59a8b374334e7df04119b2309ac601741bf4ae870 SHA512 cc30c6067b22b1fb3a035b9925c240a7bed365fb0a88338c45c00bc08597b4cb70003adaa226f2cb7c36f7df206e2c5f5699b28328993d3c41823ecf35967c93 WHIRLPOOL 55d12905793e6539ca47684d5ceadc00c601bc57d813b45db28ad520e1845239148347729460dacd01cb829bc7ebb00e768aa5a4d8547af31642d4f2b4e3e6d9
 EBUILD netbeans-cnd-9999_p20150829.ebuild 4796 SHA256 ba5c9a508f64de6f81e9b3e68cab5f4f9590e112a70708bb388f47fde675039f SHA512 7688b3a659b8b61736da8712b9e7ad88fb037a0fd51451cdf9f4307775a693dfd83bac09d08ccf8797221be43cbba625c149f5d16bf1201fb7e7021d4d31bc94 WHIRLPOOL cad39e336a3337fedacbf486744af7782c1405adc3b5c8ac2b0a2498bec1ab08df806da2e4b13970191e0748da749547a44c50c83608887bc178d3872973dfd3
+EBUILD netbeans-cnd-9999_p20150830.ebuild 4796 SHA256 cc126ca1b69b7c1de959f8f64198b75cd82ba9191ae822d7207906ccfa770eff SHA512 3ad0c81fe29552ac0f508d4314e857f8afbace487bbdbfa7f0b7dc41f0efae7f36337e0830d13dfd4452c99870f2c3dccef9041fbc79d05e6173e3cee113fe5b WHIRLPOOL c9d146003ab0ba1f62dc2b4df606e65379ed7620fac260791211759c3aa47d1c059f530b6af10a9707b10b319386c9227d82dac03f3f7a3a3b54bbc4f84f9ce6
 MISC ChangeLog 169276 SHA256 2ab2b69558c6f9fc7d3d3503f46dee48111b19ab81a8f6905291cca90f4908d7 SHA512 21ac3f55e8384cc3d9a44bb46c76c349ccde2465fe652a92a3b17f704723c682521c453485cec68bb657f75324002b73a5e43063ec3bf0f33591d538e0c7adf1 WHIRLPOOL 48868455a583c13dfb424f852f204bb0e31a2ffd796dca7d5d1cf4311f9b7a56d6eae429d094f2669dc49855a3b3f3a782206f2d5a47ed64dd5b9b5ca8ef44ea
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150830.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150830.ebuild
new file mode 100644
index 0000000..4362fad
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150830.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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/82285D0DD14A495D0A6E4E47A7C0D93E6C22D243-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}"/82285D0DD14A495D0A6E4E47A7C0D93E6C22D243-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 2b9f41a..4238a1d 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -91,5 +92,6 @@ EBUILD netbeans-dlight-9999_p20150825.ebuild 2995 SHA256 12b5482138b4048d0591222
 EBUILD netbeans-dlight-9999_p20150827.ebuild 2995 SHA256 98f56b321448afdbfb2542dbf85ad95a39886a3f73f7795b9a5afc3cb51f4cc3 SHA512 58f62dbcc97ac749c98441b2dfe1b895b39b06bf27afd67348c9fd3a9c5f949ff58607851bce3cefdcd1413e00f744f7f3c860f52e9613ed4ec080c1f2f1537e WHIRLPOOL cc17e9a69b296829d5fc789b47f68e3f413b6d5d36529014fdf76c0490be88ed3a9118db49a8e800b1c15949d62db2de1bcdf3f0da8da676bb83bb155d16017a
 EBUILD netbeans-dlight-9999_p20150828.ebuild 2995 SHA256 278933f62d3ef4ccf448e365a1b678c8dbc970f34f54e26feef8c6ac1b75cbdb SHA512 1b0e2ec6088dab9feccbe74aebcf284fa27d7c3bcf6b55f261757a59ca2d8997659323c52dce3adfc76d6676a64a7bc6121356f03a209c1dc4b585423776a729 WHIRLPOOL 1aa7bc4659574a2e4de6f3ecf87c9b80d5331098b0e2d2fc9b1fef9c7f9fe72b77aa06c3b80dc4600bb533744af184e5570d05185dc812911cb8655ffeb5b9e5
 EBUILD netbeans-dlight-9999_p20150829.ebuild 2995 SHA256 1dff47243c7284b22b8e1ddeb261ae7503c2acc16362ddd995db3a184c4d2d8b SHA512 1666d10490cbb7e15dbe6b5862b1419c03d5382fde3ae96c7005411c8723cfa029819dce938455df43cb5bdce702f1186a159a5f984a6d46af0917730a27454a WHIRLPOOL 604e17d8cfd59d5707fa02541f6a9be4de0c1b277f5c7a0ee3270fce1d4ec6a94fa0832a9a78d22025f567a090b70c63942e858b05574952c7d862202a3ead71
+EBUILD netbeans-dlight-9999_p20150830.ebuild 2995 SHA256 7a84000e7990ed55ed0a8f569104c8750ccf90d3e3d70b36db68d492854f1dd4 SHA512 4b46a4238454b7f3335fd26105dca08419835fab2f359e5ad374004799c8ae3a8cd1a644065c508467eda4a25c046e2e0fd5a648219a92ba433f47c703cceee4 WHIRLPOOL c3678803fcc84b7895f0f01d074b3a33947ff224ef71498741e9f9edac9c1d84ea2967466dab1bcd55103ccda490cd1c2488375f2f9613d273ad7042da91b441
 MISC ChangeLog 176690 SHA256 be8a9735562b7faf19a427cceb8424890eeaa375219fcac0faa89fd752c6f28d SHA512 2a89300a94ec28e2e5df65ffe43b7c6e5b9fbe22fdd285a0d683d558e84f823006ef124925f2f4916f103cb69e0163199e4d904c25013f93f81021002f8d6e77 WHIRLPOOL 5a81eb2c340dd7fab42b020a4f22a2c594ca1c326cfecd779226ba4375a2ab4898a60356118af4b6e88fb400d70ce20217b16830dfde8c51e3b57cdcc6b38628
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150830.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150830.ebuild
new file mode 100644
index 0000000..7205f12
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150830.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 3d37f55..87988fb 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -134,6 +134,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -173,5 +174,6 @@ EBUILD netbeans-enterprise-9999_p20150825.ebuild 15937 SHA256 6c10facb4a67d614e9
 EBUILD netbeans-enterprise-9999_p20150827.ebuild 15937 SHA256 e503e82798b934aac1e0cdf9cf257477705666cad2490ccbea3c8f2df77a4030 SHA512 f2c3f4654041122c0f8698b89d2149d84fd0f061e1347a21031e4d591d7be6540b57f92c3956fb3170a68e384b44f0dbf4e6e4bdfb608715bc5adea7bb2c808b WHIRLPOOL d8ed9b75431262ebdf4ce0a1bf34309c1eebc18dfe064a3a2ebbe6c685aa43f1e365555b72b96f139fa9d5d71cb5076707e9e182ac9bd704bd542dab2ebb91bd
 EBUILD netbeans-enterprise-9999_p20150828.ebuild 15937 SHA256 f7ce383f986ac83f9bfe410fc341c6fb089ec65f4d524802038c832ad04b02bb SHA512 d77874755eade4c090f8090935384d61518260881110cc45d453fe7fb72744ba062f53c8cdcbb5153f1696e9c8394042352d27ec9e0758a5facca62df02a139d WHIRLPOOL b9effef9c67f188bcb09cb7fc73642e05d70b4ad285abe0e1c2719bd9061f556768bde1c8b48eaa69c78cc29415201fc252e7b2ee552905ac120a5d9369c7792
 EBUILD netbeans-enterprise-9999_p20150829.ebuild 15937 SHA256 1930e9359a8bb7cadafe36a710f6e9db6808593582b2782e2596a07ea59434fe SHA512 f88d2eff19ccd2507cd57a205d5658007dee18a1b0920b700abf4a8db635be13454d5001f947cc87b6f9bb13f26d600b1e338e68d2f3d95393d7cd75777b871e WHIRLPOOL 463683152f3a3baeab60ac4af2573b90a37852d2d843e6f9b78f88a7194d6d6d69f7ea2ec5c62c752b7420450935d0ef5ac51568d6ad9882d901bbf25e1c6540
+EBUILD netbeans-enterprise-9999_p20150830.ebuild 15937 SHA256 784b44c13209ea9023f57a2a07b0d8a9a1cdd82d654cb09e3362a3afb900cb4b SHA512 9d731d3ad779c11bb31cafcd0214fde6db8e4d3c3b1c3a23168cb05e36686f9555a79382fbc3bd23461f45f94a466abb6a5ccf7c539dc6f3ebe8c0c4b2ce1f57 WHIRLPOOL 0016a568c723dea86355716c778c2a1840db6ad8b5ef34928ca7f5eec1ef98f19506f609b5ddb94ffb3a29e60867c85663bf8b1053d0fb77dd745484e9d48232
 MISC ChangeLog 186144 SHA256 e09126f51310c675bfe05c64a66f74ca16aba6bae0e1e020e9668d8933783ba3 SHA512 9db74471f49f679782adf8afb8d042e7bfdcfe001875b8d9bb33162130946ee08368663cc2febfc76347554d88eb04dac27e5362b98eb3e8d3594caee903be17 WHIRLPOOL 84bb1e1079cf4a3a26657cc33dcdd7253a3a98c874d86e66041bc70f81728ba26fe4bde7401b0445e1c138cf3796744be8257ef9c4b7e250e86d94dcd4c92214
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150830.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150830.ebuild
new file mode 100644
index 0000000..6aa8c33
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150830.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 6166c2b..d2b2a4b 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -84,5 +85,6 @@ EBUILD netbeans-ergonomics-9999_p20150825.ebuild 2919 SHA256 70b64d399fe6aeee912
 EBUILD netbeans-ergonomics-9999_p20150827.ebuild 2919 SHA256 40691525b0e65c5a13e678644f2deaa43a67a2bdfad232131ed04a20151892a8 SHA512 30dca3d27289cf842e9cf5ab142ed9788ebebbf3481ab5597ae22b19e4b35814ced4e36ba9021bd8663031b350b2bdc16b2d1d4bcb7157abf50362d958aad296 WHIRLPOOL 020a71d3d466c0deabfc675f810d99481d3c88292a9e1803b83fc21130c69f1bdf086ef78b37198a899435dd6538e003749c3f02e87e40e59d5ae53352d90e7e
 EBUILD netbeans-ergonomics-9999_p20150828.ebuild 2919 SHA256 fda1705f223233adada46b4f6aa61b18c343fe4d1d10c3cff57e532ee93e9332 SHA512 7c46c1634bc9f24240d549b2d3a342a30f94d0b2e47fca6ec222cc7b01d1a5dfa26f50ce349e69b3b5578d086ca3da2ef990dfff76edc43d95ce990a0a2dfe8e WHIRLPOOL d67c76eed58a8bd325c2976361d02d8ae624f207a1dfd8ca81c703a61d38785c7895f12aa2764805526a6fe8bc80711581fda2ebf070989ca571034c7ec966e7
 EBUILD netbeans-ergonomics-9999_p20150829.ebuild 2919 SHA256 7c7e170ddf99f1f31eac409fb1be1546d1fa823dfeacb4e3f703f4a56510a724 SHA512 e6f3ffd0afdbaf76f962149598a7dbe7164307824ca53800affee0265a941f0d2f82bcc763fa602e7542a1f7c6ba622749dc02a7e783e90138ef67195b1211ba WHIRLPOOL fc8ce3d63e70f8d94a1f6b3dd37f7997223fa16bd10e63a70502085b8de5cdc2e16a3abbb759f6d529a6cd6f628b479b887b07539ce09cd06d9abd5dfea45a26
+EBUILD netbeans-ergonomics-9999_p20150830.ebuild 2919 SHA256 4de493d3fe8b2966eed0a7b8ab2155850adf441dbbad46d274721056a261ff98 SHA512 e074312c7f8870b88d398362ba1362741dab990f64898d960140f265306300a5752b48660a43cf16e6c3568fef2d3cc264bdfaba5dc4a33d02e68c8615b019a8 WHIRLPOOL 579d984a43d44365c8a42ef5cd9f997e2b17dbd90452a10b91cbedfcef489ab9c59f0f00130587b8ac8e495c0f39399fbacb6a3659195c8490da1027f9127af4
 MISC ChangeLog 185505 SHA256 74479df2200a917ba741b85647f8a87b9cdfaf733a40e431b41e5277e0a39b86 SHA512 c15eed8d155e178b03486ffa31e61bce5bf7474efa7536531099977c490ba27fd44d90c259ac5f0a1d847b2be11ce2d539636caa7ce9e50b73e4da9b9e0d5ba7 WHIRLPOOL e21cd94b208b620504b2fbbbc4521e150c09da805cb2710bd3f1800021412c1f9977b03d4fb1bf7236ee7cc252ef052a0233972435efd7dcac62832e8a57c223
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150830.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150830.ebuild
new file mode 100644
index 0000000..4d07b0b
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150830.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 4f82b4a..0029dd4 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -78,5 +79,6 @@ EBUILD netbeans-extide-9999_p20150825.ebuild 3383 SHA256 b2ec823d31188cca8c5bffa
 EBUILD netbeans-extide-9999_p20150827.ebuild 3383 SHA256 a36d6dc38c3b7948c6aa3ec8d6a9be3bf64c871a96cb691b6a18a2ed741e4751 SHA512 8625598f435e7b1f585b83f45760c7e6cd2a800115cfbabaa320fbef329cc5f07722804bceeb3c4db4421b258d101a1938ffa00605c24a5f6a83141299f9f8f9 WHIRLPOOL e582ed30b2c34b4f3a70fdfd68a56525f1e42eace41b9afc72cb67a44cd7555c4a211b3c943b1798dbdf34bd5e0150a05cbd856b6c6478337f8dc716ea0e6ca5
 EBUILD netbeans-extide-9999_p20150828.ebuild 3383 SHA256 6bd2a13a570bcdab73dd9c32ca0690c98a0d8aa8919672e37db5d622bc480a2d SHA512 b8ba3782d93b8becf3d863d3335aee96b7e8072d0382fa48cea67c64d6d005331c261171325c09bb2c4af54a17fda64408e7f5d4794942eec3f1fd9f768050d6 WHIRLPOOL 412a72b475278205dcbcfae627a7de1cf0dd080167c9d27731528b5745ebdc8793a18f47a5087355f3561931e9ce856470f70232987cd0e7c2d21567caaf656f
 EBUILD netbeans-extide-9999_p20150829.ebuild 3383 SHA256 696cd54a302d5a04a5cd1c82ecb200443157b65291062d958fd282ea2b31cb58 SHA512 a64beecdf3a7db9928dea90103b918bd43172fd1be9e89e2dfe8c4fc688818b7a7d726a356adaffc833c700188fa650559be2dd1c9cdfc2292cd48532ce6aa5f WHIRLPOOL d98201aa32edf29a2b5980ce03d09d36a503899887b3fd28fcf66b53aaafeb182fdf22af100c9d41ff35bdd04ffce615436f3a1c118dcaa8342fb94f29848838
+EBUILD netbeans-extide-9999_p20150830.ebuild 3383 SHA256 e5e4f064b7fed9957ad8eec005d36657d23a2398081cb7fb4bea6d3c60d37adf SHA512 894bc131bd5848eec7534452a004a2553e7ef6b461f83c97d1adb944ca427b3e3416779ccbb79121da8a3e0b544d17043c81198b331e8a41c4172dce74a752f9 WHIRLPOOL cdee39e1ff54cbca511f5e71703510b64090e8e3c8acb60e266709793dd9aa6eebb548dfc1258066e3e279e1930b3485c02aed30d41b899706017344355f9621
 MISC ChangeLog 108600 SHA256 b7cbef38748b6e01e408eed6e02a87fb42cb9a41c48cd9dacdb5e87768780fb6 SHA512 30f940419be698fa6e323625b39745786aa98eabe74c5036299b83545a78d66acfb568996ff8a4549d497f0aed860f57cb0aeb4ed535e4921d4359fabe19cc14 WHIRLPOOL 01688d6cc743ec31570d2797eef62fa9cdc6d378fd9482c1a1f42a6f9418893cd06c22faeb4d797894f58a70aa194fdcbfec6e80cd8aecfebacec39fc684d136
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150830.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150830.ebuild
new file mode 100644
index 0000000..256aa64
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150830.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 c8366f6..1b41084 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -88,5 +89,6 @@ EBUILD netbeans-groovy-9999_p20150825.ebuild 3422 SHA256 c2628b706f3cc67595e9bdf
 EBUILD netbeans-groovy-9999_p20150827.ebuild 3422 SHA256 5fa23b1f7f74d3e401a62d6e1d24659a4c072ed1bac2df8230aa31a742c08523 SHA512 32102ea3fc3352aa026d15727b99b192db426d40fd7b64f776b231d88bb7fdebf8faad76d0f5a8583a69c5ef523a5f4ca2ba2f45d594ac8f6fce90a9be5521df WHIRLPOOL 1a774272a24dcb7adc841e391738c9e8a6db257cea388b28017302e349c18799b986fde19219e99486364c72338b96869f9c59b24a7feaed73a0a566c2e66d83
 EBUILD netbeans-groovy-9999_p20150828.ebuild 3422 SHA256 81da1f41168a762d6008e3db38ba7900f7fd13a3c0c90401e902d443f4d86e45 SHA512 b70bb9e0e2e2f12f4d2dd73f598b0dde5e4d8bd937f520b0268491e12f45c9feb45c976a6622323c2b4d7fd19b248d7338c93f30d1f089109375ceff39d5eca3 WHIRLPOOL 4be9b23298e012cdcd3d6c80cae8d3a025e961ce72049db4d7e2e238e1760ab648039e5cd3f401a79a62aaa451fad0ac5802d6a3de671ef767d8f61c613dc309
 EBUILD netbeans-groovy-9999_p20150829.ebuild 3422 SHA256 0014eeb612dd4b887a5564ab1e7580fb1cc4362f84187f68f13f6d304a5d5a76 SHA512 15973d227c9b2ee6df02eea6937ff7c0f90579f8bf760dbec37e7385d7897ce758c7bfe576230dbf2dc96cc03928e9b9885b0ecfef1452bf49782e45c0091b6e WHIRLPOOL 2a6476c076c2fa9b1ba8e3c9ec4d453425c9be95d7ce01b2393bef1df112ed8b73f404d8144811678c71ed6eed3d8a02538b32bf331b23ac6a1197b9a30fec0e
+EBUILD netbeans-groovy-9999_p20150830.ebuild 3422 SHA256 e6b39f9e9778b95fdba1aa09f5ac6bed867d40e35f49156b12144b05f3d01d7f SHA512 31cba590990273927786bc9a52ab04fbd296252616cfeafe4da2c8b493f667c4283f9ca6bbff9ddad97167322afa822d1ef859096f115c765de44f4112f70915 WHIRLPOOL 78b8ad25a677aaec5d5f97857f11996a595139f5e77cda5afbf4e79a949612042f1e4df59bff38efd1b225720bf11b4ebb028068f370010f6bfea01a46db1533
 MISC ChangeLog 176580 SHA256 dc2164065b08e06eea6a19804c2a702272c07e41831a51d64133ec86184b3fbe SHA512 6728f3bc6bb4c36005c37f4abc197a8602a9ffe83c334c89a556ff4dc445bf02fdf44e15344b3b5816399d4eb4eec51ec1c70002957e6e4955925484e6460813 WHIRLPOOL f4908e85daeaf37cf13b16186c085a9b6fcc3bb3e3dcf5167f762158812e6277d12b9f295c80f8b6134bd9a7a192c0076ae0d979342143a2548403b46fdbd0f2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150830.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150830.ebuild
new file mode 100644
index 0000000..04de6a5
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150830.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 5cca36b..b91656d 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -90,5 +91,6 @@ EBUILD netbeans-harness-9999_p20150825.ebuild 4131 SHA256 8972dc48e26da6f5862346
 EBUILD netbeans-harness-9999_p20150827.ebuild 4131 SHA256 804c8771950b4e1106532aa6b5510664076ed5d4c77a921a1c4fdcc63bdfc9e9 SHA512 8bde3e28dd410f32b60f74855a0a348985c0d39320730ed71be19f20c6ed8e59297ec3423bc3280b5ab6259bc6702724aa17b18b1b2ccb0fa6537e37cbe827d8 WHIRLPOOL 560ec455ff67d4d80dd7ad35bd1381faf45998ed79a5c513b675fe3b536bf76c5fbe9162a407a44400193f42efe21af8b4966403491b83ddea3f0b9211f0a999
 EBUILD netbeans-harness-9999_p20150828.ebuild 4131 SHA256 b9ca092722191e3ec03deaaf032eeb238e8c827dbecfc853f7c5afb92a64e721 SHA512 dfabbe4208eddc07e219f2145c1a4e46697b4697b8cfa443cb3271cf3bf86cf7a769d0a0c5ee9f9108f871aa8baef9598c1a74f29f5cf0e22bade2cbb1119553 WHIRLPOOL 26325ca88eb6e562de814730749ab987932da1aaa484fc20f32ad5597bfc0bff5963fd20a5b89b28634ca4c3452b313e07e0e257a5b76ed6dc8d4f9ebb20295c
 EBUILD netbeans-harness-9999_p20150829.ebuild 4131 SHA256 dea77b1e4d434742c42efa5cfe73d3c1dd83220ff9ed29df1d171691b9823c06 SHA512 96c6b298c3adf490010253c3b6f33d8332b2a8e377f6792edcb490eb2e88b2222b51fb23442844713bf1a7b134b0a2e91ac110ab1df59b4e1183a638811b0dc2 WHIRLPOOL becb14b95febcdb63b276bd50e3895475d31ce7e8f5f89cae0c77b9366e0801c2f6ddb303fa98171517467b2239938b13bf14ecefed8b545ad18774531861d1d
+EBUILD netbeans-harness-9999_p20150830.ebuild 4131 SHA256 52fdce04554e085a02f52e8a75e88d018bf7fabc27c9b57a6b1a8caa8dfad3fb SHA512 5ca64e430bac3458aa8c07572a08128327553d9fd5c6d998cb0e5ebd6d446d18d87b2f2d9f20b4ef0526ea7a6a5d1f632de8fbe8da4439b3e73b0d960bc22968 WHIRLPOOL 843f57fbb2ea89bc4764d2f7b89da43d88c2128b9a0f7c58e58e73bbb1fc87051ccceae8733c737f681edd147431ec94c4383452b4e17b264a2b61d9878e104c
 MISC ChangeLog 178840 SHA256 f0828fa50bb71c4e2accf59d70941f0a84dca3a2a40efe974c2574e55129da45 SHA512 ea9e0c85a8e20348575fcc07c93a8d7903fa71f355555bc8b79549169e888f6f30ff9675faab7b73344cc86cfcff16f4fc39e878425f4a2d2320a59b66af63ce WHIRLPOOL 71d252d991284714cc1cc8ff213244a3b5e28a746ad2f3fead1ee866107fd718c91985220fb800dc45c089e02f9773ec700b1e9784176fef2349073f34d80c22
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150830.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150830.ebuild
new file mode 100644
index 0000000..55c0a77
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150830.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 92d753f..e11745e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -257,6 +257,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -298,5 +299,6 @@ EBUILD netbeans-ide-9999_p20150825.ebuild 30340 SHA256 b3f5ac721f16108382460855b
 EBUILD netbeans-ide-9999_p20150827.ebuild 30340 SHA256 1b9500badc95e971120c0f27163bf93df209f40f394c11481a659f38e3bd2c1f SHA512 7b2bc840faad3dd4c254a748b601af733b4d39a3baa6b1d46b27a369270fcdd691736591d251b3544b426ce952b85aba029350ec05a828865cf2c8d475b9f8e4 WHIRLPOOL 867bce8689356f320ed8a7350d78ffd573f30466cea5169e58a1eb9e3e7380015177dfd1c89cf8eda563063b2cc2fa3ae713f48eb3a5bdb64ca6966b562f1042
 EBUILD netbeans-ide-9999_p20150828.ebuild 30340 SHA256 c953f87ed8a58073b04cfa642e5c81f6cefa0b4595aa0f79bbb5145f3be18800 SHA512 dfefc70459f226e4f1c3db85d8361e3c0e9cfc0b6458b3e8c7cccc49d8305455c8bb9b78745bfe1d7c59bc9f43bfe9bd3508e1d08e6a78cd1dcef0f00eb62c70 WHIRLPOOL ef63ec7b94b2f64022f7adb603974b24df5de7a92f004c005bc7a54834c91ea7eccc5a139b971bcd05b76752b33398a2cbdeef96097bdc3aef776ca185da063c
 EBUILD netbeans-ide-9999_p20150829.ebuild 30340 SHA256 c28dd101471366cbdc767721af75b144dfa51a3f6b13e2f1017557bc7cdaadff SHA512 788664cc665a16d93552d23bceb6c6af11b7583ed07709fd96a73e21e77847d233e33207b0a712302f31bf3a419dcf961ea27d0d4392f149916619f77125bf72 WHIRLPOOL 36a7d03ae09eb69dd1da9e12eef08fb392c1dfba4c1dfacc5bfc1fd4607db9f46435ed43f955f54e6c3c26c2c27112476ddc09932af7f8657a3e7c12f0ea25eb
+EBUILD netbeans-ide-9999_p20150830.ebuild 30340 SHA256 537f2c5c2ba6f691c83bb83fcbf41f37bc6ef060452810518d2abca2636722d4 SHA512 04f08d262b054c714ed34dd0a185681d7d1d19fea864d376c38d8e6058d6fcbe9759f661256761e30da30a357da2e0bccf6fd5c8d96dc638a3cd8f8bc3e55d01 WHIRLPOOL a88992821b43ca6c745255caad98b98a6ef433cf610c42419355ae4a3a0b9596f2357039f8bf9e8ad1f6685b5e438b3fdf2937dcc7885bd7ac622157c2b6a327
 MISC ChangeLog 170198 SHA256 8ad44ed48d3d5b50d767a887d427614eae12790613f254c42ace518da801b3ba SHA512 472cf7f25108c5e99a060f29bc83d48f509b222100eef4f5483575f92e1d2ef43e2ef33b6d85f62352cc03e9e3e0e5f435506cc82822deae6e627733770242ab WHIRLPOOL fd1040dea9788489b3a9c3d88799d15fa63f691ca07018a5bada00e4d16e70f438f9aac9010788f219f32706e5a8bd3cbb6f66dcc32bbc8345ca63daea508207
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150830.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150830.ebuild
new file mode 100644
index 0000000..14d2e62
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150830.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 533bd0d..05d4284 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -131,6 +131,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -173,5 +174,6 @@ EBUILD netbeans-java-9999_p20150825.ebuild 14824 SHA256 d75f7a7ccb8eed23003fa99b
 EBUILD netbeans-java-9999_p20150827.ebuild 14824 SHA256 eabbd6638c99bcf25d8e3ca3734185fcec5b742ec873ed4585556ffb4c1463c7 SHA512 a80d6eb79996e4e39dcb6144eec3e931548db06cfea6177d945b8052b124c9c2c18b5aa7b0a2cc9eac928da30feb0475c0d8738cf84ecb939e162347a02707a9 WHIRLPOOL f50eb5e75faa154b64bc7e5bc5dcd58c2f1ae828e6b9e3dd550c78f00b74d4a5dc4dc4903f014039b85bfb3097d657eea1e0ea17e42b8fe8677a2453a73467a5
 EBUILD netbeans-java-9999_p20150828.ebuild 14824 SHA256 7dac6f95056cd75056f872b56560699fc33cad6fb2ea5da57d170155293d9a58 SHA512 01d679df7a0d209daadde63dbe53b06fea5700234bdd6dffdb63c42b63edf2297fdee740dece5a937aa9fd774e4642f573e84d3e9d48059986a4bacf6d31fdcb WHIRLPOOL afebaef3c546ee2dd31b0dd51887d8933939249252b87735c48b41d74ecc08f10ce9c0a4d87bb2a4394a3c130e8d77f034bc842da4752b3dac8555f434a3913f
 EBUILD netbeans-java-9999_p20150829.ebuild 14824 SHA256 d2a3a5879a2e845a268097a0736523a64d18515000202fb2ba16a241d6073a7e SHA512 d923b3811b9c35cc7d27238d27db8de702217414a7affef99457f779d10b221cf6d65612674f981797fb4ec3f48f1953d1a724cb4934e3d098b4840e9b12f3f0 WHIRLPOOL 6e1045c286a2e078a4dff05c3ee324346f8eda8ed1913be3895efe9b060de0af4de249ad46b36c7f6e8b435df022c3b6ac5a5a4e178408c0e707257102e07814
+EBUILD netbeans-java-9999_p20150830.ebuild 14824 SHA256 83f3b68c56ffea7e2821cd99c52d4d4202d07fb0f06473201316de892947df8f SHA512 205f7a457bcb74139dbd36e1aaf6a1102ebccf29cd788c2e822d5571d76d23608f7d85629cde108ec282a1da08672b198aefc154cc29c98a0c1f348366b5b4d7 WHIRLPOOL 432990ba50ae1d1dc0f870dea060007e3b0b5298d6925c36b1993d7d11a6d0476b157976bfba2570f9dd2d7f826aed1cbcde298b1c996d8567c875b612bf489f
 MISC ChangeLog 173723 SHA256 42ebdb6e4269e53236814956679d8509101601fb277930a61008973f7472b420 SHA512 f566ade6ce25a07ee9962571f9811a53aa963ea08bc4de14193b58cc8df001aae7c42685f389a5ad0373d74579439bfad7a0d9a2f89c794af99118f0868c56be WHIRLPOOL 8086060390018cc058341bf5e1044a5cba52900df87505e1b5dc225a4f7b93ecaab99a881bf3fba44a56ccdbb77b39495dcdb180d0d572e24cfeb4b2472b5bae
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150830.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150830.ebuild
new file mode 100644
index 0000000..96fdace
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150830.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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/0961DD1A0DFEED0B1196FFFFF76FC3E3B5B9358B-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}"/0961DD1A0DFEED0B1196FFFFF76FC3E3B5B9358B-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 1c126fa..fb4fc09 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -87,5 +88,6 @@ EBUILD netbeans-javacard-9999_p20150825.ebuild 4982 SHA256 7d6eb34367ee530e98e4f
 EBUILD netbeans-javacard-9999_p20150827.ebuild 4982 SHA256 65f4d85b9dbbe213c8d01bb47346711ef2b0eced2f90cf35764ac334b28e6327 SHA512 2855dbe6e97d2104bfb1c54b80055e6e3dfa4c22207bfcee02c0ca3b1bf17de0133918bcf29a66a218cf0221baf5a27988062351d07597e69271f0d81416da1d WHIRLPOOL 2705e801151a82f83d8be2fc0dfacc7093a7c8a3dcdfcdeab0c8f7e2e61333851d515b2d391493fdd93eaae38940a5eed049761d5b99548a2ec9478731b10365
 EBUILD netbeans-javacard-9999_p20150828.ebuild 4982 SHA256 718878c8bd04b2459b37d906c8d83136541211ceef64e88c40a018eef4431c47 SHA512 70130507866d78322e844fffefa38e3a865aae19b993dd8cd07da55c78140aef46f7f593085ba52cce705a4f377fca3088a53a84bd0fe4cfb4068333b6d6920f WHIRLPOOL 947cfc6a4b5dae66aaa2b0d597d6e1a41b106f3b5de9b9336c91c171b982d93bffa926d1340f4c166bba64625be611e9670d85dd207192579281ac99a825cd40
 EBUILD netbeans-javacard-9999_p20150829.ebuild 4982 SHA256 63c5a7ba12427fc11fc7f50cf783b9223b37b71e721fe7e3965c060f27f537d3 SHA512 403bd746b5782be9bdfad9dfa184f4f338b7fc2fa26d8553a1ab19d039282d50dbf26eb8aaa92a49f7da327e7bdd45cd4755302927e18c0a9511a8315626d780 WHIRLPOOL 20f8c63bc6904e7e611e46a42109ef7bfe541588e99e3023fa5fdc2479def64bdfb5fcfb4d2a974f53a1ed5f650a7acacad52b9527a8a9d6d76396e84a52d5af
+EBUILD netbeans-javacard-9999_p20150830.ebuild 4982 SHA256 dad0e11a2fe4bd8612e5337c528986168b7b5d53b569be776070c6365a5f4751 SHA512 8931aebfdd4b3ec228d1dd4c3c7c7afe6470b629905a7794aa6c2eed66bd6868696c99e6c5b80320d3c42e2773c3a23c60a5adfb735448279fb2f22e0f411b6d WHIRLPOOL 1f60f5244863d3400e7a56684f2fc107daaec1d4dd9ae74fc1b7336d1bb99475c15f755ab835e12c9b92d8ba1673c950a71be4276954f1ba9d56dc4ca8c3441a
 MISC ChangeLog 181100 SHA256 46e5fd39498f690ca3d192de8871a8ff7ccb11a9fbada931a52704680be3f85f SHA512 40ceb53bd3e363adb6866eedc004b3b356f74d8452bdcbe5f50f3727edbe6a092d769c285df84216c78cc04b3652cb29b47b9be8e393a948f290ca4dff37d88a WHIRLPOOL 6884e683f5d29d460f5a6adc8297596e1a32e1b33148a2f88e0f97e7e9f457e4a315705c2c1bc465989867eb125194b4e00e9955ce9563eaabadb1e097e73fb4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150830.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150830.ebuild
new file mode 100644
index 0000000..294ff8d
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150830.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 9b6f186..bc48dfe 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -90,5 +91,6 @@ EBUILD netbeans-javadoc-9999_p20150825.ebuild 6234 SHA256 426f9ae6bac84db0966d81
 EBUILD netbeans-javadoc-9999_p20150827.ebuild 6234 SHA256 9ca4503e345371a97554f9b5fbb1b298eafd7b0824903c3e75dc28570f8927d6 SHA512 4230b8895343c0f18c625bdb9cc7275b0eab53e8f0e0176e47a887907acdf75fb8092e51eb6292d2695f8721f008cd320470f9134739c91fb777703106c0a42c WHIRLPOOL 9ae9853c853f472fe0936c58cfaa83d47a5f73eac98e229b96eafb9b4ec7ae0fdb54be179e90a247596455333de52d0baefa5719bf824610d7171fab68ebe552
 EBUILD netbeans-javadoc-9999_p20150828.ebuild 6234 SHA256 f1572938cee94d0c46a08c46c3eb514da6db4c1072df26bea7d95d349a4ea7fa SHA512 82209ea7b6efac1f3ef1534feb5c4b3bbcacdfeab9dbb0fd52e7026503c8a7a41c9072fc0418840c59718e8d36696e3f3aa155367c77a67221385415283ed19d WHIRLPOOL 9c7975091fc3bc431527e1005eeab6e665ac1a58c1ab273dd1395994ccb8f6c47daba2b0e0ec1426f053680619db04444d9ad3b94b83d0e24ca9aa4d4b01c46a
 EBUILD netbeans-javadoc-9999_p20150829.ebuild 6234 SHA256 d0843c98044bd36955dc60aea3620d28209c09885c45dddd0d37fc17be5d10d7 SHA512 ce317a77cf924e005aec404c586358498d831a6a409110ceafd2c764809b68ff299b4997e05f70d966731efe2861095ac794e0aacbf58e411366336b90b875b4 WHIRLPOOL fe1bf6ba074920e23f9761be36d8c0a9b3ab429e926182dd975b99a2ebbeca544cfe97dda17196d890ea81b940bb3c0aeec089e1a6134ab1b946753e7caf170e
+EBUILD netbeans-javadoc-9999_p20150830.ebuild 6234 SHA256 a205969ed60ceac82a0d51b7f20491c6851d94e8acafd5b89395d2ba4d355793 SHA512 35b072fcbfa6dcb94ab06e6451b565c890dce8a4b19c87354ead57d6fefd8a16e568bf8c03b9ab53033b2a609646078ccb4dad22cd5e669f329bf72b907b509a WHIRLPOOL 8a3507d78f519c1ab54343d436417ae1d02b2e53bca99dc18aaf23f4641538b5418d7ab96f9e752aac89e1d93672cfca0a1602a05cb8a8ec2a107a817fdc4d6d
 MISC ChangeLog 178666 SHA256 e9720f87cf1520c8ba9bba288db0c2121be5231c3a64b982a26bc03f8d167a6f SHA512 c1fc2e65f47fb4b0613178e89d2953cc718b334dc243e016f74d48da748f998db16941a655d56e5d620355c136ff7449955598d32a6722b37b4579b81f06ec5c WHIRLPOOL 9d484121be9115de2889fa5003b6d4b86636907c25b31504597514dbbd5005b33d2a77b8f4bfa710e064bc5d668a5fa856d226e4a703d236bfcc350951ac5186
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150830.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150830.ebuild
new file mode 100644
index 0000000..6e9ff47
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150830.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 e7dfe39..7d26358 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -89,5 +90,6 @@ EBUILD netbeans-javafx-9999_p20150825.ebuild 4723 SHA256 098dd419596a74d21647e0d
 EBUILD netbeans-javafx-9999_p20150827.ebuild 4723 SHA256 e9c6d90a5772a9a2dfdf5725bf9107ff30d7b2813a75df5ebc166cdca12e3134 SHA512 49be863a4cebc14458b798c599414051dd58feb4fb8990ea51118f6fdc20f8ecbee67a8c4e4818eb7e4cbb147a72c5b67b88eeb46df93a7b90aa83444b93d026 WHIRLPOOL c621e209edce8305f032b8bdbebb6ed000b1d1f60f30e987a9b93f89d0d6fea3299783e5d5db252e1eec8c53caa2888f551600a622cd86978576fcb7479ba8db
 EBUILD netbeans-javafx-9999_p20150828.ebuild 4723 SHA256 132d453f42dc958fcab4dd3bf0d2577a79894be8c7677bb41fa00738019ba034 SHA512 bd204b22b240bcfeaca4d72d7942b8770d049dced1428adc41286d07749880545c4be0d0e5e4e659ed6b74ef7dfbbd86263700bc77fee104031a23d7726d1d28 WHIRLPOOL 0727ddd7ebc2bab2a2c7dfbec5b67c36447bd57c9abdfbd43b0affe7c298779c23b11d6abb9c3175c58446867eb2948b461ccbd77f50b685bcf2d71d2fdb9a3a
 EBUILD netbeans-javafx-9999_p20150829.ebuild 4723 SHA256 eabc8a5f0152f6684343292c5440527d978d4dd96a136cd7f540d5b7995ca55f SHA512 32348c24e72b8c138858837971836d2a9788301b6f6633e107a359ad3bedb6cb696be3511b4de08b4444944794897a0605bd06a67a7745ce8163c85286c90726 WHIRLPOOL dfba4becec982911719336514c77fef5820685041902bca8a33005d145562b097724428cc111e20f0dcbf6530c0939a3f9403a8e2b0ddb195cfc98a22787fa40
+EBUILD netbeans-javafx-9999_p20150830.ebuild 4723 SHA256 4b3a3b08b397e7f38f4897b922c94e8bc700c571a448cdac356feccddbd31510 SHA512 8e22ea297836a1d04b1dd0aa1a529dd03893fbad9e155bb0565656943894e454d8eda76088b2b9deb439cb5c4d4b7e39c311d0d3f970608fa0b40da59faaff9d WHIRLPOOL ec3eb438fc29897b440eed598cbfb1e534232b2161fb504671a3b8f973d0912d04f0ef979d0205455b57dd99683f1b4aaba3ea41ac2e43e15ac18807cd45b0ce
 MISC ChangeLog 163099 SHA256 f58303815155623f945af7eb003889cffda4dcde29e5065bfd4b0cd1bf63fdb6 SHA512 2d85c0c092b1d32788df39e920702d74cc5f2829fc3a13b2abd43aa7b084cb3eb9cfc19770c41b5affaf70bd017d907c5aab64e851a28dcea5857c4ba9ce28cb WHIRLPOOL f07c666fa028deb0bb78969ca241d87d0ff1e82bbc3946b9efb1f16a21a7d3826fe02c6eb6ecc489a96ab6f9edb122a0e67af83870fcc6e5789bb44ad81e761b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150830.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150830.ebuild
new file mode 100644
index 0000000..1ff49da
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150830.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 6976e71..2569d2c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -93,5 +94,6 @@ EBUILD netbeans-mobility-9999_p20150825.ebuild 4418 SHA256 45e9fdb8e558eac080d95
 EBUILD netbeans-mobility-9999_p20150827.ebuild 4418 SHA256 99214baee0dfdec90828f50924ed1146e0180368f8d540b244a167c93af97e7e SHA512 dc5f174fafab8bd07529a8512edeacd5473ffbb49b7df399b6e70a03f132e163983dd3378b25f7bbc2930bbfd3ebf71aa67f67496ccc4801b8cbc368c26d9f8b WHIRLPOOL 6fadb16b77ffd26e5f6080d05cc5cca8d65fc8f98f15db0ed6187bd835b22129e3ca54dd18291b589135ba74a03e62b4d0043a639ef5f436d7ecf46978bf7b50
 EBUILD netbeans-mobility-9999_p20150828.ebuild 4418 SHA256 c7647fe63588fb196dc0de43b5a14554d2d43555549c184c9b59f89b540069aa SHA512 9dfcd4fd3d3b306ae9fbbe6c4b3c2190a081171abcb7483eb62847bc0933b9fa61a2dfe59cc8eea73c3900c67110f0c5bcf371c1d04a024062764d2ceea0f88c WHIRLPOOL 98689c67e7334c67df957e4cc6f55b6b83878cec424c6c05ea11ad853909c47397e641445a464ac5d5dd9c6cdaf663eed82895956f01fd83a99e781f55799e00
 EBUILD netbeans-mobility-9999_p20150829.ebuild 4418 SHA256 f8fdb206b32979fc9b03f423027842282a4b3623441ac437bdda37f1eaf68415 SHA512 f0d3f25d78b07060fb0315a0e37defc0aeba619b9656e939123e92117cab3378c26d07e1114673daf5875f974f69803e2029203c24a261d476d44a0f025c6776 WHIRLPOOL f0ee84543d9f30939ff2430496b495176f0f1b31a98d4dfe42b68a0e88a6af0c940f5d2e68d9b63fa11f89ea90eb92134e953dd6cbe5a2ee0e7491017387b163
+EBUILD netbeans-mobility-9999_p20150830.ebuild 4418 SHA256 bc558fcfa0196e02da049b67092bb7885466ec4c038dd71b3a9e0346a05f7fb3 SHA512 28a78e485a74c200ffe65e0ef01755a0fd954b40d4735159b71dcb76bec710b5cbd41e1b3ce1a21d0afb6273bc2c94e633a4e99905f4d34e4982ccb60a7228f9 WHIRLPOOL c28f12a4381e086fa415d601cfd60051b67bbed235beebf67653806d3aa94112c72dd08acc544d40ee8c5ad24dd5c69f9b2d3defd17a9a1cb703d86404facedb
 MISC ChangeLog 181241 SHA256 b6250f2bf7d91882caaf858a3d6fe2de54f234cde72df39af6e7ef45bd6e766d SHA512 afb848c496f57241769063f59a4f0c5571019948a1c3cdbb2e465a355bb2180284e25d9226f443ef553ec11888dfdc9ed2831fee90a1308727eda34f31e3eb23 WHIRLPOOL 80dab78d6962b6443453dc1ad830cf6ff8ae1b6a64cc46a8fbfb092d2100176bed271ddfac405841398012d6543a6406f958cc91471a63d7ebe226a9a529a55c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150830.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150830.ebuild
new file mode 100644
index 0000000..ad1c2e4
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150830.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 3095c81..b545186 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -92,5 +93,6 @@ EBUILD netbeans-nb-9999_p20150825.ebuild 5003 SHA256 904c0e57c79483f61e81428a96a
 EBUILD netbeans-nb-9999_p20150827.ebuild 5003 SHA256 fc6b533d6aab3c201132e3cbd1a0e32ecd067ccd5ae341cf7f0ad8ce752c773a SHA512 ca18add82b2aac8e920482cb288432d767e6fe1782903c69f475d58c94a6600c06ecd0aaf72c9e14c2e6577960eef84a8234438735d7169e943884d2edca3dd8 WHIRLPOOL 8f2d17c78621c926097fdd85904fe8d82f2f2a0abed8a3bf5ab4075a783d20d1cce6e7c39be5b1de7ec35e8f2a905ab4f8ba29582357bc3ea7136d2fe79a3bdf
 EBUILD netbeans-nb-9999_p20150828.ebuild 5003 SHA256 51cf9de0f7508aff7bbf6ee662f7828a34d713fd055e7489e3fce58e4b632fe2 SHA512 b6ad2b9c499a7935567873f43d570e93d884966b5b10d05ecb3ff587b839c6c307a1eea1a00c2ef446ca7409ab4fb54c5beafe87d7ebd54931200974a1a3aebb WHIRLPOOL 429be0a4548cc9aa4f3cce3bc4579d5be54a5d30ec04d635c15493b59df62b3e0333ab86022ad0bb58b09d0874713c56613f48ecc0c5abb4796cf4d8c3d76eaf
 EBUILD netbeans-nb-9999_p20150829.ebuild 5003 SHA256 a422159d2ce53458c3470c8750b79688bc992fb15c55cb1ea72a616269a0ba61 SHA512 375f47f708463db3e98654165d5352529f6cb45f43be51732d2fb09a42daecd02250b4d161a340d51eea68659635e5a97de6e59ea18432d35dc1fc0151a64faf WHIRLPOOL b44e9249537994bbb2bbae2d008a45a29f7dec0b7e98d70652a7886da64b53594caf5be6f89b6fe77b3f081e2b78cf826cc3fa940a12b51e46734ee39eff30e3
+EBUILD netbeans-nb-9999_p20150830.ebuild 5003 SHA256 fffd5341f542f0ada359c082e15928f9d5ea3971812b0af89c129e265bdf5325 SHA512 0cd67c935b77613149a34652742e9958ce4a15423420a52046fe8bcf08f26dffa75f3f156264aca2a4aaff81a61a191901e949a743a41dcf3d1ed5e0788b2a0c WHIRLPOOL f00c5f955e59e0539a4e5fc28015defdde2544a0ea2102fbbd11805ea569ed062c2aed440fa5e04990293dd6c7a71514f342b2ebe00a5aae576ad6dac46767da
 MISC ChangeLog 169135 SHA256 a2058d4241d04d19921d7ea766f3ddd9ff896b058b2d75f71f9ff709ba7e4dbc SHA512 519e565386be01b90ff52b72988db3465d18bb2ce09e4a473e43049beba2bb80b1642ac3638160fb5fd31741fbb2ffb6d0a8af17fa70eb949686b0d1d76216f3 WHIRLPOOL e8f2a3c9bd59cc8b0a06ebd2e24b1622b97fde954e9cff6b9583cf783243fde79e58b671ba697519c77b9364b3ed74e1c2c2d1fb56b30c6d5f2951f3d68ddeb2
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150830.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150830.ebuild
new file mode 100644
index 0000000..2a78b19
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150830.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 68cac3b..9004781 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -96,5 +97,6 @@ EBUILD netbeans-php-9999_p20150825.ebuild 4423 SHA256 208758a349245e58979c392d18
 EBUILD netbeans-php-9999_p20150827.ebuild 4423 SHA256 b9377a3496eaeda6d834e5fde55917c1137c8706d3662e18a37b80cb8b2315a8 SHA512 dd638f6ee494c4339d77a322b77262beb76715fd8d9203369f618ba910927087563000f6426243467d60fdc1c43da54a13c33edbbfe9d584c166fd3894cca514 WHIRLPOOL 8c89387bbd461ac2f37ed28e7a10b86a8694ca88c76633debd58c1abde238fd381b216a11fb548ae44b5a822aee4753167c1caa4d520e5eedbaed97c69b3e220
 EBUILD netbeans-php-9999_p20150828.ebuild 4423 SHA256 b6eb88aa2f2df7c426714381fc501d7de3a67a2c4fb7ce40ae4717d7d9381033 SHA512 f37f2c499750c036e26a0d6917a842a5cb68679ca4d22a10f23976c2f0b9c22a6bd867d9c95d299ec640900560d071e5b03dca217bdc9f2dc705f8761aff61dd WHIRLPOOL 0af4d0cc4e35aa12c3113203648acea6c16234bf4e30e9202e7212bef82cce7afcbc27f779ab699fefb80f6dd7c43b1c896c93c88c5d9fe82f7ce5d567534802
 EBUILD netbeans-php-9999_p20150829.ebuild 4423 SHA256 c54a31711b55d21706676592d1af6d57b8445fdfef136c36f14a630ae524c90e SHA512 421f336d8389367ec712f0f84a9eaab997a98af285328183d4b2205ab4168f4e99d86245be7f52964c57418f4538337ea0ea7c203a910519f67371794197e812 WHIRLPOOL 5d86432be18c6a0dc6e76f3e70d6e1c8b7ea6efc15f58984ba33277803cae807eb7e1ac023483647e20b48aaccc598c6dc33229c07f88edd12aed9473f06f82e
+EBUILD netbeans-php-9999_p20150830.ebuild 4423 SHA256 9dfc678809615318c53dbfb910a0b3b96e5f7a07e1f42957feae6a9df3d8f785 SHA512 eca75f5446f35a72dc973c4bce1feed62d4521ddd4622fb774d61c8e3f8881106801b7dd2484efa40718e49f7e555965cce63ec0dddbcaf8723729334726a1e6 WHIRLPOOL cf8862d391535d9a487b31a8fb69531fcb625b737634b97f1d7bab3786810d13625e9d60389692dc1cbcb190fd718fbdbbe0eee4a041396a09bc6b76c988af4f
 MISC ChangeLog 169027 SHA256 4ace5239063e9002ced6300457b2c9d522f1ea75c192f8282d190c9f5a00aa02 SHA512 2cda37a76d0ec94a2861384e423ed377f1d66a64cc5788e5c7d27b5dd5d54e1050ebda34c5b06c5e16788e75c67e69b897a2a593a1ca094a1f4c9e559bcd99d9 WHIRLPOOL cf290a98553dc040918fe48423185473537ab26de0d7e86823df58f0bfa099da82a5332e2b0e72699c5dd3437f0198fb389c94b302b993e15cce7b5fbe26c0a2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150830.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150830.ebuild
new file mode 100644
index 0000000..8a34b5c
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150830.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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}"/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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 63f353b..56349ab 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -71,6 +71,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -110,5 +111,6 @@ EBUILD netbeans-platform-9999_p20150825.ebuild 9244 SHA256 350e5aaea9290133936de
 EBUILD netbeans-platform-9999_p20150827.ebuild 9244 SHA256 99fc686147850516d837a69229f980993a8101ffefabac3c2d6795bb70fadd62 SHA512 9524f92cc5691f77fd54f58fc58d917a62edfdf824fefe665aafb0e62f655d87b451423bcefcb053077f1edaab15566926ae1c91a06b144e2dddcef16f935bbd WHIRLPOOL 10818d00907035faad7f75ae343a7d5d7034aa643def3135bd421b92eed9c48040e12e21994c126da6d0327d108a599945c4fe7702c35e9dab15914d5c9509c5
 EBUILD netbeans-platform-9999_p20150828.ebuild 9244 SHA256 dbd6ecf682a5dd4d492ed7e74da3c246b81c38e542b0bb1901f3ed1ff5ec5615 SHA512 5acddf79e83207b25feada16d15b080fcbda1301ca89f81868cb103beae9b90579e79d1f0c4b61cbf34e6bd6da3f1b9419e7795511d30efb70657fbae66185a4 WHIRLPOOL a3c7b7b7943e8a11b1cda2f773735d229c26e00e6080732e57b304782dc3cfe631dec0d51c2e1ff7b5675fdd8ae850a845383faf653afbfad5ad986da19a5dd4
 EBUILD netbeans-platform-9999_p20150829.ebuild 9244 SHA256 5bd681528c526e8b8361babd3d0562f5b138008f9d06c8e6f08ca8b964e7970e SHA512 b213567413b73870f75dd1fc5a1c1c45f1903b72feb332d83dd526aa6cf8e1909b195fcff4c760bb11e84749f606972743589593c17fde3c8afb426070ccb7aa WHIRLPOOL 10eb200009d384443e256bbf8f29278a8be463fde255caba86f725cb6534b7d86fe2e7198eed83e047010adebe7a4ad234c32233e022086dd880a02bd5ce2b8d
+EBUILD netbeans-platform-9999_p20150830.ebuild 9244 SHA256 122e581b6c2a6c048fff901680783ac42c63fc9869ec1de34d29d55f127df653 SHA512 1b96eab3d7ef18a817ca62bfec5dd9cef92904cafcea784670eeffe5d4116c99ecc580ca1c7ca9a6cdd6960f8e9f4304d717d23fcae9e12d748c2f2bd1e5a608 WHIRLPOOL 30ecd71102d2cfe0a49f088cc0226f141c974fc0a2c8f9249a91e31b4ba9ea7838c2dc129646804eb9bb7081372297a35d706808572e948dbb851f2880dc2854
 MISC ChangeLog 181837 SHA256 e5ece167a7c5bebe735bb0600aea95eb21e0000f8a7c9413f8f60df0fc321531 SHA512 bed0c4496ece2121ffcd23cf6d1b2338294fb860311dfdbc015536111a9d63374f2a3b78cd5b9b60ac4717600e86e9b35ac6e34a01e0b6fef833a72f8109296a WHIRLPOOL 6ee9fdc5d0b77bff5f52267ee9a7a2915eda954ee000c81adc80ef8ecbc7f55db54a26c8a0f2534640f4cf5c5037114d8a4f7d2eb49076b3750c3eee5f47d2f2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150830.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150830.ebuild
new file mode 100644
index 0000000..4abf506
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150830.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.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}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.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 2d171b2..53ad807 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -84,5 +85,6 @@ EBUILD netbeans-profiler-9999_p20150825.ebuild 3478 SHA256 a29efa53e47fc6dcf7687
 EBUILD netbeans-profiler-9999_p20150827.ebuild 3478 SHA256 0513c3682066bd08da6795ce991b4c34a869dcbc0b6dee1009b3e6d79becedfc SHA512 e75a6b71aa1ced2a5c83567d342412137f31dcc80da6e4074c111c78e705e6ef83d1f03e6a2a0c222bd8dbafd4f453ceb3a0e66ed0db74b45507bd19f13980e0 WHIRLPOOL a022a7242c006b9beeeffbe5357f5908bbfa295c3d18e2aa41b052559991600a6d1a3f790562ae2af20cc585c135ca55381937a7d9b1260ced73830d879b879e
 EBUILD netbeans-profiler-9999_p20150828.ebuild 3478 SHA256 384451b30d223bde6599cae24dde8f96d1453b16e2906379b9b31f4f3fea3b56 SHA512 5ff07ede9aec50c97ea56eb80f0bf242bf79f768ad74270d9adc2751035e49f85ae44ea1a111233e627e89329dd464c846d0f644a2993c4fc2419e530e4d1e5b WHIRLPOOL a7832ac18913fd193c18ea5aee7e95d5022d4e8023bcb5f4eb0907659011ce19af49cb9f7c4e116d2b4e764a33b1171b9ce568de00d1cf6685b4a955cc4293f9
 EBUILD netbeans-profiler-9999_p20150829.ebuild 3478 SHA256 3bc5d21726be702dbe6cb7d508a863bd7262413b34db35b28bf91a608d6f117a SHA512 44bc50e222f59efa46e3feb326fbed1ec8fdeeba034275009ec0880156abbf58c81b3286738786ab6adb6a19c39102d260280cdca9836ae01f7f6e0fb49b3a21 WHIRLPOOL 5509c1360852894ebaee62a3b9f7a584fb4d5f81da6c77ad883aa25ef1dd6ff5cab26832fae9669b97f32b629574312b25a95fe0520e6481aa8b62339c2bf14e
+EBUILD netbeans-profiler-9999_p20150830.ebuild 3478 SHA256 c34c37e1f4c479c02be21971319eb243c5c98c7338d1dc25788daef0faa228bf SHA512 fff6b96d433c49037aab7457a2cedf5a88a62ab5b2d5b12e382ac87782f1c81952f17b849bf04bf00d235ef3b9ebf6474ac08d509573c802da08a3930d033981 WHIRLPOOL 288f88e7fde3193e2add5754baf168de869554ce6c22c56047948f71f3896bb29efc94ea9030b5105f2e3b3b02f9743c297407cc587a35593fbb9d2e3e43def0
 MISC ChangeLog 181298 SHA256 2da9d27924ed5e2a950abe578dea82da35dcc6d4aa8e5b506304e7eee15d0a7e SHA512 1f80928ea3d040479f80ea20548817766672fdebfb942b5bc0e3e39d1dc0b7d83e4a11e89c2a6d3e5d6e8f8ba2347b94f6d0fcea79c3a13860633a2475ee9eb3 WHIRLPOOL 70ce8ea784eaca2072af4fe2e5fafb999a3014214e153ed6ee9c9b5962410a598de0d5909d56e6de99b1e39c062b3987c6d3a61a791684a9542d2c124002e9d5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150830.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150830.ebuild
new file mode 100644
index 0000000..d43d9ee
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150830.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 1a357cd..f5264ea 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -88,5 +89,6 @@ EBUILD netbeans-webcommon-9999_p20150825.ebuild 4997 SHA256 3e8fe324f79c4e376669
 EBUILD netbeans-webcommon-9999_p20150827.ebuild 4997 SHA256 28542da5d5a26f9792733e47fe82598ff684b037665a3942e2b1481ab57a37e5 SHA512 47cbe5a1464b27882234dd2f4dc6ccdd3ee8169e005db7cd1fadfc2ab054904b97fe44eb024bef39e5058274a3d99a0f171babaee7ab8a18dce2e0d1e5ddbf11 WHIRLPOOL 48fc9df03707d87eb0dbac9f4a8834803584e73dc074d840b13101dfb279abc7cea41d954543534b8ebe2442a766c796a3b02456cf8a500333783e4ef80d5556
 EBUILD netbeans-webcommon-9999_p20150828.ebuild 4997 SHA256 c85628f78b3ed825d4ff9d111bce6063ea3d3df5078f94fcaa49110a13c7c867 SHA512 9320648cf58a0097d171a794799b6fa0accaefb1bc5479041b2575729f3e807a806da2de08b4b0ff1c621cd7e4ab51e75fb9fda9eb71ea005ed0f842c8aa4a17 WHIRLPOOL 493d876bb52e4e368504adc8ca0aaa8a16216db41b8bc9bc2721d51d27e99e3fc3e931dd1c0b24fae9977c54f43786a53dd62ecc0c30cc55aba26d5f745cf0e7
 EBUILD netbeans-webcommon-9999_p20150829.ebuild 4997 SHA256 e999b25e576e9584aa6efe22400774e16382a965b561df14efc27b59be3251cf SHA512 4ba180623d52290acdf1750318efbbb140cde004c4ef62fa87918eaf6e62e75a1ba48563b6745be55afc9fd852e818a5d8f4bd4f0916ac1452c7db0379fad3e4 WHIRLPOOL a0ce9aa9628eeca8df1683e14a177cccd496aa8f45c3c0bf3f5272157163a50d43dc85f3d76732bb49ad8c7dae2a9a47d8dbb9f283ad4b8612f31d4cacfe34e0
+EBUILD netbeans-webcommon-9999_p20150830.ebuild 4997 SHA256 16572d0e7a4f269858234d4155c856479077e11ee31e3a8c7d1b65dfbfb03469 SHA512 0e06460f60e818ff8fad3e1a6dd735a1bfdfa5f2c2f0c71580189a84e12d853a7997d7a2501596e5a4cd2c8003bad37a09be0a8043dc45912b988202bd169b0a WHIRLPOOL 4995594941f3943a11f4b573b80cea181235c5464582ee5360eb1a70206d5b2ef02d49597d16828cc0fe1e718e9ec0bd924b6e77b23a9259a4e0cadb645053ff
 MISC ChangeLog 154545 SHA256 d81656257b010afa97e26cbfe4e7634f488197ecccf7eeb0f739bfbb44889b9e SHA512 bd6808bc6cc14f1719796301aae5546e40443bfde0735f247bb2c588d753b4fd9a1247a89545ed814d253a69170346963b5e2e2fc18f43c99eaa4354c46a8b67 WHIRLPOOL c8a86015f4ab3d44e63fdce1924c6e33ff063060d7c1573adeee4377fb31328700a714dee42bab00f0a3103dabae08e549fc42f730aeea1e25c4dd893a42f741
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150830.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150830.ebuild
new file mode 100644
index 0000000..9a483c0
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150830.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 09fced3..359a941 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -84,5 +85,6 @@ EBUILD netbeans-websvccommon-9999_p20150825.ebuild 2727 SHA256 89f38d7302d631378
 EBUILD netbeans-websvccommon-9999_p20150827.ebuild 2727 SHA256 5cd9dee933903bcce75927ff2e1e71bfc939887f52e192291988efbdb11800f9 SHA512 e97f5b68f222670ea5401f74cca1d4a0d1f2823d209b06dc5a0a3c2aebf9dd522f80e7d14c285e508eeedb3550f549e700eb273171bc2be74d9305c16064fa63 WHIRLPOOL 90c22aadc0181b4a8522c3604b263124e3c347a104c3643bb922c88f6301f1d57c61825fba1f17d0cfff3bcf835d722632c920249abf36b32dc250133dbc67bb
 EBUILD netbeans-websvccommon-9999_p20150828.ebuild 2727 SHA256 c21b29af6d453bce07f0a3664a013316e105cc14e5cba62a607651c9abb5423b SHA512 3f349685f927ea9b17a3f99d78f64afe2d826d50fc6f1cb51ccb75ea1d63ed05b30d1d155feeeb2dd6670b178d35b6c09d0607dce2a9fda237f4fd273ffbf073 WHIRLPOOL 19109048ec64f420ea1f015aad8f91382d0be8ad5641e09f041db4df1d612f1af606fca725cf4358afc67dfd9c03fdec3bc906e865ed9f7488b172346ef21c46
 EBUILD netbeans-websvccommon-9999_p20150829.ebuild 2727 SHA256 0973b7604899a2861ceec014df6bb5cea3de89aab15166f431aa043ebd85fe55 SHA512 3998657d7bc63e54b64235e5a9c5ceb18f55d18e7badfe67415384ecbda243910f50cc70528e833c68eebc87fdb432e0a9e0ba0dd882ac560886feb4fb775c4e WHIRLPOOL 2adabb7983834b3a5bf569c60e21a4cfce6f67a3818c55e9b573cefde6e07c3c5172dc7663d417306e74c78511ad4f9012f1b6a105268add03be3badbe783afd
+EBUILD netbeans-websvccommon-9999_p20150830.ebuild 2727 SHA256 83f9b2d53a1daa9058bf78eff82479f3ff92c9a6c86f9a6a148605bc79d4e1d1 SHA512 cd05df3ecfcd9305189b07e0e1c5cc19453c6107f3cee96e90c52ebdf536a8e5ad437fe645ad826a65d416566762b1b15e224b00cdfee0c06c7445722547c1df WHIRLPOOL 8215fa1442176c30d43de8cc9a828683a55605209caed3743330b99489745cfad3b056abaf6cdf95f08bedb0a991b34773c4adfc1661896d3d8b16f805a97e94
 MISC ChangeLog 190204 SHA256 f3114143a72ebc7b2dfd0ed88e85680390d8eaf8fefb5ac65fed21e8653120cf SHA512 ada32572512b0dfcf84e5ac5fdfce1bacaeb7752b777ddeed496139d979b7f2d00f2f9c86b66655ea03c44c53374c975b36002ecb03da6541ff5debce2a39eba WHIRLPOOL 3a8083e4453b0838a61192f83aa9e99da2316d20d3f98bd6dbe7345cc9f3dd4bb3f80491012cc2c52d656b7ea641f0471f54cd0b0fe52df1b0151f9cb340316e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150830.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150830.ebuild
new file mode 100644
index 0000000..1b4a00b
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150830.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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 397db0c..49c592a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201508250002-src.zip 208865510 SHA256 8c32696050afb5
 DIST netbeans-trunk-nightly-201508270002-src.zip 208909678 SHA256 1bbb6fbe996c3dab4172247c2e1316d0ee0af9661d424e42a2e2bf1679d668f1 SHA512 7b63cc510258255f1430fd41940300701f381b5b62f5429bd2a7af53a76a32d14090802e6984b3c3b97bc7bb9d2b88b4b8e1801810ecb298006193901e28c704 WHIRLPOOL a4074b37ef2bdb089f3931d75d1a3cd5aa0064d6ee708c6b9e108de35f3560bd5ddaac4a6cce09ce8bd3f6cec8a980cfcc90c6ad23bbd35063d62836ecd8fcfe
 DIST netbeans-trunk-nightly-201508280002-src.zip 208916695 SHA256 293e66227c6140c35fe25a48303e50958187bac1ad6a9ea493b58f8fc9f1c0a4 SHA512 22b8635557eef88d4a54fef409aebd46183329e9b329a66749979fbba1dcb95e0b47fca9d78e1b683701eb343072cefcd350c86c783dd6cd5e51ba81ec49fe57 WHIRLPOOL 66edc93e82bd3e88172e2d635ecbb7d457bac2cecb6d4b072f9422751781acc0c07731382db0f1e25f037aa37c6f284ad4d80c7584bb0b8c5b62d7083f050bbf
 DIST netbeans-trunk-nightly-201508290002-src.zip 208920597 SHA256 90f25d177122a7433503400a49228c3d0c70007a473ca14cdf6c8925105a4310 SHA512 d3037303e8e38f0ca69599d6aa91b65fef5f82e927e29b74470d8d1f758cb972bc5d030c785cb0eb604b2efa10c94f245ea06a394f3a6cf89c0b5a1ea6e3ebd3 WHIRLPOOL 845429a3551ece8a0339fbacd011d5771900dc41a18de3f39e9ed53504871a0d4e414ae7e98876297a51637ed11b39a537ddce51f8a2b5abde339e39b243e837
+DIST netbeans-trunk-nightly-201508300002-src.zip 208922288 SHA256 87489e4bd33b84e2b2f2fb3c025cf4b2d78140483fe37f74dd101d55dc3ae629 SHA512 cc20fdf30b997ca87666b9abf564fc9a7e645dbf37285db36e78b5f75f24edb82de3af8c82ca7ffd40a10a70b9196cde63c5ccb7ee69f33d79110668312455b4 WHIRLPOOL 554c7dff1e874b30b0c4a87115ffdbf4dc7a78e6af5f6498dbd2e3dff956e718cbfd23956f72d1d5b518fe2c8fd0cb5ec67e9eb0e79e32cf763021e82edcc3c0
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -92,5 +93,6 @@ EBUILD netbeans-9999_p20150825.ebuild 7216 SHA256 09191ded2785a4f689aadc6e0eb052
 EBUILD netbeans-9999_p20150827.ebuild 7216 SHA256 4968f324e5c2a3564d953f922d2ba91eebdaf5b8c4412e72621dd31d5628ff43 SHA512 39fbfa6f027aba6c828df86ad1c26054312d1d8d58ba761ef8b2d2f7db72f84458f316ca7c468030aa54d3df70c99900c9dd0fc231fdf4b4146aea693340b395 WHIRLPOOL d692c586cb26879100a481b6dc6d9ad95089f07c136f0ebfd04a4060edd8d9bcf8e7ea83a75d2644a87809b8b39123ecb5d1a824cf235179599b93dce5e4dd78
 EBUILD netbeans-9999_p20150828.ebuild 7216 SHA256 562f4f184d20b52068d47a7c1edf68fc972cf788102fe9347478e92ca5526c00 SHA512 854817c81d3cedc69bd061f3c67f333376e0ddf8bae48970e64b9b32628d9c24024469e0017280e2e256eaaf6604281fc39f49137eec804f4b8ef43805e04476 WHIRLPOOL 823cd2bbef530f31bea4d8a9469cf53414603d958ee1b5d8ebd0b5fa8311c9d44cf2e73b2557e92ba2896343c97e6831fb491cb21b05ee01996fca964a78e4ca
 EBUILD netbeans-9999_p20150829.ebuild 7216 SHA256 60b09a4fbe0efb12755b20a5efe9612cdd63369a4e64a2127b90209abc09ff90 SHA512 829789811c0155eeb2a239e4c5f3aad19135215efc8a49b586c4e271559e73ee9897c3d6ce4c747bbc45244ea0f88a5455910eb175da57697cc856e15f8feb33 WHIRLPOOL fa168632c279aaebc381c764593c2ded9f7f4c251ffb232248e022e31b9daa72b8a06ed7cda1b3f55617f5364cf32181c290cdb1ef39f73d050fadbeb6d55231
+EBUILD netbeans-9999_p20150830.ebuild 7216 SHA256 21ab1219e7764a7565521d7a387f2cfb8318d5d718260fb7b375a4ad7dc31971 SHA512 467c5b143c27dae6ed696be8897881d8fe872e02a48083f7b3e8855356895649794fec9341d4e9712e5c98284496d293b3fdeb6f745cc5f0e44cc396039d6fa4 WHIRLPOOL 434318a70ecc18e5ad93200b7a045cde0f84660409774dedde68d35922d4852df9ff80afa03663efab60d7021039114411b232b9d5aaa7446c8d6bff58a4b06a
 MISC ChangeLog 161372 SHA256 904c6845ee642f1a9327bf595b2fa58ff490ea052bca63a54cc186983174d500 SHA512 2c877110e3e3bfc6f38dccbe3401318ff20719332c2df6d3209fea036c6f2ef2a66d89fedeecf7e2dc5dda18d86bbcb97a6d680bc0b1e5b81dd6aaa74b4315c5 WHIRLPOOL 8b0bb63365ca781d790a0fd39b0d896d2790adc417f719e724191db19ed59e4c1befe57735f53d9b6398d438cc312622490cc34ad797d94605bea37a2f95eebe
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150830.ebuild b/dev-util/netbeans/netbeans-9999_p20150830.ebuild
new file mode 100644
index 0000000..0314e5d
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150830.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-30_00-02-28/zip/netbeans-trunk-nightly-201508300002-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
+}