[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-util/netbeans/, dev-java/netbeans-nb/, ...

[Miroslav Šulc]

commit:     2a36410da590dd8a109a0b4e81c67ebb6443da8f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 17:35:04 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 17:35:04 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=2a36410d

netbeans: version bump

Package-Manager: portage-2.2.22

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 3645632..ed79888 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-9999_p20150901.ebuild 3384 SHA256 187e107dda837afe5fdc0b321a4bba2e5fc6f18dff1eb359c64c122ad04b9e86 SHA512 ea07d62ef5f4ee8d68f17f69fb3b10924e37ff38a6c15147f432232f354d3475f4fc768a535503cd12da6a3d6b2ad303abec714e362506bd723ff23cbef4b36c WHIRLPOOL 9fc6fb1c7f4bbbf79d15eef81c9c440c3a98a2ed8ff4f04e73ba4a0e36b9c54cad45e50ea89e04e5a8b175a3d9d56c9f3e3af47fbe9dd21b9d8c367bb3623ea2
 EBUILD netbeans-apisupport-9999_p20150903.ebuild 3384 SHA256 13a7a16b6a12ed08e9ad7234bec1ad5e5fe209e4f13e4587bfcf4d28a8869b22 SHA512 cbd2dbb4d8c01b1f6c70ca8a7835a58c2ecf94a0ec084ef2b2c73b675734ec61497925791bc2045fe7b36d372676309057a520a669828d604d93dd279306e9db WHIRLPOOL 08fc78eac704d29500bec5772b64ed2b159130e3414c9f7beeddb786ad3233afa0b74086d7de80d66ca335af56b22eafe254513a847839cc1ecf7584cbad832d
@@ -30,4 +31,5 @@ EBUILD netbeans-apisupport-9999_p20150921.ebuild 3384 SHA256 9ff68b5a869dca4869b
 EBUILD netbeans-apisupport-9999_p20150922.ebuild 3384 SHA256 8ce99a19d486f4bc619acde3a6f62361f988504da0a2cfeba17226f30ce8e42b SHA512 57858c1784ad0100f2c0b36bebde5873ce5bea3a87ba60e918c3e4c8cc27d92c87a1f5771b3f8af2d3d6550cd04b17b7c4313f8702e705f7de99624fcaaa3f2b WHIRLPOOL 3be54362b1a715b908fb9d62c6d28e51f37fef1aa6f2cbd6edb0347cfcaf81339d11c7af63748416841ca2ab14e4d1e894bb8a2f796ad9132c589eac3274a451
 EBUILD netbeans-apisupport-9999_p20150923.ebuild 3384 SHA256 0df65ef5bd88ee939ff058090b1b4fc44f512fb8e5e6e7d9b76b1bc39ad385d2 SHA512 b109d9d7fbc34f665369becb58d9c5ba2d283f8a57517a9b948c06c64d03ec6d87ced0802b4db3e9783ec43f13652f60ce85ac0c7a99bdfc2d264dc72df590e6 WHIRLPOOL e1398ceb66bd8ca96cf096fe4d6b79a9baae4b5c99b082eca6a1434fcc39429fed75e0ba6ba0ffe0af91dabef619bdd360a0b3af809ab33b2ecc3bd9ddb409a3
 EBUILD netbeans-apisupport-9999_p20150924.ebuild 3384 SHA256 309feaf4f8cc24c494a4c79d9faf8c26faf34591cb9939b84d2983ea8873007d SHA512 734448ecee1173232a33044acef5d7b1aa2625c3a30b8155151ecf67f47b3c4e92934430c4a14a3e49cbbce84fd50aeb8e34fd92431d68769f845fa85b950ef9 WHIRLPOOL e46cbbe3efa2d49e29b9391d31e7ceb5fc5f10cc33f699ba5fb7a4721283ee3c4caddcfa4bbbaf508f3d94d65b347c974ea8f75c25255bb0d8f33ca5f2328ab0
+EBUILD netbeans-apisupport-9999_p20150925.ebuild 3384 SHA256 aa5fa670a547df953726f37bcdc18deaf4843277912312a62edadc6024e2d215 SHA512 54ca38f1f15f0fb970190d10988eb720482bc9796410430fd8df9526579e2f80904fbf8995e33d0cf9dc04cb56c30e224cb1bfa51974217db23f67429c0ad1fd WHIRLPOOL 8a4f0a7f5afa62ca0f734c20b59b6ba5b3300bef190a8b0feb42504d26b2c35792cd81c1317164f66786479488ec661de86279e652beda4a8098a9808e3b5903
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150925.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150925.ebuild
new file mode 100644
index 0000000..03cc4d6
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150925.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 ed1894b..5eb111a 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-9999_p20150901.ebuild 4790 SHA256 0be3c11a9af46d2d8aba83d0e15c09b935bd598464f43d5030887464d3f96f9b SHA512 f3b2e7de31f3434d6390bec0382fd6d77d2075470543cb9052572c91483ccfd026822a5db6f10932cb86b5974a0d2c5f390551873dac6cbd1f463b62560ab196 WHIRLPOOL f158e99c020c4e0f67c3ceec7a59d5f2cc455c52db4a9301bce821a123b7c8f3e570467aabe9281ac440d067dac36525b864dabd0c06b88ad86a2464d4e5140a
 EBUILD netbeans-cnd-9999_p20150903.ebuild 4790 SHA256 57a5694dab810fdf15990d575c3270fb7338837550ba4598e21703e4d904e85c SHA512 b5073782475520ba9126954d5341c0977a73f4b838ea4484835558b821baab49cbb52e3e07705f611e879b3eefedccb1e9a0817bbf9b98d80d17018e5888ad1d WHIRLPOOL 408c5a25c4877204b5e3a9ae8c4b7b23464a68527a8bd37e37df89a5fddf71fd23cc4e80610981dd72325d9289cfe2c5b3172986e3aff240be9911354b7d8946
@@ -50,4 +51,5 @@ EBUILD netbeans-cnd-9999_p20150921.ebuild 4790 SHA256 6ed2de03f2dd8e2e6a432544a9
 EBUILD netbeans-cnd-9999_p20150922.ebuild 4790 SHA256 b982f6466f4e54e21f00581697614e032ab2dc25d1c9cbc88be4832fbb38e450 SHA512 407d63b4819b319e98ed4f627fc2c4526815d492ceed83025fd80e48f9f5298c050f8c55ec00da0eed764772b8e5da3c9849f8e27f4202f62121f510f93f27c2 WHIRLPOOL 8ae2252bd6b6091524ffceb9a35fc9c94f85ae8e7939ce7f676546183d3bc698bae9765626f3f030cde5321e08f0f620c1b53867d9c19d8e972686cb91fa1b14
 EBUILD netbeans-cnd-9999_p20150923.ebuild 4790 SHA256 f944283bb71857fb4e66583e70eff2b674a59ed34f23ca671f7e7bd09eb17f3a SHA512 4ed5bccb7bf8a3609e7393d5eb389e517bf9b1e9bc8adcd8f69cf82c52045ecf33b940279e1d48354a83a76f6897f2e8146565405c8caae779ef8d6f78486c35 WHIRLPOOL 87a6d3e5c5ef43a79c4721b86d565476577a00cf7b9af0135340e0d55cf33f2c1697a64336d140970febc194a82ee5739173c0e1e29e998e88f696d8910ffa63
 EBUILD netbeans-cnd-9999_p20150924.ebuild 4790 SHA256 1e6242df1437ee478cd4bb792599cab312e7e62ac903bfd68c15e22c2b48482b SHA512 2b7e57699ca2ae3a68965ce1c7574946d5dd3af97342414bcba0acc3fd70d35010b305da1bc287d791123f0e98a2669c2aeee82121ded6107718be309fc28f66 WHIRLPOOL e40ec033df821077b8852fac390f9b538b270acf054aec4f6a77e966ce2904bdf2c50a9e29c5823ab683e6ba99c3fe0d1436f84363b393f683907b7e6ad6bb8a
+EBUILD netbeans-cnd-9999_p20150925.ebuild 4790 SHA256 0442eb9d63835aa3ace4ec5fac2ee030e4821dce54376011399dc817276f372c SHA512 939d64a173e4a1ee037891cdfbdc11fa593894ef146cdd00845012d49f015df76cb72fbf05502d290cf1b4028716cceae8ed81d81afeb286349ef53d4bf0e81e WHIRLPOOL 03311a53adb48ad4c559d7d539d00829d65d0631b3a992bf0a1e6da947fd33fdde566122b62ff98fc74df1acfbf3f8a0f30b6b6cde0bcfa6443e6751e0b7d196
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 220cab7..c02b923 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-9999_p20150901.ebuild 2968 SHA256 f24ed1a628b18c080f9e06c1b488b101ebc2cf6cf0aa44c5b86f168fe52f912a SHA512 0fa494a731edd4f27e36d537e0a57ab868b8a04db394777b191d8352c452f75d06900ec23b0e25e4d08b18cfe9a8d9245890b01e24e510e52b2b218ebb91d2e8 WHIRLPOOL 439d07e76a1cb3967a1ef46540bfde542e11ffd7e4fbeb6fde5f198fa5f203703b6df26c4ba764d11d6299849fc8d4c5b7eb9f2133de02ccc586deee4cc34c34
 EBUILD netbeans-dlight-9999_p20150903.ebuild 2968 SHA256 e798582769fa118385293ad20cfcdeb51a4e10be437941396b37a71faf72bf3a SHA512 3080e3c87c9668b8c1646a61f2106ae937e1b8c9049e9d08aa933458b8e4dc4721c1caf84e12c37c397c4982cecfd53e39f2516c05617a59905182aa4e4190c1 WHIRLPOOL 5ea9f447ee4cd7a398db727ce0e3dd2944c58979d8af5f5a9c686732fd6dabf2403c2357c2e5d4d088ee36655b403dc6d574e2676d032e639b9cab3faf00bf70
@@ -32,4 +33,5 @@ EBUILD netbeans-dlight-9999_p20150921.ebuild 2968 SHA256 affdf62850e90f0199d8c86
 EBUILD netbeans-dlight-9999_p20150922.ebuild 2968 SHA256 403af1813e041afd958689dd4f2dbf758c9fb6c5ccbfe7a34006fb855b74aaf9 SHA512 6302ac9859482713aabe07d4e59c62445f8bebf86186b2aede3e7d2a56e607407fb21782e9f6e38c0e908fa046de83759ae8b58f1d07ce749b8e19702d8ca901 WHIRLPOOL 6623fd86581e33f36401ba7e8964d1fc6d6c5771e33868f18976c3124661b331dc7b6019ca5413f70a8502250ecdabd853a6fd1023fea097adff806488db02ea
 EBUILD netbeans-dlight-9999_p20150923.ebuild 2968 SHA256 2b221372d118fb453301879cfd96b3ab509b7353fc2fa5567ec20330acce9b80 SHA512 695d5d7ad3e703e1d6b234990723f79a5a4129b65e879b549b6c1e50f5a9f1f31588f63372c809fb8e91dbd63fbaad74a192495c9c9b7a4147fe4239996c914c WHIRLPOOL 3680eb3608402212df13506975713da9e9c45365ac41b92e1ead3b5bd50a2c555e3fa623e37e371bb0692917eb5d938f19059fdc5d2e95d0189f7f52bdcb25b2
 EBUILD netbeans-dlight-9999_p20150924.ebuild 2968 SHA256 e74b2e1e4f2473d588949d9d6fdaf8f67b0f86c1d2c830a8fc100bbb0d5baa2d SHA512 782d0c4254476989012242dcd967835e1b20b5078e56a9065b202a0fec71c1a6876459a633bc20c1815ce82c78ed88e5b79097a16f21274940a4012ce9a91ea1 WHIRLPOOL b6065bed8b3ee63bf831fc8f2a311db04b029333cb7a0b1d2370a8ce06cbd746cd827245b27ee4c4f57baa8c210d7cc6284cf4cf0c9d467ef926aaa3959a7133
+EBUILD netbeans-dlight-9999_p20150925.ebuild 2968 SHA256 aad2e8a17a258ef0a163cb5c6d1926c6086273d9b9f339f5943d09fb55c74e5c SHA512 751b9692a9fc416b6f2597278ffeccc6c157f5167bebc5ead143ada9efe1c1f1b728c437db4d493cb5ffa2539483df1bd1971e6368e683179150d73f98304e96 WHIRLPOOL 0bc902ce4756029153908effdeda559ef96005c23a094665402008358b269a3c2ebb35376c52c0c6647d230f8717ea8ce2933c285640c20d4bf918ff2f0485f2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150925.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150925.ebuild
new file mode 100644
index 0000000..b4f659e
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150925.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 e7faefc..99d360b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-9999_p20150901.ebuild 15931 SHA256 44c06fa71678bc9434d41c8f580375f0e56c4756da1ad14de658574360a4ca8a SHA512 0e0800cd6259f4e4524d328a593ad4d1a40cb0b129ef53088403c0fe90b732f15eb897686485f629501cdaf4efbbaa69c60ce648e655a016abf4d24588a9191a WHIRLPOOL ee6d2a407a2d6e124f21912a7a0b1c6dfc8155cf228f9f451554c1c40ab63d497070d0264360aded0de23e7c03a52825593fde03dc4ed092b65789cbe083d47a
 EBUILD netbeans-enterprise-9999_p20150903.ebuild 15931 SHA256 2d15c63f7b1c6b590dfbda9cc26aa44ee36c043a695ad4ae06bac98b17f9f73a SHA512 6ca976ec3cb4b96d4d9794abaaadaa7e42dc0d4537e02a6cd0a65b0df7c2789a5eeeaabdb33b42df134271d4f8f0b5d54ddbeffb18a704e36c6e8a25f6d5245b WHIRLPOOL b0927d3c4aedd46698cba83fb07e35d5d0796ec9a50b65cc828534da1c45ab9b75701c58003583af3f999a2d4fa69a6b4a62abc3225d7591444dfca0353e3bf8
@@ -62,4 +63,5 @@ EBUILD netbeans-enterprise-9999_p20150921.ebuild 15931 SHA256 f7966be78f87e1af84
 EBUILD netbeans-enterprise-9999_p20150922.ebuild 15931 SHA256 549133f581930d318c6febf2f0b1626fc3bfe7bba7bab253ee7058acc0b9012d SHA512 05750ddc8cb5e305be698d4443d59071fc4bf0a9235b240e3632195572a64a48077c140ab3c3718f2ec4de4a4e7637ddf4e68a8e7ad43a8c66f4e375507e8f4e WHIRLPOOL 3b403bc19719d32ec03e4f867a8452331a4dafeda80cdacc24018f747c8bdd8578a3016a0ad84f8411dd88608b9f16dce4a390be92b5466ccfa0661f631b9a29
 EBUILD netbeans-enterprise-9999_p20150923.ebuild 15931 SHA256 65047c6434da308e3675534b5867361f4a6a2a2a5a73126938f7c53f072c1afa SHA512 9ae8307b6dd95a4e4344a325056dde34ca8b953ae49eef0bf61670817a73098192470ebbedda5c4a70d378e2f9223908cf921cbdbc8404ad033f438eb0110e6a WHIRLPOOL b30c9bb1cf001711c9ae353241d513f74d64fc74c5d70b8b0e4aa9b6e32e943976f5cf0859213eab4fd3520cb6a928bf12481078ded099d28d094beb0b05cf3a
 EBUILD netbeans-enterprise-9999_p20150924.ebuild 15931 SHA256 68b6cb8a497d46a59c4df1d0ed8b3d4469f8f77bbe5f4586b9521e6e5adbc570 SHA512 1041148a771e73854eb55fbaa93b69c327de91f0b5059abddb4d6760077487ac2b25dd01bb0d0b8212a9a713772b82bd0a955bf8eb94bb72b30bab3ea38ab901 WHIRLPOOL 488106f3cfac8c48af21b30d39dbfc6e256dc4c57005cd28364f28c55d4d648982c04c1c0b8417bcf768b81335356ebaf15ac63c359ca8b3a5aba02eb96b5929
+EBUILD netbeans-enterprise-9999_p20150925.ebuild 15931 SHA256 49b14b170a1eacc6eced325d759248f967fba69c4f48b3dbad2c43cde1733165 SHA512 884ef667b2fc27fb09e1405bb79ca7dc1d7dde99192b0a24847d7a72451eaaef4aaf32946c1ff182c1f61ee6d1cdbaea341af85d2df0dc6814210dbd27b8fd0c WHIRLPOOL 3031bb949cc147fb1e853bb77860342d38a7c398357af60125fc838519595560064ccca44db0658334c7206876f550b38669889460832f9c3b5a998fbbf05fff
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150925.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150925.ebuild
new file mode 100644
index 0000000..7ae4b03
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150925.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 96873fe..215a6fc 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-9999_p20150901.ebuild 2913 SHA256 5c3c619373ecaa4361d21b0686e634abd8e4f94f1d73aedbdc57307d50c64ba3 SHA512 d83f039014436f6e26b1f6fab2391ad2ecc33c184847574ea9c646a1b028f22ce3b566e4976a28d5b6bb00fd671043ff81bc718be76304077caa016613ef1edc WHIRLPOOL d0dbd357622f050e0b18a5c1262057050b740ce60069bdf6450cbdab0cdc4a78c81fc28e3837bd1fa1ab571666d3c2885fb975f5e26d50550b7c30ddbe17f547
 EBUILD netbeans-ergonomics-9999_p20150903.ebuild 2913 SHA256 08d2510fcb31a4ff36c702493e7a028659225e1678b6ad519c625b11220286c9 SHA512 5c5917f2498717d6d404145d13f2e1e75e1e93b08baaa451fbfa4c8e9b518f6207ec1eb86d7f6d57cc96ebaf55c0926f14b8601d7c2ea036c6566e95b2c5deb0 WHIRLPOOL 0e82e1fc32f080535e2b621f69111f0b5f453e08613b916c6fa1eb741cd9dfdb72651b31ac8f5c7bcf31b0b968aed41c3c6d9de6fa272b6d06851853beb1d57b
@@ -30,4 +31,5 @@ EBUILD netbeans-ergonomics-9999_p20150921.ebuild 2913 SHA256 884da1efeaab92c2840
 EBUILD netbeans-ergonomics-9999_p20150922.ebuild 2913 SHA256 99d61bf90b07930aa0a82bedfea88509d6f896e6f70691b9e183b395dd03fd68 SHA512 e97cb8449622b3fb34ac953249cb69c034120de73f2e168471bf97783eeb75f48fb3e3a53cc24b7cbb05e0f7b3c6ea6748f71bc68558970b32a43989291e6cff WHIRLPOOL bf8b023716f321a3fa26b5fd32ef1dd713bc5c1f1d859633aaa87883babca3172a3a7ac2bcb3bd9f8d8c1147ca85110e7e072de79d10b8d3302c5eb034ea8dcf
 EBUILD netbeans-ergonomics-9999_p20150923.ebuild 2913 SHA256 b100ef3ff227f2c4ddc8f1a07c97f904fb181d754563322330511cb256913c61 SHA512 a19d34362ea59bd717dda16bec8b94048c6deea467b5bda04ef6ba5b3530637ceb95ece8ab918d2561ae444024de0516563400ed94d79b04b48b94240747aebf WHIRLPOOL d7232c6723b636d8e8d8725a6147b71c805fee1a66095f7c1fef5bc19f57fa4de99e950104db10fecfd40305787bd0699bccd34a6bd80a92dec1f0d5bc9af698
 EBUILD netbeans-ergonomics-9999_p20150924.ebuild 2913 SHA256 bfdcef4d4fa4557bc70f33486e379e005ba8b6ae7fdfdb8f717db52b6019ac93 SHA512 24e2d40c13545e895722839b1eeb109dcfa9cd2febf5f9db07a8328fad30d55bd068ff2a039b5c9e9e311b3889705d94f9cf64da7b89e1de809d743f682af38f WHIRLPOOL 52d46edcbd581a9ef9e372850270a3553e137d564e7f59933439e2f57e87a4336e4aeb3655cbbf4519ab3666b5ed6d4c061223b9ca81f6b33b6dccb0ee7eff74
+EBUILD netbeans-ergonomics-9999_p20150925.ebuild 2913 SHA256 d8a77a9dae947a38f83d532c97d51e4217553cbbd4651b79a6bea4090a696c52 SHA512 94b0136ef3c99095abae7cbf88dbe8572f97a0656e0870738baa26d2f90b8cb894062bcb913cb2ee7a5cb0666364c566ee67c6029c1c45440fcb29781e147e1d WHIRLPOOL c2e861874d370a8e3149d7f833c16c544f866b2c8bdd33f8dcc23cede14c27d29eb4d5e98ae71761f762e674be48d541cd4cccaaacbda7c9c705b03b8593b6b9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150925.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150925.ebuild
new file mode 100644
index 0000000..f79c06e
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150925.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 fc1bde7..7d23a13 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-9999_p20150901.ebuild 3377 SHA256 a459e45e713807b3565add526bbbca698d49b86ec31dfdb90dde5de79a98bf4f SHA512 7221a46804530530304a4cb1a36d58a82c19717e9d6a61c4e5c35a28ad3cb58d108fb11341a5ef9005557b1c7e891478e64f38aa12efffc652ddb684ba94c0d3 WHIRLPOOL 8b4d65a5d5c72f544ea83b43681136ba08678b20a71a15d336e9f8cf235331e01d6ba21bb7bf8147deb638d9e857006eb1ead0a0016e47c3c21262012c03e8ff
 EBUILD netbeans-extide-9999_p20150903.ebuild 3377 SHA256 e0a7a1f3704f2521ff54dbaa7eb9672a10bb8b866026d359c6fd4ae287937afa SHA512 c0f77e05c7a78608804126a10738d46e337f38b0124e30f50d14fedb24e984bca9a94bf31ee8ff6cc3931ca8b74527d521a27384dba09f555f7d59bafc366642 WHIRLPOOL 73fe4c7dc37d7b1ab2794cc55864dad1a5c1408a14c028df00c9f26c5049f08ccb5b8d2a88d3b0f2ad72d5fc927513692157e38b943db69fce602f6256638ab8
@@ -32,4 +33,5 @@ EBUILD netbeans-extide-9999_p20150921.ebuild 3377 SHA256 c1274a517f291f18e3df092
 EBUILD netbeans-extide-9999_p20150922.ebuild 3377 SHA256 f4bdce5273270bf10b49f2b0ee282b0f60fa85ce8e231eec8ceed01d98b756cd SHA512 aa45b17fb90fb10d6125bd449fc8e5c4ccd876feee12b7f27dc25944b65642af695ae29f590c048e07903a5c4ce4d3d8011b4782df9bc7303e4af8f424b2db91 WHIRLPOOL 06c899e7b1ff151a479aee8ca5ba7b68d7c579b17915b023fe94ec4f8124721aa3d282c8211fe912dd5cc95225b6cb4e176c652b33dbee0f2cfac5dc29dddf26
 EBUILD netbeans-extide-9999_p20150923.ebuild 3377 SHA256 2cd816b16087a53f17f73a38fcdc5f98401c447548e5b828d32a94e5563dae67 SHA512 969db7beab82ad2339e2247a60f0e5b16ed9321d96f16ed47c5a57b00d88a31bd82d75ffb15ecc43822cf31fcd8df1ad9591b8fcf8c9541a78949919d3aaefbb WHIRLPOOL 9486b4eeb498d1b20e254702438e35f2eecce40578babb048ad43d5da6ed3faed789d1d02ebcb34a684115d422550164f78f6e55b23ff19082f03fb1d612e80c
 EBUILD netbeans-extide-9999_p20150924.ebuild 3377 SHA256 1188da08cbc5da731416edb34dbe840c0db15bb503491e85729aa4115223c0a1 SHA512 802ec93bb631ac19b5c5812709939e8017d73f32bfd85d681abf365e90a5400e95007e07b01588e130a26b4277338b23403d40786ef268bfc00c8ad20c5ac845 WHIRLPOOL ac4b2a2e2aeb1534ab6398f79f72ce5af9511623d06c592bba06753ce9ac435492c4d08508382140f39fb084c49c5cee4aedffb59c3f30b50c248f57f66d63dc
+EBUILD netbeans-extide-9999_p20150925.ebuild 3377 SHA256 8df930f5181319c8ab5191b750e96c82397258d61c61ee3822184aac6827770d SHA512 9f65400999b48ae34931d9b5cb9b0e4cd24d76860038603eae415098a5d87ebd86283a2c907d32a7c7fbdfb089d31abfb405811ae7673fc08e0e726a0ed29c81 WHIRLPOOL a9362bd03e7f2e2a2883c46e1d63b660fb0a252c4545acb57036e5083d4c5ce8c3ee072e3bf01d0ff80d168e9b150b44551104a816ede1890353a608b06135c4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150925.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150925.ebuild
new file mode 100644
index 0000000..eab270a
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150925.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 ee0437f..8c15d32 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-9999_p20150901.ebuild 3416 SHA256 bd899df99a2dfaf3081354ae331ad0494b5f2cdda81dc9039cef398ff8fcb10d SHA512 5753e9033ecb74072aae302ac814e5e8f3c264b159f4d82f7d41467f552b8089ad4a02141a277f154d8f48145a925b4214898e188d69f38d50dbb28af5b45b60 WHIRLPOOL ff875fab2e82d6fe6dcbabcccf334ff8056939ea7502773191ba622ecf597acbb49ac0a685ddca883bee01a890c220d9d531b6daa01189dc9b4a58cf41144c80
 EBUILD netbeans-groovy-9999_p20150903.ebuild 3416 SHA256 52900724587824fe2970ef01a4f6e2478d2b43f8068473edce228ae26f295f11 SHA512 15387a879c00dc1262cfe45c5d4d4bed353a15606531a1942a4921eaa7e947d89624bf81ed25a75bc9d76c1f8d7d729478e31f5dff416f08ba5c81280d1b88ab WHIRLPOOL fe65f7e8120c3586e0e35c49008c85296237f69eeac8f6f383a0bf47c86407e66c6f17c3ff01dbdb921ecd9bb4c71e57e106a1f779b276239b9fa3ccefa8d2ab
@@ -31,4 +32,5 @@ EBUILD netbeans-groovy-9999_p20150921.ebuild 3416 SHA256 46625cba6cb06d3c9b4d967
 EBUILD netbeans-groovy-9999_p20150922.ebuild 3416 SHA256 af55ad2b5a13535b46b1fa3da318e2d8b048ee879180359ca5bbf99d764e022f SHA512 6ab0b0484a825859b5e41a83e68b0206000ba713398d63f29a94a2d763b655a837e68968906e4d1280b5e61f63d0a567d8bfd406a74ec15f86eb983dbc2153d8 WHIRLPOOL 2ad823685f4d3ccf9cc3c6893723eb7ff3623e0ae9720a0c6594eec6635e4e416d855d66d53c02692e777c4640e34ff32fd8a21552879b4df05f548c84ec8fbd
 EBUILD netbeans-groovy-9999_p20150923.ebuild 3416 SHA256 78238d84d239a2d978d848f36b5f083e2929b37c7ce269827dc6fd63a37753b2 SHA512 af7bdba5bdbf0929367349c5e90cc2662254d8e0b72d43f3696ebe734786807f7819933a0cbb8a8a67d49a469ab8d94cb041d1d681cc7555886c1a5aeb07dd1e WHIRLPOOL 6139fbb2749be1692c685a8ce9fbe55aab402be1fd0f1b8c4d95f375dcc8cf3187af6a58ba153adc428701eae0266890c85d1c462e5771c2340bbea83d2b255b
 EBUILD netbeans-groovy-9999_p20150924.ebuild 3416 SHA256 508d788fe407dde8973b878f196f2bdfcee583a58974ca1370503a2852e68e61 SHA512 b4ba688dcfcb8ce4823af0495766e3e9443484980f326506e61569d316e04d1460ad399ed0393a6746a2f61be1dacee715b256b5d08d66b5e100154f399c04c8 WHIRLPOOL 5569f4c616b16dfd841fc7ec2aea798b67d18d4b511ce0031ecdb571760c5d631c4c65c7d26313eebd798e200219918eeea27c76b22f74ea6c2284064e57cf91
+EBUILD netbeans-groovy-9999_p20150925.ebuild 3416 SHA256 2bb58f38747a3a37402f5586c5a6f04cc95df0eaeb57701767a91c1fb51a2b69 SHA512 3c6bf667321908beeda115f69790b4e869e90ea7a34748df82f261de8184f897890ee3042242efbadc3606d75272c59684d95de5f2e0149a04ac4aadd1d914a1 WHIRLPOOL 807d0f95e4dda163d4fb6ba984fb40192c70be8130f208274c23f56fa6dc8c290f45836a0a7ffd2fb1878929db717343f24df00e083827eacb0913386cfc9a16
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150925.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150925.ebuild
new file mode 100644
index 0000000..27b24dd
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150925.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 dcb9ac8..36ffd23 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-9999_p20150901.ebuild 4125 SHA256 c9189bd6d9b770dcc22627aedb7041e6dd80a0464b4b3649a6cebf1352fd7dea SHA512 154f820f3b07192e4d8b35fd473cdedd3dcee70d81f8484e95a33846fd6c3e8474acbad1ee99ca2ee29574da125521ca695bed8a471e5fd10ab7724ef9d8f7d4 WHIRLPOOL 8b4a9ff80f36f06108df4508abd091b99e5ed96c6b297c1efe5b18b3f798890f6f23313c02d543d89fcde5169631bf3cdca15cc54a086747f8f52eda303d8f09
 EBUILD netbeans-harness-9999_p20150903.ebuild 4125 SHA256 68de6c9e0f914b0db958bcb0a48f9e74170cef31e65dcea5e8996f8796df32d1 SHA512 93a557e04df4f9fc4bc068b087e3b91d5fb409c30e8c16b625f2973b28e3f5f36474fa7d36ca9fc72c154bb2a2bd84b696a95241cd02ec14cf7ae4800291d545 WHIRLPOOL 4bbdb9c03f2b21ce25eba8f4ac8abe8144c4f315dc2a608d2ec4cb3a6adcd7020f4bae313924024eaba580e245d1e8e3e3cd19f3d1e6f90db4c6ca6f7c90ad3c
@@ -35,4 +36,5 @@ EBUILD netbeans-harness-9999_p20150921.ebuild 4125 SHA256 b6344471d30667a09318bd
 EBUILD netbeans-harness-9999_p20150922.ebuild 4125 SHA256 fb7a88d8116d3df5c70fe05074cfceb96827e219b1d714fc68caecbc4df67149 SHA512 4283a5ba623c659f96af03817d3487bfcd40e7d5313b6a56e1afd2a4509fa40a94be8d94bd8f353767acb0f432639473ec6c64236c9515524be1a016cb948658 WHIRLPOOL 082ea4ef322471467b6b989df00ea9491636ce6713f083d70023a7b8cd4f14dd5934b69852af1d787b3ad01490316016c3dc5c50040c1db9ff5f7683900f1090
 EBUILD netbeans-harness-9999_p20150923.ebuild 4125 SHA256 8938d3a67b01fe0d178a210c3e3b402a75d68aba430764933912d1849dbd3994 SHA512 a182972c9a1ce9c7a0b130000bc6b63934a3e5c34529c98730f9211dd0adb1280bb92eaa81f5b003a7e2efb72f6c624fa763907c15f7ef6d915db7b9dbd6944f WHIRLPOOL 7c60493eda014812b4636239f56e3e22496ba9b8ac56ba8c0104bfaccffb0ac0287913835a2cb881fbe633898ca2063689690cdf3c5362f749cac26a54d88d98
 EBUILD netbeans-harness-9999_p20150924.ebuild 4125 SHA256 ea1aa6d115ace52b0e6b2259453bcbbd1350540d210998d9d85a7ced00df77f9 SHA512 90757ba75b0def880e7cc247b625a5bc7c44eee6197f36d0536f39f5d623870a5a721ba78a4002a4103db96b27aac4c95951f63d73b2aa81062132d17883acdf WHIRLPOOL e998bf731f839b0e4f19c2f3da575babab8b75de2a9cfff42faf7b610391ae535c6e171ed52d7c2da6e13eb1295f7382aae82f4f938a1b79da1605e4b7265446
+EBUILD netbeans-harness-9999_p20150925.ebuild 4125 SHA256 ec043c193907209f28dea43a159c3da3e2d01bd511058d78f7e9111b04bf84cc SHA512 8f645244bfa6ce883e55fb8110150924ac98059a8015eee55557f96a3f7324a89cf443fd34e1e8e8d204dc691d2a33906e45116316e269f14871289bfc4400ac WHIRLPOOL ca02f532d539da47fe19b5752530c48dec2c4d90bffd3bcf31e1bebb84a9a9183353df6f01246f0867209273d72429417f1d32918289d75d0f064ac7a9bad56c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150925.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150925.ebuild
new file mode 100644
index 0000000..94a961f
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150925.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 27365f1..13dcdb6 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -121,6 +121,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-9999_p20150901.ebuild 30334 SHA256 a2430eba1da126a548c390a52701aa5a9ff7f3c5afcf591492704f6270f49ee2 SHA512 ee3b7c4d773f16ae78341f8393397d6090055d11b2b45a579afc23e020cda5bf0f86b1348d47b99fe94280885db4869b3f54a15e5f70aafb62c2ead0e63bc9f6 WHIRLPOOL dae179c3bed6fdbfa5527a31d3b15a9e8f1eb7a805ce872b9fa512be27b1ee4e3393a0713bec6e461fdaf7d09c04857c68cca5b497f772559491a4f32f2ef4cc
 EBUILD netbeans-ide-9999_p20150903.ebuild 30334 SHA256 ae41f1ecbbaf9cfc10fa655a7ac439d418a40d7cd2ae2cf8e40009035c839f22 SHA512 c8d03b4c44ed1855b06f861347078aadbbaed51e42eced7f35f02c438440a269b055042aa44666ebd2c0d1fb16c626f07a70c751025bce97735393e4faf9c387 WHIRLPOOL 45c00d9dcc84161a15412652088d25e5f220b7d499da453ef2f482960c7e51cef8d6ac3e6b343e9a9b5b78f6cc8f68ba7aaab15c557c2734c0335bf27e48a531
@@ -136,4 +137,5 @@ EBUILD netbeans-ide-9999_p20150921.ebuild 30334 SHA256 7d7a5ab3eda6f6bf7a1a44cd0
 EBUILD netbeans-ide-9999_p20150922.ebuild 30334 SHA256 3612fb5cb93cccd7abfc41d62c6f084513851220a3e4496c3d4d33718e8200b2 SHA512 2dd6bbc851d27924b430ab7a7dea9a8b70840dc686d390931ab3803540e02cee15d1a02d8a55932bb22587d9a5949f8acbebc1570012128e3d3f2c9299b4ed58 WHIRLPOOL 3e5bc5b16558663bb4dc88f22f0cf01d63e98687393fe35bdb3d725ad69b185a2ea769a254a9a22ce880bdd77fc65b64f0122340aff2c7b911cc30888ae78ee1
 EBUILD netbeans-ide-9999_p20150923.ebuild 30334 SHA256 fc39a83681e844b1389dc24303683d541051f26d932b973da5014eecf465a977 SHA512 ebe494e3cc3767b5da64268f85d951f73474ff64718bd91b4a7b0bb13c602d33d46443ff0daffec604825b23462a4125730255708865a7fad133a38e01ef193c WHIRLPOOL 02b8819c413af8ec6ffa91bb4687426ece58a38ffe030c1c0a89fd1fa1e12e9121fc7634a6a819c37ce16e14ee48f5bf90cad86e239862fe94dc6814628a752e
 EBUILD netbeans-ide-9999_p20150924.ebuild 30334 SHA256 2b2f51c1c488b85fdf07e9b5a87b1aad9e381a3108f13bb2edeebf3771cabd8c SHA512 a01171ec42cec19a908285e5667637e3d58aa39178ea4791187d1d428522ee4120bf87903413100d0e29354bce4d65d57a255bcf4f48d856471aa252f5203f8e WHIRLPOOL 912421afa52a7aa9baf82fce3f068855fbfd642ba5ed8c95346842060dba6d9e5e2a613b3db119bd61f2c36b5a56c28376dac117596b9e960f9e2c02c19b7d52
+EBUILD netbeans-ide-9999_p20150925.ebuild 30334 SHA256 f00c2a190c4e0d8891a5201e4ec4de8ef89640db272c6c69856ba031ae5ecf95 SHA512 af182e1926a28f11fc6478f6238bbf7c908800984086121ea830e0558efbd063e331a80a1a6936da2bb352944850691fe48c9b5977883f95b7b1335cbaae6547 WHIRLPOOL baa696f2a5643110fdfac99245cb5ac62f2e31e130dda561abf82df7f05d253df131ba4663b1c4c9c20c99cf2da31405141b5f77d281c5195eafcccee2e3bbc6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150925.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150925.ebuild
new file mode 100644
index 0000000..3de76cd
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150925.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 c9f43ae..4c6bd47 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-9999_p20150901.ebuild 14818 SHA256 2e650037a388a620e743e8212f0099878e8908fe4dc1680b36f6ae8e9a72fa54 SHA512 b7d8475055812c78ee45ceec123fc103641b4070972f0f7e3572a0b07efee2ca2cbcd16600fcfc7f30dff461fc235ccbbc1fde941f528e27f4a2f742f3ee5cdd WHIRLPOOL bb23d595159c481696ba4fefba3e398797db9cea44e4c2f00eef7929fbe1f442362c470163bc460d349da5cb18f627a3892c6d63b17439112becf538352785e2
 EBUILD netbeans-java-9999_p20150903.ebuild 14818 SHA256 f34ba8d98927651ec621ec445d4760fc596073f6857194bfceb5688b2910089b SHA512 ce7c86a52990ec26660a9eee1bc7588a2e069e80e42eb5b521699a9784e1da41411d5e9965c4f77bd4771b7046e9bd99e6563511336744404dd716e54c11faae WHIRLPOOL 5477f4bda878bfa48ba3851b740e5d9f06f594fa953f5ea0fab0a37917c7462b7356f96aaeca5847e85623c37e4bb46df81217451aace87cbcde7c50c38146a6
@@ -59,4 +60,5 @@ EBUILD netbeans-java-9999_p20150921.ebuild 14818 SHA256 d01b46e6f80a9bf20616d1ef
 EBUILD netbeans-java-9999_p20150922.ebuild 14818 SHA256 348a24121519445a2d1bb1f027a657a20953d0a74391b82617b6207531174506 SHA512 cf10d10f7034b975d9effc01e3f64cc45a4b4fb72fae011ce195edaac5e1ec7ee47d4944f907d2c3c892c80a67675bb1c49f001af9c35657ef71ae9add0d9dd8 WHIRLPOOL 022fcdec29f71edd292de0e24b081c52b1296fff9debdecb5d4110a31f99db502f8f5dc7fa149897ece85598893c6395f9577e7b5665e65d3f7e129d521b9c76
 EBUILD netbeans-java-9999_p20150923.ebuild 14818 SHA256 9f4b5b668c10447c1578a2394fbac79395df5a28339b257587969ca318a24c74 SHA512 2d46647f4fcc44392f78d0890004e73c51ba6551a13f48cfd14a3dc7d83ded7e680503e412d710c25d43cd4ed714cb5f2c6c15b34f621e3b77f14f90574d6422 WHIRLPOOL 5752022bbef17168a91d47aa73e3a7ff637e09b85b416ff5cf0f81fa5116b09bb3562ceca505be888ace6e845114f6b8790a7dec19f6582b5c8a87cd461c7d71
 EBUILD netbeans-java-9999_p20150924.ebuild 14818 SHA256 cfcdfc64c907fe1a594e997f01b75e3c1c61b8c0b872597c3072169d7f21c5d4 SHA512 def4870e3e70555552f2fe6a65892c7a4a6da37c6bda3197a7af7e89aee39521b064b1aedd1e0060cf7bfd68eabec3f8df52d0fbd0082c6109e9066f2cec2e7f WHIRLPOOL 3202638e60fc8944af0fa213e10347c45022a0115a8a3927946c31ee9425cb8a5a47def8c1a5fb369c4683bb6bd7121829a1e452dd1c1bc96f15072763732318
+EBUILD netbeans-java-9999_p20150925.ebuild 14818 SHA256 8009633b2894840b5c4405358400690e05d1bfa8ebdb5729dfc8d9b1bdddbc21 SHA512 99ff05cd7d9a28dad280bd45243754ebea442fcfe60a1091aeb31be6e4cbcee34d8c6218995032e631bd12858b04098e4c8671329b8b35ee9ef54521e84836ce WHIRLPOOL 1e817112d9a171419afa1569149c8406a90c75ad261c7f3364469e2cdab72f969d4530c52102ab10d43116566453cce59afcec2da3c0246ba3cbf170967ddd8a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 7856ddf..7dfe863 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-9999_p20150901.ebuild 4976 SHA256 f8bbd7f2419ccc07c17b05c295359dc07c55f3cfca78d7760105b82903fa2b79 SHA512 53bb2b9edbe87daecc4feb6b063579517ccea53b52168fc4a6ed03d8351d3f254a819125937aec58f551aa926b4b5a567b5bde3850fc390fad437f45194add80 WHIRLPOOL 9403f1dc9c3042fb5981d340b02d3615db9aefde73f1b2ade96b9010bdd6a37f610387aa303625ae0c979f20ccffd57ca87115321bd42ff9b6dcb39bcff03580
 EBUILD netbeans-javacard-9999_p20150903.ebuild 4976 SHA256 20835b1551b3382cd7a6b3f97fcf7725597e77317e8a5ede489954f99f0eb4e4 SHA512 93dc8f950ec2d8d8ad83eba39699436121729915ceca17ab3a4593ea2ec0a9cbeb81263f52cde443fb2ebe43658620c438664cd112b30774290a8cc03f2dfdb6 WHIRLPOOL 69670cab1e9e12e074a2874ade1cec66b08313763f7380b1839395becdab4bbd617172987d0ddb021dfa29241654119fa2d6d61cb34d507584c3c8e7670f6b83
@@ -33,4 +34,5 @@ EBUILD netbeans-javacard-9999_p20150921.ebuild 4976 SHA256 8aa2f20f0c4494989e098
 EBUILD netbeans-javacard-9999_p20150922.ebuild 4976 SHA256 919d62a90ad04af5c1873db61de3462d304bdf8cce68e5670e1dabdba5613ee0 SHA512 ef3cd38dc2e2164113f254705ec2dd3a1a1510c209176942b1919d11c4e4eff0b2e10b4909ee33542d3cf1b06151745c22bb1e9343566caaddfbaeceb664d015 WHIRLPOOL b40d9b399f5d472b24ae0cd9be20c7acc44b485ac1dfe5f1f867e9a93b08b43b81a76732f34c9e8089208da2539d9fe7a12f6057e5f35124a36f4a9c52057b18
 EBUILD netbeans-javacard-9999_p20150923.ebuild 4976 SHA256 58e94384eeb962687d8297668b691f465d65a5cdc1258b71f973004a83c35166 SHA512 a2938fe2d436ba51863145f67e7616b1e94525bc6e7e7db26e2134ba96903ba00d1201906c01993951e1906e99e83343ee5478b5f61ded7d6fe33fede694c8b7 WHIRLPOOL 319ee683fd8100a1b1df94241c6738ec27b63c708359b930b6930c35584fad04c1e75ec6e58704a50fdabd83f967b28f73177c20a57902e0aabe4b626bed803b
 EBUILD netbeans-javacard-9999_p20150924.ebuild 4976 SHA256 db09ee755db06f77e212e5b21e50205922eed49e8ac5f594b3996ab73282c343 SHA512 ba6bb3c2be5c3a9f866a58487dbd73e31e7b4f56a8440c812b5f66161ca79d6caaa31859e8b034e94271494581c8ec7c0a2a071a4f5ccec2e459befbee8d3b99 WHIRLPOOL 589440d8c08895334fbdd3c06239b14ccfa640e6660b7c147376cdb16a8a5d2f59d9dcb0b7afeffcb88f7c96d2a492cfd6c4fdfb4b82e367d7d01556517b876a
+EBUILD netbeans-javacard-9999_p20150925.ebuild 4976 SHA256 e8bdd18777ea9dbaf9127a86f5b1446959e4843e8811d8bce83915e2772e3fd6 SHA512 273de50e8d0a3b78c8a20785373c39e51b0edb7f584a3b793e221cd3f7e4330d9a9f528d5929c0dccf2eae177d7c166f76e8e49a448799adab05fc2659584555 WHIRLPOOL 1a8582d3d574290ed2d85024d8ace16593e4fc18b1ffd76e63b5352accd77e312bcb3d982cafada9339e9b1d91b9fabb1b51c707c5c263263b439bf0da8286ab
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150925.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150925.ebuild
new file mode 100644
index 0000000..50f205b
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150925.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 e1fdd5d..2331a1e 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-9999_p20150901.ebuild 6228 SHA256 70adb18643384a52dbe2b88467c14663a755609b1a5098cf816c5c0b88994e9e SHA512 529fa63d125fe04aa06c4f444924b0e1390680092ff4a474810b6ede97925cdf907b14283016f9000f54bc9cc1a1d0e89835ca681940152a029eee0f370c2fba WHIRLPOOL e117f345fd2dde9298afd3f8b2f7ac1a699936336a68dee80c50cc33193aba40b069ed8867a1af84efe3a4621fea35daf8b0835bf89f7ca7f35278b60ddaa56a
 EBUILD netbeans-javadoc-9999_p20150903.ebuild 6228 SHA256 9f0dd0e792cbe63c9dad51f0b445a2245ac2931123c3de1fc8079631e3dd4b77 SHA512 76e8762c17b07fdbe1ab65cef9b6b6c0e26355deb5f1827b7d864cf582d1aeecac57c579d439a49f19cbadd6db7f92e626e0c97ef5ddf0b1b883cfdd6282ee6b WHIRLPOOL 0efef7d57f10a275fda7f97c209ae41fc61f8f9961de19325e34c117378d97e7d1b362ffab93e1ac71ce38b13881823937fb8ef10fb014c84e1cd61ae42b3d2c
@@ -31,4 +32,5 @@ EBUILD netbeans-javadoc-9999_p20150921.ebuild 6228 SHA256 8c485fbb948472e0b378f1
 EBUILD netbeans-javadoc-9999_p20150922.ebuild 6228 SHA256 b2f814969114a6591a12ae4d801646221c16f5a8df119e28204c0b32fdd1402d SHA512 808c39d20b9444df1d1481c6f8cba493e9a1bdb852cc9f2c89a5db9688dc8ab9d65cea47f69ebc5cfff4ee0504e695204c44f502369997c95c0dfbcba1392b80 WHIRLPOOL 75ebd4875924aa1fc8fe251021f3c38f42a7ab3c8cd12edca44bba6c2b598878a33ec2556df2958c67e9d495666230039ca817b31e64f981eedbc90ba2738cb5
 EBUILD netbeans-javadoc-9999_p20150923.ebuild 6228 SHA256 e1b83b70a1a34c40ae982904c186d7803ad521e38d57199824a251c89bc52377 SHA512 fec664c8a59140def6d74fd00670750a56aa280fbf30a4d1cef5b58c4dd54b6ea186abf8f1502b67ea79aa4adb63863e7bae0ca6a22760f9ce2c77ba3a8fa994 WHIRLPOOL 3a7a7c46697ef7c90421643ffdac232be9c20ecb215b47cad1038c11a4133faeec9f53ac2c9a9229dc7d2c6584fbef527cbab18ebe61d24192578d2530310199
 EBUILD netbeans-javadoc-9999_p20150924.ebuild 6228 SHA256 7a074717de8d444c14278fdcc0f0399c9531697f9da931fb72f54258a5c68d45 SHA512 70003d8d5b50d2a1b856fd022b88b277bed7c92b6166f87819111d71005a54c2cafe4fb586928d93566210c45aeda79f2964280f6addea8e56ab9eafb34018d4 WHIRLPOOL cd87caffea1334f9fad5b072e92f6682f74a960a018793d80b3e2a3e5f83704bb46d866032aab058924a71f363f24ce28f9d8d08a77804fa63ea2fcbdd6c92a6
+EBUILD netbeans-javadoc-9999_p20150925.ebuild 6228 SHA256 9da2acae57f47e7029ef3a37d2d853990aeb74404da75e5e33822560112f55fd SHA512 3de58070e7cd7debee8e2d4587df6fa72884ce591d1c414bfb3b4e9106c28f8bd1f36a45f3be5c7afe862eb92bd034b941a192679c60acb70d20071514fb6b39 WHIRLPOOL 7fcadfc16e3e41f74cd539e89a2b2add49b721ef2cee7cffd64c6c4307dc82f862af425779f7c3e148c0a3c624237680ec269ec54c5191b4b80aafc85971a457
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150925.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150925.ebuild
new file mode 100644
index 0000000..1a3c078
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150925.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 132871b..3e7143d 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-9999_p20150901.ebuild 4717 SHA256 e95804f3d997f20e45ff63e57182227513494d00f034115bfea0fb80f7b06f86 SHA512 20431b8026fbcca039f412ab076e9aeea22745f964858dee0cebb070c08113cdabe35edefdb998efd0d146b0a9d055de441b21620e1beadfeb9970009e479eab WHIRLPOOL 1352d5de66acd787070011681f7800e37f7bc9f9420b7e957a16c490b7b0419d88408c13ce930f2e2507ff8a84308a93ed50434ed80c9f26b21e28356b73a716
 EBUILD netbeans-javafx-9999_p20150903.ebuild 4717 SHA256 f8dcd19435adff0ba1a386857b8a0d2624ba16b64e36bfd40f58a2da8616be5f SHA512 776aa675ae3ee669bff503e9ac240e801dd080c34a18f46a53ee9308044152eb4dd067b0ce9b3d89708a56f533426c2010e06d63d2c7465bd3e461193a71c082 WHIRLPOOL 12f7d33492850172e803a4c2fac724d0b6e196bc7d64746fb51f1382cc1d82df5714511dadc1167e5921d6a492e47d5e879f8f5fdcd1bb2d2501e14e2425407c
@@ -37,4 +38,5 @@ EBUILD netbeans-javafx-9999_p20150921.ebuild 4717 SHA256 04a4c89006961cdfcce53d8
 EBUILD netbeans-javafx-9999_p20150922.ebuild 4717 SHA256 4332eef96845d8fb617c9b6a2618b171cf27adcb5cff978381acd1f4f3114693 SHA512 7d0cb89e9b253f2ebcd4fbe383b56f74ab5846f96afb915588de576c48f56e56b711e941f62d3ecfbc4834ba1a5c6d81f9a146a324dbe0b0f631c8abd18112b5 WHIRLPOOL 7176257781de66f1355bca97abfb279550728363f0bfb8b7052371f738f740d1ea1f0fcea35b848b74c241b73b07c4fb0e14e664e9db32ff380a641f12b09f41
 EBUILD netbeans-javafx-9999_p20150923.ebuild 4717 SHA256 97c803a2ac5d392bde1cccdf82103735286b3520637bff52bc82e8488434c7de SHA512 95c03e22d532e87813ff30a19f897f872a8ef24986165a1d78d80a35d4954130a8b7df2f410f1a0b428b30b45ac7acf7d0d1e448a637bf28a13dfd0703f0d187 WHIRLPOOL 6b28f811a9bcf3ed289c69314c66c7e921ec03026c9be82b32adf7891ceb46e6372f05ba6efbfec8bc5ddcad2635de0860d6cd0299fb3ba9d1f184686a6a0b8d
 EBUILD netbeans-javafx-9999_p20150924.ebuild 4717 SHA256 766cd1df0358aded64dbd39780e54040bc8b553ac7a2b65ec4ff63665843f494 SHA512 501e6f2cba6298409412bf7e7fc1b630e2c8f7eb97b634c17cb2a552209a23af08f847b1c71983b91b049fd83bdf773db985875107cc5b90c41252af285a0e3a WHIRLPOOL d83f6394b04ce893ab02e639ad3ed834c642517fc4cd3a825ed04898a2de75c6d30bc9f3d4b515075f95aa30f3486976210062676cac7319cde36c84360942e8
+EBUILD netbeans-javafx-9999_p20150925.ebuild 4717 SHA256 8c1627c4c59d97318b19668429b125071cf92509b9530ecfa3b9ce04ea292ea4 SHA512 36ca1292c6cd05f932a0eb40af6321769772c67ff35ba97d6dc9cc187d7caaef30aefcc21bfddd93a0b413cc911517b183ec75099e74d58c5988232cba1cdcba WHIRLPOOL 5aeb6008a854e15f824f0f3e87612c80beda26550f537494be310e7b940131bb339441410afc7b6e7d8dc9bbf8ba27b5c668304e6ead91d4f37b6c506ee71ea8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150925.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150925.ebuild
new file mode 100644
index 0000000..1458e60
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150925.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 659c1b0..6683e31 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-9999_p20150901.ebuild 4412 SHA256 24385dc623efa0f82a8ac6b377c867cc43863d1ef24a67cf0a55840d22d24fc8 SHA512 cef8f1359a5a8607376cf3db54b737a637a2efb7e08a3ec34ef911403c3cbe7c3f6201674522554875d96e8870a6a53b9fa54f9bb4d920575b7fd870d00f4448 WHIRLPOOL 7ab52bd93e70de0c6b3c184bce62b22086e81d736224ce66a157c40a052a57d9963030916f96fa54c5be7abfbec33536fe6be968696eff0461d1900366c0acb1
 EBUILD netbeans-mobility-9999_p20150903.ebuild 4412 SHA256 7ba27bee1e24a5cae28b92bd03db76751ef9815e6b9ca1f48e93302e33753edd SHA512 90aa1332c367f89d6fd7cd562376baac469928b71d878f6974bd0435eac1238c49a8215a53286092331fe2b87dff24357928e4811b093bcef8307bbe90d6eb87 WHIRLPOOL cf8378b155e8661bc366ea56ae4078e2e5c0209f9eb1363202b3daa3a9ab531ad21ecee420ac96e62a6ecd006f4e80ef9da8095cce60e9a293c644923e432656
@@ -30,4 +31,5 @@ EBUILD netbeans-mobility-9999_p20150921.ebuild 4412 SHA256 b2494af028fe76158e516
 EBUILD netbeans-mobility-9999_p20150922.ebuild 4412 SHA256 2551a6ed15599bcdf7c2695454d8d295b409bb69dd333eac283fc7f3d839020e SHA512 316e9df62ee9d241f8b5754e108940b9a1bd6775d6e1230c5c258369411f6058eb002bece7245ff74ce6e7b5fee1b9ec4e24c4b50ab0d33f54b5793dc5da3843 WHIRLPOOL cdb0e2fca264e732c7a61359d886fc946fab2e11adaa5402c978a6229f030fc31fc782e76c6869a6463f72f7d684d252189d33298c220790caeec94a348496bb
 EBUILD netbeans-mobility-9999_p20150923.ebuild 4412 SHA256 f2686ed1e225c66b150d43bc4d603807c755ce526753e0203e622535e0712366 SHA512 12da96cdef98cae1d4d415621da26b125546ee6f95c97da1155dc3b9a6fba5a52ebc173f72abc625cb728761039fb0d5096eb8637d0c25545a131c1fa6745c09 WHIRLPOOL 7108f3a151528046fc3f93d89232a6721547f743fd3e2f1c1a19fafb74e55fe5a2aae2ac0559389159e80c8ad60a9ebb3878d7e8240adbeda3a5b24de3c92562
 EBUILD netbeans-mobility-9999_p20150924.ebuild 4412 SHA256 527eefabc406e61cf74da15e51f972a9dcbe219ddd459e98f460a5d6da824263 SHA512 f194ac194e6e13a794902af269b49cc135e3770d61f12d00c32b44909c8c2fdce0945be87e7572a5b96ccee93b5ec582d3081902e57c7221e091a068954d7b45 WHIRLPOOL b64c7c60ce2c40528228a57c43afafa782424e3fc1f27eaa8b81dcec9718c9f22aa20f2090eb331e1bcc21709b5fcade37167986a71138a26cb6733d305e6331
+EBUILD netbeans-mobility-9999_p20150925.ebuild 4412 SHA256 e443173e1940e1f0fc4c4ae5ae6180c2bc861e454d3a2a3cda2c1f62a44069d3 SHA512 7ecd9c061b21c51254804c083b85a03bcb549a301e4eb7529f25f764248743f0a573e1ee4a0f8b6722e3139e7ef3fef15ddb179342d3007aa80feb7605a8e995 WHIRLPOOL 8979eeffdee61861b05abc470b4c4a4feb4ca09b1730ccecacd3e761ecf4ce27d165aedcca1ee7a7b5a7ed2ec883010032a7dda5a8cf1b97fa46d6c1231d7ba3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150925.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150925.ebuild
new file mode 100644
index 0000000..1501088
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150925.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 9248f18..fc218fe 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-9999_p20150901.ebuild 4997 SHA256 4bc20abbd79e622dae684777ea3942b19cdb96e94d76cae254b9bae919055997 SHA512 9eac2a9adbcb86bde4662b9edbb874ba820db2e622a0f4e436a570081cb49e664958e3e8fe6900dbfcfd44a0e1b33047fc25a536e93781b8e9b303ae9738bc83 WHIRLPOOL b83b659bbbd93f830039465b737c190e5031e88a634523f3e2647715e4a5b953d3469ac1c760db9613f3d6987157d89b14f0e740da228c0436950fd339d53ab9
 EBUILD netbeans-nb-9999_p20150903.ebuild 4997 SHA256 f2cbf0e344be20488551d7ad04e8c1f2452c03bc7f6f1e3db68527924c3a9b4f SHA512 f7eb44514e61a0e30d546d43caf3e2239da9faa0e59d6c224df6a102fd194589079833b980fcc719982faa9a35c2fb60dec1cf77f327926955e984e633fafba1 WHIRLPOOL 4995f7d9e24ca16d1d7d5a863692fa221b252f2185beac1c6ca908b3ea731a94f7f150affd8cfd03d16f2f7eb620be60833286d37a8d4b71a1e6b8eadbb32f50
@@ -33,4 +34,5 @@ EBUILD netbeans-nb-9999_p20150921.ebuild 4997 SHA256 1f043dc5a992481af16aa037ad8
 EBUILD netbeans-nb-9999_p20150922.ebuild 4997 SHA256 1918053dc784853fff25277eb31ff0f2817b1eb9500936c4d84a4913a7055f0d SHA512 5ac6e50c44451e2d8e4d4a4c82dc7848ba5f6d49464fc59ba02bfd4cbbaef97937171a403431d92a9c7b128116bd54dee2f8aa6511bd54a472fcacf773000d97 WHIRLPOOL e208a1ef88d1b2a5a22c9c5401224e3278929105d8f6e4c3337fdca78ef3699f500bd389f67fc2e9523cd69ee6491e17f5302b00c84e97b812c3a5219d2d3f8a
 EBUILD netbeans-nb-9999_p20150923.ebuild 4997 SHA256 89297e7ab1c0d435234914e970ded51bb657467fc2121dcdff30752f4d0929fb SHA512 1876453edbd79bb756265a63fd2db043e9ee6f031cd888e9bce7679e8440209b8c64433a635a1f59eb390b9c545678b662659657f81e8eb8b38532aa83ae800f WHIRLPOOL 799a8692f600f2918fa980e3bb6969641644c6177062a37c9ba9ce7222d2f7ef35ec07128480158f6ea9e224b2bb3741de7f7b3e98ca0941bcbad1d60afaef08
 EBUILD netbeans-nb-9999_p20150924.ebuild 4997 SHA256 7f9f40d6d726ec69db027e2c4fa47919974f4ad302f977025628ed45841a41ec SHA512 bbb4a9ad3b0d066a4f520739742ce4f078a37dcfe98141235c317d5bc983a6cf3c56e1c53ffc4b74f992f5bdd681f395b0df30069c6fba627a1931a55d2694ac WHIRLPOOL 5c7558ac4ef69047f51ac3a51d6433ab2b6f3412475391cdf0c6af9103758aa16b802b4d8d91e6a5ea47641850f3257662ec9971818eacdff093067a3f4afd8c
+EBUILD netbeans-nb-9999_p20150925.ebuild 4997 SHA256 dff8097023e878707cd6204eee0dec09cd963a04df2768e6d3c0cf9b889331fa SHA512 3be846befd1ca0775eccf9c919dea7b0154e9f7cc246a8d1579697b00b5039f9cac27e1617437acf971c001b6e3d6325521301a94471d41dfecbee4d0b838aec WHIRLPOOL 4a819d4e19da883392043817f7a3b95c2430bf1f10cac39183e70b10c6039c668541953602c1d54d52645081ae129f0847ff214bb8d5fe49af2f8e9bc0723798
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150925.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150925.ebuild
new file mode 100644
index 0000000..a23e8af
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150925.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 ab14cd1..8d9a5ef 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-9999_p20150901.ebuild 4417 SHA256 b6f52a63053c7f6d74829800396e15d463a7316c2de194bb0e243385eb8cc95b SHA512 b783d245589b2f43d616f3e3af5ab8bb0d9c5097974c640f8d22996b8185eb921edb851c174bd02a17ef0d29c50f0db03c595b5f23bc717dd3b2c4944c7fbf73 WHIRLPOOL 00d18b2b7f6bff0fcf8852a6137df8eebaa99885091a6363628b7ae18dd9c4ec18e3dfb75f214092be4cde7fe7c1150889ee8c173751089af52e8710f67446b7
 EBUILD netbeans-php-9999_p20150903.ebuild 4417 SHA256 e7c715d04d186e6e62d408485f33ee6c94ec5a76969d95de552d10e590b94940 SHA512 44abb97abf1ae49840e20575bd05374f301870892bde53213df37d5a0b21bd6d9691bfc9f36120225d357572ba6df840cd4ef5f5f5492c24e5ef25f57f64624a WHIRLPOOL 35a1dcede6c295345409ac71f20c53c41b772a523d91d91bcd9b20369bc203e5f7f79e1ce7e2a72bb3cbb50ad693dfd8ad77a4ba22eea72000d70dfa593dfc00
@@ -35,4 +36,5 @@ EBUILD netbeans-php-9999_p20150921.ebuild 4417 SHA256 f88e76a85965db1c96ce34494c
 EBUILD netbeans-php-9999_p20150922.ebuild 4417 SHA256 f3c255b26a888be90282ac903aa30060fe14ba83b213be7d427ed51e218eabc9 SHA512 cfd06165d52cdb7fe5b0e6519bb68d647efb90d1aca408c90c2faf7c40bae72d4115c2f2b39eaf9880447dfe71a2821b2da9431c59671c6868bd226f3c3d6c8c WHIRLPOOL cca88c7c554bceff8cacd9a041524c88c1c1ec3a6948d519b968cdc758e7d6e59bdb11f62f8a04fbdeb366bc29c740f6b4ff22c9f6ea20d3fe87a3afcfaea9bd
 EBUILD netbeans-php-9999_p20150923.ebuild 4417 SHA256 255aaf9fbc47695e4c905d2582620548030a316b5438bc6a0d012a296fa95369 SHA512 7cd21c4b9e0ea84c040bf4f1f26dab4338de57f4d87b502af8c50212024ebd7e5e4d9e6f43fb25de57a1259fb93c313293e58e68a174c3b818111fa1b1cec2c9 WHIRLPOOL 035d00c33df35db7d04da6ddf7e43fcea167f460252a19c7920b9e74c4cfea48a9cb77b448f443a281f3482b8031dbf74ebe10987cad70d530c15322f28520a1
 EBUILD netbeans-php-9999_p20150924.ebuild 4417 SHA256 bb6880b20a6741929d144699be5630249c49028e45e643c95d40c9b5c3a66931 SHA512 d9b7e10821c977c6f83a73093eefc21b5e83409a51d331a1d28e87205c09072101f45d1aef76d4442e0d6192fffeb2ea1c9d0360419ab974fc7646fb49b51409 WHIRLPOOL b179a2b14b4a1f7d2cb20f6f5ec0e6fa9364c3d45b2bd1ff6a1516a2963467a089126de0cd4f87a99b7b9927da9ae6b769e97abe4a9b7e1df8ae5fd69802c73a
+EBUILD netbeans-php-9999_p20150925.ebuild 4417 SHA256 ffb384a595a952da0310361c0cf9c28a240df0ace754f7700d408cb179f9d610 SHA512 d345ca7f88afa4cd1d8398648eaa9bcbbc352be0b08a4924ef2e87eb6bbbf4c03fdb514efcc98b96059a06cb1bd23eab15ad3ba420eabaeaf3606057ca86030d WHIRLPOOL 58888a34eb736bb35a89470ff75aea47a64f0d2a657bdf158f2f296df7d9733aff9dfa486c2090f8fd44e89f4065a1be10cb573871121594111046c89d28ce06
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index c91c60a..277fce1 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-9999_p20150901.ebuild 9238 SHA256 85c58de49e8cf1c2202b5f892c9d9283587f255c58c4835f2169dce8b767967a SHA512 5d90e804870b94de49cf76db7e99bd2564f2fcd9984e9dc0b1f0ba02c5a66a2b97e0e59ad0b986d8ef055fb1184ab35998248379b76a456f576df5f87b90f81e WHIRLPOOL 4a74b24b3e8a975f1eff66d95406c629bf860b1956937a44f33eb2d92291d2dd95fb91dd8c34f730a35d6daafa9d16a67f2ed2a300c691d5dcacfd8f435b5185
 EBUILD netbeans-platform-9999_p20150903.ebuild 9334 SHA256 2e3f4bc8579db348c5b81fb1460caec924efd1c59ee4e980f0606673944d0efe SHA512 21e7cd36c60d7ac8d6ac919203d9d0fe800bf02c5d44d7f450f2005a6da86c1ec3ce50cc8a3577af144618964e0d2b9a9183f2957fdfbe087e2e5eefc4ff4186 WHIRLPOOL 1989aeedda0e97d37a5e99ec99899862d057fae52eafa789ef100c80f5ef30339a01f9155c9fb3be7fd3d91a693136eaad259b8706723a7fda51ee2949378eb2
@@ -70,4 +71,5 @@ EBUILD netbeans-platform-9999_p20150921.ebuild 9382 SHA256 5a627ea178bf559e7807c
 EBUILD netbeans-platform-9999_p20150922.ebuild 9382 SHA256 f4ddd0f1d57fd2ab26d92115c6cc15673c53a2026bc8445cd6da72c6603bf3f2 SHA512 bb0ac8d0a726225ee56a6c4184ab2dab19c01b16b457457e6d41ddb3b0a8b38a9d1f0fe204ec687c420b072f309ba6bcc87fb53c21f3fff9db0826a5a083d9c1 WHIRLPOOL 952070bff6996a2e187b3dabd82f7dc6eb38f2ea7773a3e87325df9c21a9e0915eca8df6991133500854ed34dedd31b67d683f1dede901345d29bc1bfae7d36c
 EBUILD netbeans-platform-9999_p20150923.ebuild 9382 SHA256 cd2aab694308e65759b20a44ef6f44ef36dc0960b6bedbabfe90a0e38c4f52b7 SHA512 0f4feb08c4c722ba9780bdec1a9fc691e11544c3319884e72a75fb46545e8d62bb3c7a71a7fbc383f87364fe4293c29f1a4170804da76bf0dadd3b0b5bc926dd WHIRLPOOL 6adb9b96ab938acd93809dc56f66aef0f06e897bf6a80c7fb279a040662b02dbec6645e8138db64da2c108f6dfc73641cdb4829364de5b7f312e6ca3116bacf6
 EBUILD netbeans-platform-9999_p20150924.ebuild 9382 SHA256 0e1f7b2689bcd2efeecd722d69be9bae5fbe38d1742774273009bea6220dcba4 SHA512 af40867251bde673a40fb40090920ce6022238b99a73dcd22184ec0e7409ad09de950ce07aa9b457a11a9dd4722231a071b561331028c73d7fecf9446e27d5b9 WHIRLPOOL fed2a31403ffb222b3efa39704a62f9be72867d57c9991619d585196dbbc03f99cef68814057f9d294bd4d557f3ddaaf35dcc35535ccf95ab7262ed8aed3cef0
+EBUILD netbeans-platform-9999_p20150925.ebuild 9382 SHA256 fd582358cbf972f4b8f45709cb9eb0023b265757a94eecc5b33b241cbf770335 SHA512 60b22bbae546c8fe32caf5bb32d553eaf1e520a472ae8b899e1774164733975f5564e7308c7bef2dc8419f7e67e5ce2d1a6c3ecc554fe77c8aa877bc246dc382 WHIRLPOOL 139a03a2fd6fe8bf3a0ccb38af42dc9ada0a44ccd4cfbf25ea0d15026a1e56342d21b8e795bd5c2ba6b1cbe56989d15f04293dcd7bc64b352c9ff39ef214b490
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index d5dafd1..369e6e7 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-9999_p20150901.ebuild 3472 SHA256 2463f091c9f090fd538ea9a18cb2fc00819c7e8d8b3780e0bbdff4a426fb361d SHA512 40e7d264ee795e18ea90278e8e1d792abbe6ad4c4339d76ffbf63dd1126b0c5bedcd259741dff47c624a415aa7e8c57c3d8ef192d74b69373b6bf3ec574d6691 WHIRLPOOL 1d33cc1f24c6b8e3dca00668fa152b5956490d4eabc60bcae55adcee1c45950c02c0ab19daadb7b3691fc0bc908be618f56af9119243770298307a398b181442
 EBUILD netbeans-profiler-9999_p20150903.ebuild 3472 SHA256 9c439061ab5f353d42cd066cc5793626222b9e9e9b40b4217427498e7036ac4b SHA512 0c0cf3b94565f9dbad4cca20fb9abc672655e8a032c4d53794d9db03cde7b400d41126d3eeca82304952f488d232f041675fea7ad417b4f2faa9c5e24bead22a WHIRLPOOL 97d96c8613ed98c787251b8a0d4a556ffb47cd477449044c9dd8b535c9b632650870b70ee6816604701884a83c19f869db0256cb7c1ff83c6af986a22d21a5fa
@@ -30,4 +31,5 @@ EBUILD netbeans-profiler-9999_p20150921.ebuild 3472 SHA256 a3b83a65bad45a4981dc0
 EBUILD netbeans-profiler-9999_p20150922.ebuild 3472 SHA256 54668d243147bd6336a0fa4d6e3ff8cae77f52badc3016fea8abab711ba22652 SHA512 1c3272053939b1efefb957764ccdd6deef74ab66ced39e7333e2c786ec744a00768eced0589a9616e22627c71a07be28d72d1e591199e3203aad7c9f323c285f WHIRLPOOL f0d70717ffdef782282e6daf1b884b08f2e1dd2098c907165eb159befc97935883067daa915070969601e3cf2592c0e2c14092f53d4e241ae4c6cf1c2720c42e
 EBUILD netbeans-profiler-9999_p20150923.ebuild 3472 SHA256 8abeb38b9a8940ef502b8cbffae3bc2d59a5ec36659a120a987dca62e2a29936 SHA512 15dd5d679b6e50f571e1ab69751603a2e8810a084625c64a4324e44b1d03fc60d3fc4d7fd7c036a1de54fff7bc078e509285ee20c87645b7ae4e496ac74678cb WHIRLPOOL d98d88e28a19f5b7e0271e9d477fbbd8f3d7d5c3ea83c8bae4827db00f5b896f1fabcb14b4793e40f8707845bbe12d26e3146e316c307d3d5f82b5b0e9fbb895
 EBUILD netbeans-profiler-9999_p20150924.ebuild 3472 SHA256 8cd244916c5b32f8f8ae7ae4e3e5669b2993726139810ad5ade728455d0ad2f7 SHA512 c80454f86e45c6b7829dedd0bde7999696ac35461829a3dbc88efcc8078d54ae0f481d2e94f8adc006116d47f99bd15ab13b3c1b38086241b633b4ee603fdc9b WHIRLPOOL 5f920428cb0665204ad5acfe46349ea740b9e7e52eb0c314432eb901d54cb73c40f47b8d88f47a0dc5df249c1570c533711ce5fea95e05597b885c0cb143e56a
+EBUILD netbeans-profiler-9999_p20150925.ebuild 3472 SHA256 fa9dccd6939559f3155e97a6db4acffa4542bfab9e05aab2b339c4ab2e2e743e SHA512 8b986d1e9cfda6b04495ee94665c0bac82bb2efd61ea2446db7904df779e7070535b8276cbfe183007e11e7333d8ee1ece841052b0eb6d4c77bf2691934f924f WHIRLPOOL de707c41f5e0450f9442fb5b64a09ed4a0fc360d89e2dcfc685923715ba06e80eeb0b8b5667143030ffbe920821e0101d704724ddfd6f5026f33664add50dda8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150925.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150925.ebuild
new file mode 100644
index 0000000..a3ec76e
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150925.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 bdbb6ef..fdc41b0 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-9999_p20150901.ebuild 4991 SHA256 6a58d046976202f9630b42e133fac192593354c8620dfca0bc5f6d5eefb41b63 SHA512 c7d0da7bf9bacf40c8afc1ee6543749b0f30969abd398bddc9109f18e29f93416496d0e31c837358412f1de192953972b3a4ed7f709789dd6abcff9f63b871c6 WHIRLPOOL eb9eefc3b2fa66241f1035309856f3b68c3373cd355d3d275b5dae7bef26d53a93628863b081e4cbde480371dd72a037ce275af31947069fce424c563866e267
 EBUILD netbeans-webcommon-9999_p20150903.ebuild 4991 SHA256 b12f68d20eb276d5787e83ba650885835308517e4de0553dc4bf16487ef5d974 SHA512 5f4fb009a589c9bc36a2908d16009b6d72f476e5fcbea52fd21385448a58335a033ad3e58a410173c0ac029e892db0d2ca2081ae8bd16bed98b62d121690d237 WHIRLPOOL 1deef8a500b05468cf6f3c2623cc38eec880bcaab1dae9ab51ff4424018465db71ed37c7146b289451558d54d858f4246ec3cfb80feecea0e1f42306c105b4a4
@@ -39,4 +40,5 @@ EBUILD netbeans-webcommon-9999_p20150921.ebuild 4991 SHA256 d766edf317efa0370027
 EBUILD netbeans-webcommon-9999_p20150922.ebuild 4991 SHA256 4a070041fa92d6b2799622243bed699ba9caccc0d48d50a4d3126885e9fba47d SHA512 0c0398b4cc14bba3820b49ba0bc9ebe9e3ef7cca4e5797019a24bbb0548793ab6565630a4c51e54fef296ebafae0e8ecc1afa6fe342f16af1293292f7f8183e6 WHIRLPOOL bf1d8ed3faa587b1dfccd2d50dd83e63be32af546d96d837e5ab6ca1ed6c3afa513527a4a1dccd9ec19c8f351c6e6cfefac9758832806e54b7a591707298cba2
 EBUILD netbeans-webcommon-9999_p20150923.ebuild 4991 SHA256 14ee598db88d74bf19ef1ea8f289fb22013c7cfb2c1e6821acd7bb3d27c820b0 SHA512 abb3c419ab471779d55fcb5903ba9140e1d140ea95324c8f16b27cac76d58e85050f743d072ab50d626039f18b626e965788af76ca6f1f13e17d7660738f1248 WHIRLPOOL f2c55428d77b2e88b3555625a8cf2f98b31f0818fc73a41b5b05d252bd88640cf2215f35012204b472104927ddcf56ab2886c43c89436f3d87cba328cca4a840
 EBUILD netbeans-webcommon-9999_p20150924.ebuild 4991 SHA256 38c67c9551280d6d8790566e51f76d134225d8599ac9759ed0858d655af738d1 SHA512 cff4c7e612c2056b3904492773ad6d0bebd565608fa62f4ae5befbc1612de7bb1f58176122055a00f771d9473a4c6fc78a8d87ad16891369fdd1855d34fb1f84 WHIRLPOOL f9c71301285e959a92905069412fc452cfe4f6c1cd8f599f34fe8bf99c6972b842d74eb98779ff2c35f6b9f612900d09c3f61b856e621062e30ae05d2b74addf
+EBUILD netbeans-webcommon-9999_p20150925.ebuild 4991 SHA256 898ffb39893f2b26f35726e6d112086431ff2c331cc737924e2c0aa93269652b SHA512 e48a70e0de0f4a62d8b03245fbab7be3516f949f38fec4124093689c9ce419415274daacbd0bd14b43ad8b5fbb9ce04b0896f8a3d44a293aa9279ba82814f771 WHIRLPOOL 925262c0ca50c99c370aa1f91270c545e4b6c318d28c315c07f634d19d93c466238061238da49f6669ca4f5a600ab177189ed77f2d5c1cc53d824422176f2529
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150925.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150925.ebuild
new file mode 100644
index 0000000..59fcf9e
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150925.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 b494b63..bc3fbde 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-9999_p20150901.ebuild 2721 SHA256 1b1853b108ea504ea98052027c51e2ab8e55853bc016e1b288f7d5fdfa937ba9 SHA512 f914e9d3d8060c6740ab305233379a6c5cda835a09d1ad9c2d5e4a37fe7154f560899b4dc4e375b4a1d8b724102b522eb02529d65ce562afb914cdabbeebceff WHIRLPOOL 2eb7a4627b93b6bb8bbc033a6e941a64452a5c6377e28b86abcaca6b6be76ddec7df0950e7ef5234f5e3d6addb3dd191cfa00f6fc18b4442a2d7c1e6b27fa19b
 EBUILD netbeans-websvccommon-9999_p20150903.ebuild 2721 SHA256 5b548eaf95bd714f2b32bdbf189f8a5967ebb9ff9f4472b7dec07165540a4bf2 SHA512 d4e19899b1df32711eb649b10bb66ee7daeb463ce87bf330f3405e02788e7acea6a8573aacd2f17c5e09c93762e627dfc88b1f331c40280761cd0bd1d2b0339c WHIRLPOOL e6914d11ecf33f57de66f4bba5f8689f0ffc0ff40df29ec98cc6a0b731cf7c73096124e67433205a3fafaf744cc8b9c0a0361c905be1823b0dbde7e85bd52a66
@@ -30,4 +31,5 @@ EBUILD netbeans-websvccommon-9999_p20150921.ebuild 2721 SHA256 5f7793224e714e9ad
 EBUILD netbeans-websvccommon-9999_p20150922.ebuild 2721 SHA256 fafd322e6c62164d0f526e55d2cb627d8fd7fe58ad23727a917a20c3183aed99 SHA512 8df2f3a7ba7d0b3c00a31bd8befc118396e3a73275a601561971e6b0c150eabff384ee2eeac6952d91c63afcc2e5dc01f2b85a63801216c41fbc41a188c4bfae WHIRLPOOL ebf842b2e6b08c67aec013c353d6fbc008d69457116669f8127657498ff573c7d20d4412544292e7e082f2a8b9dca3cbce555bb5b38ecf0a0db63b5e88b8f77f
 EBUILD netbeans-websvccommon-9999_p20150923.ebuild 2721 SHA256 c981186dff431a882db2c04281d3e3d4214af096bd17806d72312dc702715d53 SHA512 33762418c6d77658a0f9d05bcd42b4dc881aebad00bdd82bd3c1e18bb716453a2a7495b3f32a249d4ec81291a60ffbb0d9b9b8fcc482d99f29a68facfdae131a WHIRLPOOL ea4156cf4a268c00f80802b7e594e365dd529193b580c040fa3370a8f5c4aa95a1621c5b19313f25d1ec55277d3907dd11200824e854a81331a0d44d4d41a9d6
 EBUILD netbeans-websvccommon-9999_p20150924.ebuild 2721 SHA256 a4643b09c82200531133182469c7f8e181990abfe0f2763a377c67d879ce3cf5 SHA512 eb233c702a2dcda36d17c53413c4e1ba35035f8d012843371e02cd3bbd3ade6c08323034b4cf903fc67693b1d42e78f3b658efa9ccc346f49b6fec767aa922b1 WHIRLPOOL 08da3b2be3fbb7bed75adbed5f349aa4a420d0d0ab4bb7d420e2c8c6f67dd6212e66acfe189ea5540eabbed195a91236c06d5c1cd66bf85361ff88e15aa37028
+EBUILD netbeans-websvccommon-9999_p20150925.ebuild 2721 SHA256 fe270a017f4b6b3dd3d72a555285f3d29ace622e7ddc9bcb3d76fd1ca916da5e SHA512 8b5bbebc7927709576b96bc2e16bcdaa67eb8ecb7e701ce79f3a7acc6ee2f212b3214b7e428e65fbae8e145081a0f33640b1911546789ceb278aadd631167c16 WHIRLPOOL 20cc9c986c891fe69eb0a4462a95f8221256587166fb4a486b1eb9b1ebaffabf519063e1d712bfc2cdf92d5ea2e7c98252eec2f1177f391d4a72d053866d01e2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150925.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150925.ebuild
new file mode 100644
index 0000000..51776fe
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150925.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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 ee0f7e6..edf8800 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201509210002-src.zip 209210270 SHA256 1cc1693ef53d96
 DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f359c55488ef30bff4679a3925c81859679a4c77c3e21f13b5e74 SHA512 54d6ab19b92572d8ad59b3760fe95b6c642043b54a23c8b8400f38be4ddb1f2ff11b7e4e11188c00065c353a008fd7fd5f08b1bf706278fe023c16f41ff35c86 WHIRLPOOL ce279ae6094ee06cfa36d5be986bef731ffb17f93af8629fd22047005f5c52c14b5d85f19547742af7aab4e73a612d53831e3153160716cca46db25734f55223
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
+DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-9999_p20150901.ebuild 7210 SHA256 aa601ee01f6fb1485234688933becffe18ee2d30af5045951a2bffc2f24f849a SHA512 98f00da7d90c3425cd718c34d65aa46980a9c10f50dd34a01a1776d1a1488e92b9e657210f61e45724b6c9358a36a44a2fbf8ac5b7012012d163c6c91f7ec421 WHIRLPOOL 008820f5bbb9077bc739629262c1e24bbece9c55b50c270c76c3900424ea77e0dca4a33bdf32535b506d61dacd951f65d669485321837dd83234404ad9143594
 EBUILD netbeans-9999_p20150903.ebuild 7210 SHA256 73a22280e3cd8d717bb224ba8c243faa59493011739522863e3e93b83def156d SHA512 87214a421b60dbe51dd45b0124ba463585096fe7f7820fa48e0cbf7d55b3d3080645ecd9dbd4679d7968a9b90d1ed60b88bbc3e50109a00e3c2a7ea8192ef0b2 WHIRLPOOL b820124da7676168df3529566db7b2ca095972189a1ba848da238caae7a93947c0c664af310edc722146d2daaa9fdab9bbcc5b3477207664a5193c003f289c09
@@ -32,4 +33,5 @@ EBUILD netbeans-9999_p20150921.ebuild 7210 SHA256 6082e3fda2dc38e27ef162aeb32161
 EBUILD netbeans-9999_p20150922.ebuild 7210 SHA256 63dbe335824f0935897662c98b3b659c84ac03666238860d1f230b0b4aeced86 SHA512 26c6cd7cee9e61d3143be21510e14aaf858a8d9f2a9d63fe348a5a5e393f45c43ea8d7c90dd17c065ec671ebfd1afb37836c9ef445e1c1fa7b2b5b66dc75b72d WHIRLPOOL 0aa977abfae83cb975fb6ae31573ad5d86406f306040b0eaad587cbc3f4b22cb3bf0d90295a79dc98134b0870dd560ca04fe0b332980ab2855d5216045e55a11
 EBUILD netbeans-9999_p20150923.ebuild 7210 SHA256 bfce43c31ee2c757dd2e60427f24562f43f8ffc4aca2a26cf3d208a712f436fb SHA512 b492ad6dde414079f76c4780ed2b26e5fda004f6527c69ed85da42cc72d92754bfc6734c831f06ad9a2a512d2e355745e1f035eaee5067599d3db6af619b8849 WHIRLPOOL 1cc85824b97d53d7e69e4f11e67e8c6393003ab349739e9c4125163a77cd259e4b267d8d46f7da6d2aeba530e23c5de9776584959ae4606a12d1f9b45a207f3e
 EBUILD netbeans-9999_p20150924.ebuild 7210 SHA256 6cd02bda976b99813c50c9cab0a6924a4645693887232c5a36fd30fc84fa0671 SHA512 fbb72dc71eaf222879c7a85e82452acba22faf4a1c44bf741f8d9a2a705c5459389d30eef51d660d61826368df7cdd335bbb1df7661fbc99491091a5bbecc168 WHIRLPOOL 9c83e6d1a896410d30b7425de17649910c4a3ffa3855113503351fdf48eae79ef6359a77247bc14b08f30d7306395572817e10b3c4f7d22ef605a7d3f4a7878f
+EBUILD netbeans-9999_p20150925.ebuild 7210 SHA256 024e11a350dda40eab393cc84e6a9b0bc793f74dde30f8a718c932121c916be8 SHA512 60809e6b64e957542b30c73c5ceb7d30c805a5667ba9dd06c880fa97f105d1218ecdc3c7132c9d98d9fb9a88b689fff54d815e513d0a28e7086ed216db1b44c5 WHIRLPOOL 1cfa6f83cd7bc654d9c3cab64db148dbe88c330dd152331b9285d99236dafcef3938543905c6700f11e2c3dff00a36bb8bcc6a5aa47df782c513e5ce3c0e7d67
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150925.ebuild b/dev-util/netbeans/netbeans-9999_p20150925.ebuild
new file mode 100644
index 0000000..1e9e736
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150925.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-09-25_00-02-28/zip/netbeans-trunk-nightly-201509250002-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
+}